diff --git a/website/themes/beastie/layouts/404.html b/website/themes/beastie/layouts/404.html
index cc3361e7c4..90ae0228e1 100755
--- a/website/themes/beastie/layouts/404.html
+++ b/website/themes/beastie/layouts/404.html
@@ -1,15 +1,15 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
-      {{ partial "sidenav.html" (dict "sidenavType" "about" "data" .Site.Data "language" $.Site.Language.Lang ) }}
+      {{ partial "sidenav.html" (dict "sidenavType" "about" "data" hugo.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ i18n "pageNotFound" }}</h1>
     <h2>Oh no.&nbsp;:(</h2>
     <p>{{ i18n "notFoundTitle" }}</p>
     <p>{{ i18n "notFoundDesc" }}</p>
   </div>
 </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/advisories.html b/website/themes/beastie/layouts/_partials/advisories.html
index b9eab4285b..33238ba8c6 100644
--- a/website/themes/beastie/layouts/_partials/advisories.html
+++ b/website/themes/beastie/layouts/_partials/advisories.html
@@ -1,13 +1,13 @@
 {{ $advisoriesCounter := 0 }}
-{{ with .Site.Data.security.advisories }}
+{{ with hugo.Data.security.advisories }}
   {{ range (sort .advisories "date" "desc") }}
     {{ if lt $advisoriesCounter 4 }}
       <p>
         <span class="txtdate">{{ .date }}</span>
         <br />
         <a href="{{ $.Site.BaseURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a>
       </p>
     {{ end }}
     {{ $advisoriesCounter = add $advisoriesCounter 1 }}
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/commercial-consulting.html b/website/themes/beastie/layouts/_partials/commercial-consulting.html
index 5d959a5ef2..313fdbc848 100644
--- a/website/themes/beastie/layouts/_partials/commercial-consulting.html
+++ b/website/themes/beastie/layouts/_partials/commercial-consulting.html
@@ -1,82 +1,82 @@
 {{ $consultingVendorsPath := (printf "data/%s/vendors/consulting.toml" $.Language.Lang) }}
 
 {{ $consultingVendorsData := "" }}
 {{ if (fileExists $consultingVendorsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $consultingVendorsData = $data.vendors }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $consultingVendorsData = $dataDefaultLanguage.vendors }}
 {{ end }}
 
 {{ with $consultingVendorsData.consulting }}
   {{ if $.Params.grouped }}
     <h3>{{ i18n "africa" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "africa" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "asia" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "asia" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "australia" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "australia" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "europe" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "europe" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "newZealand" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "nzealand" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "northAmerica" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "namerica" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "southAmerica" }}</h3>
     <ul>
       {{ range (sort .consulting "name" "asc") }}
         {{ if eq .category "samerica" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
   {{ else }}
     <dl>
       {{ range (sort .consulting "name" "asc") }}
         <dt>
           <a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a>
         </dt>
         <dd>
           {{ .description | safeHTML }}
         </dd>
       {{ end }}
     </dl>
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/commercial-hardware.html b/website/themes/beastie/layouts/_partials/commercial-hardware.html
index 3026998b59..4387def52a 100644
--- a/website/themes/beastie/layouts/_partials/commercial-hardware.html
+++ b/website/themes/beastie/layouts/_partials/commercial-hardware.html
@@ -1,24 +1,24 @@
 {{ $hardwareVendorsPath := (printf "data/%s/vendors/hardware.toml" $.Language.Lang) }}
 
 {{ $hardwareVendorsData := "" }}
 {{ if (fileExists $hardwareVendorsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $hardwareVendorsData = $data.vendors }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $hardwareVendorsData = $dataDefaultLanguage.vendors }}
 {{ end }}
 
 {{ with $hardwareVendorsData.hardware }}
   <dl>
     {{ range (sort .hardware "name" "asc") }}
     <dt>
       <a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a>
     </dt>
     <dd>
       {{ .description | safeHTML }}
     </dd>
     {{ end }}
   </dl>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/_partials/commercial-isp.html b/website/themes/beastie/layouts/_partials/commercial-isp.html
index 8aaaf074af..e6e0a5dcc7 100644
--- a/website/themes/beastie/layouts/_partials/commercial-isp.html
+++ b/website/themes/beastie/layouts/_partials/commercial-isp.html
@@ -1,23 +1,23 @@
 {{ $ispVendorsPath := (printf "data/%s/vendors/isp.toml" $.Language.Lang) }}
 
 {{ $ispVendorsData := "" }}
 {{ if (fileExists $ispVendorsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $ispVendorsData = $data.vendors }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $ispVendorsData = $dataDefaultLanguage.vendors }}
 {{ end }}
 
 {{ with $ispVendorsData.isp }}
   <dl>
     {{ range (sort .isp "name" "asc") }}
       <dt>
         <a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a>
       </dt>
       <dd>
         {{ .description | safeHTML }}
       </dd>
     {{ end }}
   </dl>
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/commercial-misc.html b/website/themes/beastie/layouts/_partials/commercial-misc.html
index 32423ad919..1332d463af 100644
--- a/website/themes/beastie/layouts/_partials/commercial-misc.html
+++ b/website/themes/beastie/layouts/_partials/commercial-misc.html
@@ -1,24 +1,24 @@
 {{ $miscVendorsPath := (printf "data/%s/vendors/misc.toml" $.Language.Lang) }}
 
 {{ $miscVendorsData := "" }}
 {{ if (fileExists $miscVendorsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $miscVendorsData = $data.vendors }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $miscVendorsData = $dataDefaultLanguage.vendors }}
 {{ end }}
 
 {{ with $miscVendorsData.misc }}
   <dl>
     {{ range (sort .misc "name" "asc") }}
       <dt>
         <a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a>
       </dt>
       <dd>
         {{ .description | safeHTML }}
       </dd>
     {{ end }}
   </dl>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/_partials/commercial-software.html b/website/themes/beastie/layouts/_partials/commercial-software.html
index c596ba87d8..490e3d9762 100644
--- a/website/themes/beastie/layouts/_partials/commercial-software.html
+++ b/website/themes/beastie/layouts/_partials/commercial-software.html
@@ -1,98 +1,98 @@
 {{ $softwareVendorsPath := (printf "data/%s/vendors/software.toml" $.Language.Lang) }}
 
 {{ $softwareVendorsData := "" }}
 {{ if (fileExists $softwareVendorsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $softwareVendorsData = $data.vendors }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $softwareVendorsData = $dataDefaultLanguage.vendors }}
 {{ end }}
 
 {{ with $softwareVendorsData.software }}
   {{ if $.Params.grouped }}
     <h3>{{ i18n "databases" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "DATABASE" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "developmentTools" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "DEV" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "ecommerce" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "ECOMMERCE" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "email" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "EMAIL" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "misc" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "MISC" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "network" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "NETWORK" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "scientific" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "SCIENTIFIC" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "security" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "SECURITY" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
     <h3>{{ i18n "isp" }}</h3>
     <ul>
       {{ range (sort .software "name" "asc") }}
         {{ if eq .category "SYSADMIN" }}
           <li><a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a></li>
         {{ end }}
       {{ end }}
     </ul>
   {{ else }}
     <dl>
       {{ range (sort .software "name" "asc") }}
         <dt>
           <a id="{{ .id }}" name="{{ .id }}" href="{{ .url }}">{{ .name }}</a>
         </dt>
         <dd>
           {{ .description | safeHTML }}
         </dd>
       {{ end }}
     </dl>
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/errata-notices.html b/website/themes/beastie/layouts/_partials/errata-notices.html
index a043fbc9ce..73cb6b78e4 100644
--- a/website/themes/beastie/layouts/_partials/errata-notices.html
+++ b/website/themes/beastie/layouts/_partials/errata-notices.html
@@ -1,13 +1,13 @@
 {{ $errataCounter := 0 }}
-{{ with .Site.Data.security.errata }}
+{{ with hugo.Data.security.errata }}
   {{ range (sort .notices "date" "desc") }}
     {{ if lt $errataCounter 2 }}
       <p>
         <span class="txtdate">{{ .date }}</span>
         <br />
         <a href="{{ $.Site.BaseURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a>
       </p>
     {{ end }}
     {{ $errataCounter = add $errataCounter 1 }}
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/events.html b/website/themes/beastie/layouts/_partials/events.html
index 3e7d90bdf0..291a0407f6 100644
--- a/website/themes/beastie/layouts/_partials/events.html
+++ b/website/themes/beastie/layouts/_partials/events.html
@@ -1,32 +1,32 @@
 {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
 {{ $eventsData := "" }}
 {{ if (fileExists $eventsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $eventsData = $data }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $eventsData = $dataDefaultLanguage }}
 {{ end }}
 
 {{ with $eventsData }}
   {{ $eventsCounter := 0 }}
     {{ range (sort .events "year" "asc") }}
       {{ if le $eventsCounter 6 }}
         {{ range (sort .events "startDate" "asc") }}
           {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
             <p>
               <span class="txtdate">{{ dateFormat "2006-01-02" .startDate }} - {{ dateFormat "2006-01-02" .endDate }}</span>
               <br />
               <a href="{{ if (fileExists $eventsPath) -}}{{ .Site.BaseURL | relLangURL }}{{ else }}{{ $.Site.BaseURL }}{{- end }}events/#{{ .id }}">
                 {{ .name }}
                 <br />
                 {{ if or (.city) (.country) }}({{end}}{{ if .city }}{{ .city }},{{ end }} {{ if .country }}{{ .country }}{{ end }}{{ if or (.city) (.country) }}){{end}}
               </a>
             </p>
             {{ $eventsCounter = add $eventsCounter 1 }}
           {{ end }}
         {{ end }}
       {{ end }}
     {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/news.html b/website/themes/beastie/layouts/_partials/news.html
index ce1052fe45..198ff040f9 100644
--- a/website/themes/beastie/layouts/_partials/news.html
+++ b/website/themes/beastie/layouts/_partials/news.html
@@ -1,43 +1,43 @@
 {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
 {{ $newsData := "" }}
 {{ if (fileExists $newsPath) -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $newsData = $data.news }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $newsData = $dataDefaultLanguage.news }}
 {{ end }}
 
 {{ with $newsData.news }}
   {{ $newsCounter := 0 }}
   {{ $newsDayCounter := 1 }}
   {{ $newsDayPrev := false }}
   {{ range (sort .news "date" "desc") }}
     {{ if lt $newsCounter 6 }}
       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
       {{ if eq $newsDayCur $newsDayPrev }}
         {{ $newsDayCounter = add $newsDayCounter 1 }}
       {{ else }}
         {{ $newsDayCounter = 1 }}
       {{ end }}
     <p>
       <span class="txtdate">{{ dateFormat "2006-01-02" .date }}</span>
       <br />
       <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}">
       {{ if .title }}
         {{ $title := replaceRE "<a .*\">" "" .title }}
         {{ $title = replaceRE "</a>" "" $title }}
         {{ $title | safeHTML }}
       {{ else }}
         {{ $description := replaceRE "<a .*\">" "" .description }}
         {{ $description = replaceRE "</a>" "" $description }}
         {{ $description | safeHTML }}
       {{ end }}
       </a>
     </p>
       {{ $newsCounter = add $newsCounter 1 }}
       {{ $newsDayPrev = $newsDayCur }}
     {{ end }}
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_partials/press.html b/website/themes/beastie/layouts/_partials/press.html
index 2cc8b03831..2bf6a38ba0 100644
--- a/website/themes/beastie/layouts/_partials/press.html
+++ b/website/themes/beastie/layouts/_partials/press.html
@@ -1,39 +1,39 @@
 {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
 {{ $translatedPressEnabled := false }}
 
 {{ if in (slice "ru" "fr") $.Language.Lang }}
   {{ $translatedPressEnabled = true }}
 {{ end }}
 
 {{ $pressData := "" }}
 {{ if $translatedPressEnabled -}}
-  {{ $data := index .Site.Data $.Language.Lang }}
+  {{ $data := index hugo.Data $.Language.Lang }}
   {{ $pressData = $data.press }}
 {{ else }}
-  {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+  {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
   {{ $pressData = $dataDefaultLanguage.press }}
 {{ end }}
 
 {{ with $pressData.press }}
   {{ $pressCounter := 0 }}
   {{ $pressMonthCounter := 1 }}
   {{ $pressMonthPrev := false }}
   {{ range (sort .press "date" "desc") }}
     {{ if lt $pressCounter 5 }}
       {{ $pressMonthCur := dateFormat "2006-01" .date }}
       {{ if eq $pressMonthCur $pressMonthPrev }}
         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
       {{ else }}
         {{ $pressMonthCounter = 1 }}
       {{ end }}
     <p>
       <span class="txtdate">{{ dateFormat "2006-01" .date }}</span>
       <br />
       <a href="{{ if $translatedPressEnabled }}{{ .Site.BaseURL | relLangURL }}{{ else }}{{ $.Site.BaseURL }}{{ end }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}">{{ .name }}</a>
     </p>
       {{ $pressCounter = add $pressCounter 1 }}
       {{ $pressMonthPrev = $pressMonthCur }}
     {{ end }}
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html
index 14d2e8683a..0a5437e19b 100644
--- a/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html
+++ b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html
@@ -1,32 +1,32 @@
 {{ $param := (.Get 0) }}
 
-{{ $eventsData := index .Page.Site.Data .Page.Sites.Default.Language.Lang }}
+{{ $eventsData := index hugo.Data hugo.Sites.Default.Language.Lang }}
 
 {{ $lastYear := sub (int (now.Format "2006")) 1 }}
 
 <!-- Load events and number of times -->
 {{ $countriesCodes := slice }}
 
 {{ $eventsCounter := 0 }}
 {{ with $eventsData }}
   {{ range (sort .events "year" "desc") }}
     {{ if eq (int .year) $lastYear }}
       {{ range .events }}
         {{ $eventsCounter = add $eventsCounter 1 }}
         {{ if .countryCode }}
           {{ $countriesCodes = $countriesCodes | append .countryCode }}
         {{ end }}
       {{ end }}
     {{ end }}
   {{ end }}
 {{ end }}
 
 {{ $countriesCodes = $countriesCodes | uniq }}
 
 {{ if eq $param "countries" }}
   {{ len $countriesCodes }}
 {{ end }}
 
 {{ if eq $param "events" }}
   {{ $eventsCounter }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html
index b041e9b1c0..437a0f7f62 100644
--- a/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html
+++ b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html
@@ -1,31 +1,31 @@
 {{ $param := (.Get 0) }}
 
-{{ $usergroupsData := index .Page.Site.Data .Page.Sites.Default.Language.Lang }}
+{{ $usergroupsData := index hugo.Data hugo.Sites.Default.Language.Lang }}
 
 <!-- Load usergroups and number of them-->
 {{ $usergroupsCodes := slice }}
 {{ $usergroupsCodesTimes := newScratch }}
 
 {{ $usergroupsCounter := 0 }}
 {{ with $usergroupsData.usergroups.usergroups }}
   {{ range . }}
     {{ range . }}
       {{ if .countryCode }}
         {{ $usergroupsCodes = $usergroupsCodes | append .countryCode }}
       {{ end }}
 
       {{ $usergroupsCounter = add $usergroupsCounter 1 }}
     {{ end }}
   {{ end }}
 {{ end }}
 
 {{ $usergroupsCodes = $usergroupsCodes | uniq }}
 
 {{ if eq $param "countries" }}
   {{ len $usergroupsCodes }}
 {{ end }}
 
 {{ if eq $param "usergroups" }}
   {{ $usergroupsCounter }}
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/commercial/list.html b/website/themes/beastie/layouts/commercial/list.html
index 241b529958..17d7177425 100644
--- a/website/themes/beastie/layouts/commercial/list.html
+++ b/website/themes/beastie/layouts/commercial/list.html
@@ -1,38 +1,38 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
     </div>
     <div id="contentwrap">
       {{- .Content -}}
 
       {{ if eq .Params.vendor "software" }}
         {{ partial "commercial-software.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "isp" }}
         {{ partial "commercial-isp.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "hardware" }}
         {{ partial "commercial-hardware.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "consult" }}
         {{ partial "commercial-consulting.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "misc" }}
         {{ partial "commercial-misc.html" . }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/commercial/single.html b/website/themes/beastie/layouts/commercial/single.html
index 241b529958..17d7177425 100644
--- a/website/themes/beastie/layouts/commercial/single.html
+++ b/website/themes/beastie/layouts/commercial/single.html
@@ -1,38 +1,38 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
     </div>
     <div id="contentwrap">
       {{- .Content -}}
 
       {{ if eq .Params.vendor "software" }}
         {{ partial "commercial-software.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "isp" }}
         {{ partial "commercial-isp.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "hardware" }}
         {{ partial "commercial-hardware.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "consult" }}
         {{ partial "commercial-consulting.html" . }}
       {{ end }}
 
       {{ if eq .Params.vendor "misc" }}
         {{ partial "commercial-misc.html" . }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html
index 0d00620073..f4043b61b9 100644
--- a/website/themes/beastie/layouts/events/list.html
+++ b/website/themes/beastie/layouts/events/list.html
@@ -1,238 +1,238 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
-        {{ $data := index .Site.Data $.Language.Lang }}
+        {{ $data := index hugo.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
-        {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+        {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min/Max year -->
         {{ $maxYear := now.Year }}
         {{ $maxYear = add $maxYear 1}}
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq $minYear $maxYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
             <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="/events/2020/">2020</a>
         </li>
         <li>
           <a href="/events/2019/">2019</a>
         </li>
         <li>
           <a href="/events/2018/">2018</a>
         </li>
         <li>
           <a href="/events/2017/">2017</a>
         </li>
         <li>
           <a href="/events/2016/">2016</a>
         </li>
         <li>
           <a href="/events/2015/">2015</a>
         </li>
         <li>
           <a href="/events/2014/">2014</a>
         </li>
         <li>
           <a href="/events/2013/">2013</a>
         </li>
         <li>
           <a href="/events/2012/">2012</a>
         </li>
         <li>
           <a href="/events/2011/">2011</a>
         </li>
         <li>
           <a href="/events/2010/">2010</a>
         </li>
         <li>
           <a href="/events/2009/">2009</a>
         </li>
         <li>
           <a href="/events/2008/">2008</a>
         </li>
         <li>
           <a href="/events/2007/">2007</a>
         </li>
         <li>
           <a href="/events/2006/">2006</a>
         </li>
         <li>
           <a href="/events/2005/">2005</a>
         </li>
         <li>
           <a href="/events/2004/">2004</a>
         </li>
         <li>
           <a href="/events/2003/">2003</a>
         </li>
       </ul>
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/events/list.ics b/website/themes/beastie/layouts/events/list.ics
index f6adf934ca..02d3b709a6 100644
--- a/website/themes/beastie/layouts/events/list.ics
+++ b/website/themes/beastie/layouts/events/list.ics
@@ -1,15 +1,15 @@
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//FreeBSD//events calendar//EN
 CALSCALE:GREGORIAN
-METHOD:PUBLISH{{ $data := index .Site.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }}
+METHOD:PUBLISH{{ $data := index hugo.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }}
 BEGIN:VEVENT
 UID:{{ .id }}
 SUMMARY:{{ .name }}
 URL;VALUE=URI:{{ .url }}
 LOCATION:{{ .site }}, {{ .city }}, {{ .country }}
 DTSTART;VALUE=DATE:{{ dateFormat "20060102" .startDate }}
 DTEND;VALUE=DATE:{{ dateFormat "20060102" .endDate }}
 DESCRIPTION:{{ .description }}
 END:VEVENT{{ end }}{{ end }}{{ end }}
 END:VCALENDAR
diff --git a/website/themes/beastie/layouts/events/rss.xml b/website/themes/beastie/layouts/events/rss.xml
index aaf582bc6b..d062c0df6f 100644
--- a/website/themes/beastie/layouts/events/rss.xml
+++ b/website/themes/beastie/layouts/events/rss.xml
@@ -1,40 +1,40 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>Upcoming FreeBSD Events</title>
     <link>https://www.FreeBSD.org/events/</link>
     <description>RSS feed of upcoming FreeBSD-related conferences, summits, courses, and other relevant events.</description>
     <language>en-us</language>
     <webMaster>freebsd-www@FreeBSD.org (FreeBSD Web Team)</webMaster>
     <managingEditor>freebsd-www@FreeBSD.org (FreeBSD Web Team)</managingEditor>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title>FreeBSD News Flash</title>
       <link>https://www.FreeBSD.org/events/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/events/feed.xml" rel="self" type="application/rss+xml"/>
-    {{ $data := index .Site.Data "en" }}
+    {{ $data := index hugo.Data "en" }}
     {{ $eventsData := $data }}
     {{ with $eventsData }}
       {{ range first 3 (sort .events "year" "desc") }}
         {{ range (sort .events "startDate" "asc") }}
           {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
             <item>
               {{ if .name }}
                 <title>
                   {{ .name }}
                 </title>
               {{ end }}
               {{ if .description }}
                 <description>
                   {{ .description }}
                 </description>
               {{ end }}
               <link>{{ .url }}</link>
               <guid>{{ absLangURL ($.Site.BaseURL) }}events/#{{ .id }}</guid>
             </item>
           {{ end }}
         {{ end }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html
index 0d00620073..f4043b61b9 100644
--- a/website/themes/beastie/layouts/events/single.html
+++ b/website/themes/beastie/layouts/events/single.html
@@ -1,238 +1,238 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "upcomingFreeBSDEvents" }}>RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ $eventsPath := (printf "data/%s/events/events%s.toml" $.Language.Lang (dateFormat "2006" now)) }}
 
       {{ $eventsData := "" }}
       {{ if (fileExists $eventsPath) -}}
-        {{ $data := index .Site.Data $.Language.Lang }}
+        {{ $data := index hugo.Data $.Language.Lang }}
         {{ $eventsData = $data }}
       {{ else }}
-        {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+        {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
         {{ $eventsData = $dataDefaultLanguage }}
       {{ end }}
 
       {{ $eventsCounter := 0 }}
 
       {{ if isset .Params "year" }}
         <!-- Nothing -->
       {{ else }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsCP := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsCP = $yearsMonthsCP | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Second load all past year-month to the array -->
         {{ $yearsMonthsPast := slice }}
         {{ with $eventsData }}
           {{ range first 3 (sort .events "year" "desc") }}
             {{ range (sort .events "startDate" "asc") }}
               {{ if lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now) }}
                 {{ $yearsMonthsPast = $yearsMonthsPast | append (dateFormat "2006-1" .endDate) }}
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonthsCP = $yearsMonthsCP | uniq }}
         {{ $yearsMonthsPast = $yearsMonthsPast | uniq }}
 
         <!-- Min/Max year -->
         {{ $maxYear := now.Year }}
         {{ $maxYear = add $maxYear 1}}
         {{ $minYear := now.Year }}
         {{ $minYear = sub $minYear 2}}
 
         <h2 id="upcoming">{{ i18n "currentEvents" }}</h2>
         {{ range $year := seq $minYear $maxYear }}
           {{ range $month := seq 1 12 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsCP $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "asc") }}
                       {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $year := seq now.Year $minYear }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonthsPast $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               {{ with $eventsData }}
                 <ul>
                   {{ range first 3 (sort .events "year" "desc") }}
                     {{ range (sort .events "startDate" "desc") }}
                       {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                         <li id="{{ .id }}">
                           <p>
                             <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                             <br />
                             <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                             <br />
                             {{ .description | safeHTML }}
                           </p>
                         </li>
                         {{ $eventsCounter = add $eventsCounter 1 }}
                       {{ end }}
                     {{ end }}
                   {{ end }}
                 </ul>
               {{ end }}
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
 
       {{ if isset .Params "year" }}
         {{ $year := .Params.year }}
         {{ $eventsYear := (printf "events%d" $year) }}
         {{ $eventsSelectedYear := index $eventsData.events $eventsYear }}
 
         <!-- First load all current-upcoming year-month to the array -->
         {{ $yearsMonthsSelected := slice }}
 
         {{ with $eventsSelectedYear }}
           {{ range (sort .events "startDate" "asc") }}
             {{ $yearsMonthsSelected = $yearsMonthsSelected | append (dateFormat "2006-1" .endDate) }}
           {{ end }}
         {{ end }}
 
         {{ $yearsMonthsSelected = $yearsMonthsSelected | uniq }}
 
         <h2 id="past">{{ i18n "pastEvents" }}</h2>
         {{ range $month := seq 12 1 }}
           {{ $yearMonth := (printf "%d-%d" $year $month) }}
           {{ if in $yearsMonthsSelected $yearMonth }}
             <h2>{{ i18n $month }} {{ $year }}</h2>
             {{ with $eventsSelectedYear }}
               <ul>
                 {{ range (sort .events "startDate" "desc") }}
                   {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}
                     <li id="{{ .id }}">
                       <p>
                         <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }}
                         <br />
                         <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em>
                         <br />
                         {{ .description | safeHTML }}
                       </p>
                     </li>
                     {{ $eventsCounter = add $eventsCounter 1 }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       <p>Events from past years:</p>
       <ul id="events-past-years">
         <li>
           <a href="/events/2020/">2020</a>
         </li>
         <li>
           <a href="/events/2019/">2019</a>
         </li>
         <li>
           <a href="/events/2018/">2018</a>
         </li>
         <li>
           <a href="/events/2017/">2017</a>
         </li>
         <li>
           <a href="/events/2016/">2016</a>
         </li>
         <li>
           <a href="/events/2015/">2015</a>
         </li>
         <li>
           <a href="/events/2014/">2014</a>
         </li>
         <li>
           <a href="/events/2013/">2013</a>
         </li>
         <li>
           <a href="/events/2012/">2012</a>
         </li>
         <li>
           <a href="/events/2011/">2011</a>
         </li>
         <li>
           <a href="/events/2010/">2010</a>
         </li>
         <li>
           <a href="/events/2009/">2009</a>
         </li>
         <li>
           <a href="/events/2008/">2008</a>
         </li>
         <li>
           <a href="/events/2007/">2007</a>
         </li>
         <li>
           <a href="/events/2006/">2006</a>
         </li>
         <li>
           <a href="/events/2005/">2005</a>
         </li>
         <li>
           <a href="/events/2004/">2004</a>
         </li>
         <li>
           <a href="/events/2003/">2003</a>
         </li>
       </ul>
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html
index d5e328a4d1..a14a773595 100755
--- a/website/themes/beastie/layouts/index.html
+++ b/website/themes/beastie/layouts/index.html
@@ -1,262 +1,262 @@
 {{ define "main" }}
 {{ $currentLang := $.Site.Language.Lang }}
 <div id="content">
   <div id="frontcontainer">
     <div id="frontfeaturecontainer">
       <div id="frontfeatureleft">
         <div id="frontfeaturecontent">
           <h1>{{ i18n "freebsdProject" }}</h1>
           <p>
             {{ i18n "freebsdDescription1" }}
             <a href={{ "platforms/" | absLangURL }}>{{ i18n "freebsdDescription2" }}</a>
             {{ i18n "freebsdDescription3" }}
             <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/articles/contributors/#staff-committers" }}>{{ i18n "freebsdDescription4" }}</a>
             {{ i18n "freebsdDescription5" }}
             <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/introduction/#introduction-nutshell-users" }}>{{ i18n "freebsdDescription6" }}</a>
             {{ i18n "freebsdDescription7" }}
           </p>
           <div id="txtfrontfeaturelink"> »<a href={{ "about/" | absLangURL }} title={{ i18n "learnMore" }}>{{ i18n "learnMore" }}</a></div>
           <div id="txtfrontjournalblock">
             <br />»
             <span id="txtfrontjournallink">
             {{ i18n "getThe" }} <a href="https://freebsdfoundation.org/our-work/journal/" title={{ i18n "journal" }}>{{ i18n "journal" }}</a>
             </span>
           </div>
         </div>
       </div>
       <div id="frontfeaturemiddle">
         <div class="frontgetroundbox newtofreebsd">
             <div class="frontgettop">
                 <div>
                 <b style="display: none">.</b>
                 </div>
             </div>
             <div class="frontgetcontent">
                 <a href={{ "projects/newbies/" | absLangURL }}>{{ i18n "newFreeBSD" }}</a>
             </div>
             <div class="frontgetbot">
             <div>
             <b style="display: none">.</b>
             </div>
         </div>
         </div>
         <div class="frontgetroundbox">
           <div class="frontgettop">
             <div>
               <b style="display: none">.</b>
             </div>
           </div>
           <div class="frontgetcontent">
             <a href={{ "where/" | absLangURL }}>{{ i18n "downloadFreeBSD" }}</a>
           </div>
           <div class="frontgetbot">
             <div>
               <b style="display: none">.</b>
             </div>
           </div>
         </div>
         <div id="frontreleases">
           <div id="frontreleasescontent" class="txtshortcuts">
             <h2>
               <a href={{ "releases/" | absLangURL }}>{{ i18n "supportedReleases" }}</a>
             </h2>
             <ul id="frontreleaseslist">
               <li>
                 {{ i18n "production" }}:
-                <a href={{ index $.Site.Data.releases "u-rel150-announce" }}>{{ index $.Site.Data.releases "rel150-current" }}</a>
+                <a href={{ index hugo.Data.releases "u-rel150-announce" }}>{{ index hugo.Data.releases "rel150-current" }}</a>
               </li>
               <li>
                 {{ i18n "production" }}:
-                <a href={{ index $.Site.Data.releases "u-rel144-announce" }}>{{ index $.Site.Data.releases "rel144-current" }}</a>
+                <a href={{ index hugo.Data.releases "u-rel144-announce" }}>{{ index hugo.Data.releases "rel144-current" }}</a>
               </li>
               <li>
                 {{ i18n "legacy" }}:
-                <a href={{ index $.Site.Data.releases "u-rel143-announce" }}>{{ index $.Site.Data.releases "rel143-current" }}</a>
+                <a href={{ index hugo.Data.releases "u-rel143-announce" }}>{{ index hugo.Data.releases "rel143-current" }}</a>
               </li>
               <li>
                 {{ i18n "legacy" }}:
-                <a href={{ index $.Site.Data.releases "u-rel135-announce" }}>{{ index $.Site.Data.releases "rel135-current" }}</a>
+                <a href={{ index hugo.Data.releases "u-rel135-announce" }}>{{ index hugo.Data.releases "rel135-current" }}</a>
               </li>
-              {{ $betaUpcoming := index $.Site.Data.releases "beta-upcoming" }}
+              {{ $betaUpcoming := index hugo.Data.releases "beta-upcoming" }}
               {{ if ne $betaUpcoming "IGNORE" }}
                 <li>
                   {{ i18n "upcoming" }}:
-                  <a href={{ index $.Site.Data.releases "u-betarel-schedule" }}>{{ index $.Site.Data.releases "betarel-current" }}</a>
+                  <a href={{ index hugo.Data.releases "u-betarel-schedule" }}>{{ index hugo.Data.releases "betarel-current" }}</a>
                 </li>
               {{ end }}
-              {{ $beta2Upcoming := index $.Site.Data.releases "beta2-upcoming" }}
+              {{ $beta2Upcoming := index hugo.Data.releases "beta2-upcoming" }}
               {{ if ne $beta2Upcoming "IGNORE" }}
                 <li>
                   {{ i18n "upcoming" }}:
-                  <a href={{ index $.Site.Data.releases "u-betarel2-schedule" }}>{{ index $.Site.Data.releases "betarel2-current" }}</a>
+                  <a href={{ index hugo.Data.releases "u-betarel2-schedule" }}>{{ index hugo.Data.releases "betarel2-current" }}</a>
                 </li>
               {{ end }}
-              {{ $beta3Upcoming := index $.Site.Data.releases "beta3-upcoming" }}
+              {{ $beta3Upcoming := index hugo.Data.releases "beta3-upcoming" }}
               {{ if ne $beta3Upcoming "IGNORE" }}
                 <li>
                   {{ i18n "upcoming" }}:
-                  <a href={{ index $.Site.Data.releases "u-betarel3-schedule" }}>{{ index $.Site.Data.releases "betarel3-current" }}</a>
+                  <a href={{ index hugo.Data.releases "u-betarel3-schedule" }}>{{ index hugo.Data.releases "betarel3-current" }}</a>
                 </li>
               {{ end }}
               <li>
                 <a href={{ "security/" | absLangURL }}#sup>{{ i18n "supportLifecycle" }}</a>
               </li>
             </ul>
           </div>
         </div>
       </div>
       <div id="frontfeatureright">
         <div id="languagenav">
           <ul id="languagenavlist">
             <!--
             {{ range $.Site.Home.AllTranslations }}
               <li><a href="{{ .Permalink }}">{{ .Language }}</a></li>
             {{ end }}
             -->
             <li><a href="{{ $.Site.BaseURL }}">en</a></li>
             <li><a href="{{ $.Site.BaseURL }}ru">ru</a></li>
             <li><a href="{{ $.Site.BaseURL }}zh-tw">zh-tw</a></li>
           </ul>
         </div>
         <div id="frontshortcuts">
           <div id="frontshortcutscontent" class="txtshortcuts">
             <h2>{{ i18n "shortcuts" }}</h2>
             <ul id="frontshortcutslist">
               <li>
                 <a href={{ "community/mailinglists/" | absLangURL }} title={{ i18n "mailingLists" }}>{{ i18n "mailingLists" }}</a>
               </li>
               <li>
                 <a href={{ "support/bugreports/" | absLangURL }} title={{ i18n "reportingProblems" }}>{{ i18n "reportingProblems" }}</a>
               </li>
               <li>
                 <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/faq/" }} title={{ i18n "FAQ" }}>{{ i18n "FAQ" }}</a>
               </li>
               <li>
                 <a href={{ printf "%s%s%s" "https://docs.FreeBSD.org/" $currentLang "/books/handbook/" }} title={{ i18n "handbook" }}>{{ i18n "handbook" }}</a>
               </li>
               <li>
                 <a href={{ "ports/" | absLangURL }} title={{ i18n "ports" }}>{{ i18n "ports" }}</a>
               </li>
             </ul>
           </div>
         </div>
       </div>
     </div>
     {{ $language := "" }}
     {{ $currentLang := $.Site.Language.Lang }}
     {{ $siteBaseUrl := absLangURL ($.Site.BaseURL) }}
 
     {{ if ne $currentLang "en" }}
       {{ $language = $currentLang }}
     {{ end }}
     <div id="frontnemscontainer">
       <div id="frontnews">
         <div id="frontnewscontent" class="txtnewsevent">
           <h2>{{ i18n "latestNews" }}</h2>
           <div class="newseventswrap">
             {{ partial "news.html" . }}
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
                   <a href={{ printf "%s%s/%s" $siteBaseUrl $language "news/newsflash/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title={{ i18n "rssNews" }}>
                   <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/rss_icon.png" alt={{ i18n "rssNews" }} width="27" height="12" />
                   </a>
                 </li>
               </ul>
             </div>
           </div>
         </div>
       </div>
       <div class="frontseparator">
         <b style="display: none">.</b>
       </div>
       <div id="frontevents">
         <div id="fronteventscontent" class="txtnewsevent">
           <h2>{{ i18n "upcomingEvents" }}</h2>
           <div class="newseventswrap">
             {{ partial "events.html" . }}
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
                   <a href={{ printf "%s%s/%s" $siteBaseUrl $language "events/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}events/feed.xml" title={{ i18n "rssEvents" }}>
                     <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/rss_icon.png" alt={{ i18n "rssEvents" }} width="27" height="12" />
                   </a>
                 </li>
               </ul>
             </div>
           </div>
         </div>
       </div>
       <div class="frontseparator">
         <b style="display: none">.</b>
       </div>
       <div id="frontmedia">
         <div id="frontmediacontent" class="txtnewsevent">
           <h2>{{ i18n "press" }}</h2>
           <div class="newseventswrap">
             {{ partial "press.html" . }}
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
                   <a href={{ printf "%s%s/%s" $siteBaseUrl $language "press/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title={{ i18n "rssMedia" }}>
                     <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/rss_icon.png" alt={{ i18n "rssMedia" }} width="27" height="12" />
                   </a>
                 </li>
               </ul>
             </div>
           </div>
         </div>
       </div>
       <div class="frontseparator">
         <b style="display: none">.</b>
       </div>
       <div id="frontsecurity">
         <div id="frontsecuritycontent" class="txtnewsevent">
           <h2>{{ i18n "securityAdvisories" }}</h2>
           <div class="newseventswrap">
             {{ partial "advisories.html" . }}
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
                   <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/advisories/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}>
                   <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/rss_icon.png" alt="News RSS Feed" width="27" height="12" />
                   </a>
                 </li>
               </ul>
             </div>
           </div>
           <br />
           <h2>{{ i18n "errataNotices" }}</h2>
           <div class="newseventswrap">
             {{ partial "errata-notices.html" . }}
             <div>
               <ul class="newseventslist">
                 <li class="first-child">
                   <a href={{ printf "%s%s/%s" $siteBaseUrl $language "security/notices/" }} title={{ i18n "more" }}>{{ i18n "more" }}</a>
                 </li>
                 <li class="last-child">
                   <a href="{{ absLangURL ($.Site.BaseURL) }}security/feed.xml" title={{ i18n "rssSecurity" }}>
                   <img class="rssimage" src="{{ absLangURL ($.Site.BaseURL) }}images/rss_icon.png" alt="News RSS Feed" width="27" height="12" />
                   </a>
                 </li>
               </ul>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/list.html b/website/themes/beastie/layouts/list.html
index 286e9ccd5e..34a62a8dca 100644
--- a/website/themes/beastie/layouts/list.html
+++ b/website/themes/beastie/layouts/list.html
@@ -1,19 +1,19 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
-      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if .GitInfo }}
     <hr />
     <div class="last-modified">
       <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
     </div>
     {{ end }}
   </div>
 </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/list.ics b/website/themes/beastie/layouts/list.ics
index f6adf934ca..02d3b709a6 100644
--- a/website/themes/beastie/layouts/list.ics
+++ b/website/themes/beastie/layouts/list.ics
@@ -1,15 +1,15 @@
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//FreeBSD//events calendar//EN
 CALSCALE:GREGORIAN
-METHOD:PUBLISH{{ $data := index .Site.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }}
+METHOD:PUBLISH{{ $data := index hugo.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }}
 BEGIN:VEVENT
 UID:{{ .id }}
 SUMMARY:{{ .name }}
 URL;VALUE=URI:{{ .url }}
 LOCATION:{{ .site }}, {{ .city }}, {{ .country }}
 DTSTART;VALUE=DATE:{{ dateFormat "20060102" .startDate }}
 DTEND;VALUE=DATE:{{ dateFormat "20060102" .endDate }}
 DESCRIPTION:{{ .description }}
 END:VEVENT{{ end }}{{ end }}{{ end }}
 END:VCALENDAR
diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html
index 3f86c505d4..88c6fad954 100644
--- a/website/themes/beastie/layouts/news/list.html
+++ b/website/themes/beastie/layouts/news/list.html
@@ -1,84 +1,84 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
-          {{ $data := index .Site.Data $.Language.Lang }}
+          {{ $data := index hugo.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
-          {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+          {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/rss.xml b/website/themes/beastie/layouts/news/rss.xml
index fa369c9fa2..753e9c3da4 100644
--- a/website/themes/beastie/layouts/news/rss.xml
+++ b/website/themes/beastie/layouts/news/rss.xml
@@ -1,54 +1,54 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>FreeBSD News Flash</title>
     <link>https://www.FreeBSD.org/news/</link>
     <description>News from the FreeBSD Project</description>
     <language>en-us</language>
     <webMaster>freebsd-www@FreeBSD.org (Webmaster Team)</webMaster>
     <managingEditor>freebsd-www@FreeBSD.org (Webmaster Team)</managingEditor>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title>FreeBSD News Flash</title>
       <link>https://www.FreeBSD.org/news/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/news/feed.xml" rel="self" type="application/rss+xml"/>
-    {{ $data := index .Site.Data "en" }}
+    {{ $data := index hugo.Data "en" }}
     {{ $newsData := $data.news }}
     {{ with $newsData.news }}
       {{ $newsCounter := 0 }}
       {{ $newsDayCounter := 1 }}
       {{ $newsDayPrev := false }}
         {{ range (sort .news "date" "desc") }}
           {{ if lt $newsCounter 10 }}
             {{ $newsDayCur := dateFormat "2006-01-02" .date }}
             {{ if eq $newsDayCur $newsDayPrev }}
               {{ $newsDayCounter = add $newsDayCounter 1 }}
             {{ else }}
               {{ $newsDayCounter = 1 }}
             {{ end }}
             <item>
               {{ if .title }}
                 <title>
                   {{ $title := replaceRE "<a .*\">" "" .title }}
                   {{ $title = replaceRE "</a>" "" $title }}
                   {{ $title }}
                 </title>
               {{ end }}
               {{ if .description }}
                 <description>
                   {{ $description := replaceRE "<a .*\">" "" .description | safeHTML}}
                   {{ $description = replaceRE "</a>" "" $description | safeHTML}}
                   {{ $description }}
                 </description>
               {{ end }}
               <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</link>
               <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</guid>
               <pubDate>{{ dateFormat "02 Jan 06 15:04 UTC" .date }}</pubDate>
             </item>
             {{ $newsCounter = add $newsCounter 1 }}
             {{ $newsDayPrev = $newsDayCur }}
           {{ end }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html
index 3f86c505d4..88c6fad954 100644
--- a/website/themes/beastie/layouts/news/single.html
+++ b/website/themes/beastie/layouts/news/single.html
@@ -1,84 +1,84 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
-          {{ $data := index .Site.Data $.Language.Lang }}
+          {{ $data := index hugo.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
-          {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+          {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $newsDayCounter := 1 }}
         {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $newsDayCur := dateFormat "2006-01-02" .date }}
                       {{ if eq $newsDayCur $newsDayPrev }}
                         {{ $newsDayCounter = add $newsDayCounter 1 }}
                       {{ else }}
                         {{ $newsDayCounter = 1 }}
                       {{ end }}
                       <li>
                         <p class="localized">
                           <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
                       {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html
index d1d5772610..966e75e034 100644
--- a/website/themes/beastie/layouts/press/list.html
+++ b/website/themes/beastie/layouts/press/list.html
@@ -1,88 +1,88 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
-          {{ $data := index .Site.Data $.Language.Lang }}
+          {{ $data := index hugo.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
-          {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+          {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/rss.xml b/website/themes/beastie/layouts/press/rss.xml
index f21b03d89f..fb3471be2f 100644
--- a/website/themes/beastie/layouts/press/rss.xml
+++ b/website/themes/beastie/layouts/press/rss.xml
@@ -1,50 +1,50 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>FreeBSD in the Press</title>
     <link>https://www.FreeBSD.org/press/</link>
     <description>Press Stories about FreeBSD</description>
     <language>en-us</language>
     <webMaster>freebsd-www@FreeBSD.org (Webmaster Team)</webMaster>
     <managingEditor>freebsd-www@FreeBSD.org (Webmaster Team)</managingEditor>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title>FreeBSD in the Press</title>
       <link>https://www.FreeBSD.org/press/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/press/feed.xml" rel="self" type="application/rss+xml"/>
     {{ $pressMonthPrev := false }}
-    {{ $data := index .Site.Data "en" }}
+    {{ $data := index hugo.Data "en" }}
     {{ $pressData := $data.press }}
     {{ with $pressData.press }}
       {{ $pressCounter := 0 }}
       {{ $pressMonthCounter := 1 }}
       {{ range (sort .press "date" "desc") }}
         {{ if lt $pressCounter 10 }}
           {{ $pressMonthCur := dateFormat "2006-01" .date }}
           {{ if eq $pressMonthCur $pressMonthPrev }}
             {{ $pressMonthCounter = add $pressMonthCounter 1 }}
           {{ else }}
             {{ $pressMonthCounter = 1 }}
           {{ end }}
             <item>
             {{ if .name }}
                 <title>
                   {{ .name }}
                 </title>
             {{ end }}
             {{ if .description }}
                 <description>
                   {{ .description }}
                 </description>
             {{ end }}
               <link>{{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}</link>
               <guid>{{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}</guid>
               <pubDate>{{ dateFormat "02 Jan 06 15:04 UTC" .date }}</pubDate>
             </item>
           {{ $pressMonthPrev = $pressMonthCur }}
         {{ end }}
         {{ $pressCounter = add $pressCounter 1 }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html
index d1d5772610..966e75e034 100644
--- a/website/themes/beastie/layouts/press/single.html
+++ b/website/themes/beastie/layouts/press/single.html
@@ -1,88 +1,88 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
-        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+        {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}press/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
-          {{ $data := index .Site.Data $.Language.Lang }}
+          {{ $data := index hugo.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
-          {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }}
+          {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
         {{ $pressMonthCounter := 1 }}
         {{ $pressMonthPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h2>{{ i18n $month }} {{ $year }}</h2>
               <ul>
                 {{ with $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
                       {{ $pressMonthCur := dateFormat "2006-01" .date }}
                       {{ if eq $pressMonthCur $pressMonthPrev }}
                         {{ $pressMonthCounter = add $pressMonthCounter 1 }}
                       {{ else }}
                         {{ $pressMonthCounter = 1 }}
                       {{ end }}
                       <li>
                         <p>
                           <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
                       {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
       {{ if .GitInfo }}
       <hr />
       <div class="last-modified">
         <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
       </div>
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/security/list.html b/website/themes/beastie/layouts/security/list.html
index ffdbd8f81e..d8365b9a76 100644
--- a/website/themes/beastie/layouts/security/list.html
+++ b/website/themes/beastie/layouts/security/list.html
@@ -1,57 +1,57 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
-      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if $.Params.security }}
       <table>
         <thead>
           <tr>
             <th>Date</th>
             {{ if eq $.Params.security "notices" }}
               <th>Errata Notice name</th>
             {{ end }}
             {{ if eq $.Params.security "advisories" }}
               <th>Advisory name</th>
             {{ end }}
           </tr>
         </thead>
         <tbody>
           {{ if eq $.Params.security "notices" }}
-            {{ with .Site.Data.security.errata }}
+            {{ with hugo.Data.security.errata }}
               {{ range .notices }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
           {{ if eq $.Params.security "advisories" }}
-            {{ with .Site.Data.security.advisories }}
+            {{ with hugo.Data.security.advisories }}
               {{ range .advisories }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
         </tbody>
       </table>
     {{ end }}
     {{ if .GitInfo }}
     <hr />
     <div class="last-modified">
       <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
     </div>
     {{ end }}
   </div>
 </div>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/security/rss.xml b/website/themes/beastie/layouts/security/rss.xml
index 37dd78fadc..d759324e4e 100644
--- a/website/themes/beastie/layouts/security/rss.xml
+++ b/website/themes/beastie/layouts/security/rss.xml
@@ -1,44 +1,44 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>FreeBSD Security Advisories and Errata notices</title>
     <link>https://www.FreeBSD.org/security/</link>
     <description>Security advisories and Errata notices published from the FreeBSD Project</description>
     <language>en</language>
     <webMaster>secteam@FreeBSD.org (FreeBSD Security Team)</webMaster>
     <managingEditor>secteam@FreeBSD.org (FreeBSD Security Team)</managingEditor>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title>FreeBSD Security Advisories and Errata notices</title>
       <link>https://www.FreeBSD.org/security/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/security/feed.xml" rel="self" type="application/rss+xml"/>
-    {{ with .Site.Data.security.errata }}
+    {{ with hugo.Data.security.errata }}
       {{ $securityCounter := 0 }}
       {{ range (sort .notices "date" "desc") }}
         {{ if lt $securityCounter 10 }}
           <item>
             <title>{{ .name }}</title>
             <link>{{ absLangURL ($.Site.BaseURL) }}security/advisories/{{ .name }}.asc</link>
             <guid>{{ absLangURL ($.Site.BaseURL) }}security/advisories/{{ .name }}.asc</guid>
             <pubDate>{{ .date }}</pubDate>
           </item>
           {{ $securityCounter = add $securityCounter 1 }}
         {{ end }}
       {{ end }}
     {{ end }}
-    {{ with .Site.Data.security.advisories }}
+    {{ with hugo.Data.security.advisories }}
       {{ $advisoriesCounter := 0 }}
       {{ range (sort .advisories "date" "desc") }}
         {{ if lt $advisoriesCounter 10 }}
           <item>
             <title>{{ .name }}</title>
             <link>{{ absLangURL ($.Site.BaseURL) }}security/advisories/{{ .name }}.asc</link>
             <guid>{{ absLangURL ($.Site.BaseURL) }}security/advisories/{{ .name }}.asc</guid>
             <pubDate>{{ dateFormat "02 Jan 06 15:04 UTC" .date }}</pubDate>
           </item>
           {{ $advisoriesCounter = add $advisoriesCounter 1 }}
         {{ end }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/security/single.html b/website/themes/beastie/layouts/security/single.html
index ffdbd8f81e..d8365b9a76 100644
--- a/website/themes/beastie/layouts/security/single.html
+++ b/website/themes/beastie/layouts/security/single.html
@@ -1,57 +1,57 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
-      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if $.Params.security }}
       <table>
         <thead>
           <tr>
             <th>Date</th>
             {{ if eq $.Params.security "notices" }}
               <th>Errata Notice name</th>
             {{ end }}
             {{ if eq $.Params.security "advisories" }}
               <th>Advisory name</th>
             {{ end }}
           </tr>
         </thead>
         <tbody>
           {{ if eq $.Params.security "notices" }}
-            {{ with .Site.Data.security.errata }}
+            {{ with hugo.Data.security.errata }}
               {{ range .notices }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
           {{ if eq $.Params.security "advisories" }}
-            {{ with .Site.Data.security.advisories }}
+            {{ with hugo.Data.security.advisories }}
               {{ range .advisories }}
                 <tr>
                   <td class="txtdate">{{ .date }}</td>
                   <td><a href="{{.Site.BaseURL | absURL }}security/advisories/{{ .name }}.asc">{{ .name }}</a></td>
                 </tr>
               {{ end }}
             {{ end }}
           {{ end }}
         </tbody>
       </table>
     {{ end }}
     {{ if .GitInfo }}
     <hr />
     <div class="last-modified">
       <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
     </div>
     {{ end }}
   </div>
 </div>
 {{ end }}
 
diff --git a/website/themes/beastie/layouts/single.html b/website/themes/beastie/layouts/single.html
index 286e9ccd5e..34a62a8dca 100644
--- a/website/themes/beastie/layouts/single.html
+++ b/website/themes/beastie/layouts/single.html
@@ -1,19 +1,19 @@
 {{ define "main" }}
 <div id="content">
   <div id="sidewrap">
     <div id="sidenav">
-      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
+      {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }}
     </div>
   </div>
   <div id="contentwrap">
     <h1>{{ .Title }}</h1>
     {{- .Content -}}
     {{ if .GitInfo }}
     <hr />
     <div class="last-modified">
       <p><strong>{{ i18n "last-modified" }}</strong>: {{ .GitInfo.AuthorDate | time.Format ":date_long" }} {{ i18n "by" }} <a href="https://cgit.freebsd.org/doc/commit/?id={{ .GitInfo.AbbreviatedHash }}" target="_blank">{{ .GitInfo.AuthorName }}</a></p>
     </div>
     {{ end }}
   </div>
 </div>
 {{ end }}