diff --git a/hugo.toml b/hugo.toml
index 3b2548b..62fb6ad 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -1,5 +1,5 @@
 baseURL = 'https://hamburg.ccc.de/'
-languageCode = 'de-de'
+locale = 'de-de'
 defaultContentLanguage = 'de'
 timeZone = 'Europe/Berlin'
 title = 'CCC Hansestadt Hamburg e.V.'
diff --git a/themes/ccchh/layouts/_default/rss.xml b/themes/ccchh/layouts/_default/rss.xml
index cc83ee8..baf0f96 100644
--- a/themes/ccchh/layouts/_default/rss.xml
+++ b/themes/ccchh/layouts/_default/rss.xml
@@ -1,4 +1,3 @@
-{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
 {{- $authorEmail := "" }}
 {{- with site.Params.author }}
   {{- if reflect.IsMap . }}
@@ -6,14 +5,8 @@
       {{- $authorEmail = . }}
     {{- end }}
   {{- end }}
-{{- else }}
-  {{- with site.Author.email }}
-    {{- $authorEmail = . }}
-    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
-  {{- end }}
 {{- end }}
 
-{{- /* Deprecate site.Author.name in favor of site.Params.author.name */}}
 {{- $authorName := "" }}
 {{- with site.Params.author }}
   {{- if reflect.IsMap . }}
@@ -23,11 +16,6 @@
   {{- else }}
     {{- $authorName  = . }}
   {{- end }}
-{{- else }}
-  {{- with site.Author.name }}
-    {{- $authorName = . }}
-    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
-  {{- end }}
 {{- end }}
 
 {{- $pctx := . }}
@@ -48,12 +36,12 @@
     <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} on {{ end }}{{ .Site.Title }}{{ end }}</title>
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ .Site.Title }}</description>
-    <generator>Hugo -- gohugo.io</generator>
-    {{ with $authorEmail }}
+    <generator>Hugo</generator>
+    <language>{{ site.Language.Locale }}</language>{{ with $authorEmail }}
     <managingEditor>{{.}}{{ with $authorName }} ({{ . }}){{ end }}</managingEditor>{{ end }}{{ with $authorEmail }}
     <webMaster>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</webMaster>{{ end }}{{ with .Site.Copyright }}
     <copyright>{{ . }}</copyright>{{ end }}{{ if not .Date.IsZero }}
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    <lastBuildDate>{{ (index $pages.ByLastmod.Reverse 0).Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
     {{- with .OutputFormats.Get "RSS" }}
     {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{- end }}
@@ -69,7 +57,7 @@
       <pubDate>{{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       {{- with $authorEmail }}<author>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</author>{{ end }}
       <guid>{{ .Permalink }}</guid>
-      <description>{{ .Content | html }}</description>
+      <description>{{ .Content | transform.XMLEscape | safeHTML }}</description>
     </item>
     {{- end }}
   </channel>
diff --git a/themes/ccchh/layouts/shortcodes/calendar-table.html b/themes/ccchh/layouts/shortcodes/calendar-table.html
index ecc37a5..fb17e2a 100644
--- a/themes/ccchh/layouts/shortcodes/calendar-table.html
+++ b/themes/ccchh/layouts/shortcodes/calendar-table.html
@@ -1,4 +1,4 @@
-{{- index .Site.Data "calendar.json" }}
+{{- index hugo.Data "calendar.json" }}
 <table>
   <thead>
     <tr>
@@ -8,7 +8,7 @@
     </tr>
   </thead>
   <tbody>
-  {{- range first 7 (sort $.Site.Data.calendar "dtstart" ) }}
+  {{- range first 7 (sort hugo.Data.calendar "dtstart" ) }}
     {{- if eq ._type "vevent"}}
     <tr>
       {{- $start := time .dtstart }}