diff --git a/layouts/_default/list.atom b/layouts/_default/list.atom
index dae3723..b630465 100644
--- a/layouts/_default/list.atom
+++ b/layouts/_default/list.atom
@@ -1,22 +1,28 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
-  <link href="{{ .Permalink }}index.xml" rel="self"/>
+  <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <link href="{{ .Permalink }}feed.atom.xml" rel="self"/>
   <link href="{{ .Permalink }}"/>{{ if not .Date.IsZero }}
   <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>{{ end }}
-  <id>{{ .Permalink }}</id>{{ with .Site.Author.name }}
-  <author>
-    <name>{{.}}</name>{{ with $.Site.Author.email }}
-    <email>{{.}}</email>{{end}}
-  </author>{{end}}
+  <id>{{ .Permalink }}</id>
+  {{ with .Site.Params.author }}
+    {{ $author := index $.Site.Data.authors . }}
+    <author>
+        <name>{{ $author.name }}</name>
+        <email>{{ $author.email }}</email>
+    </author>
+  {{end}}
   <generator>Hugo -- gohugo.io</generator>
   {{ range where .Pages "Type" "post" }}
   <entry>
     {{ `<title type="html"><![CDATA[` | safeHTML }}{{ .Title }}]]></title>
     <link href="{{ .Permalink }}"/>
-    <id>{{ .Permalink }}</id>{{ with .Site.Params.Author }}
-    <author>
-      <name>{{.}}</name>
-    </author>{{end}}
+    <id>{{ .Permalink }}</id>
+    {{ with .Params.Author }}
+      {{ $author := index $.Site.Data.authors . }}
+      <author>
+        <name>{{ $author.name }}</name>
+      </author>
+    {{end}}
     <published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
     <updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
     {{ `<content type="html"><![CDATA[` | safeHTML }}{{ .Content }}]]></content>
diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index dae3723..b630465 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -1,22 +1,28 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
-  <link href="{{ .Permalink }}index.xml" rel="self"/>
+  <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <link href="{{ .Permalink }}feed.atom.xml" rel="self"/>
   <link href="{{ .Permalink }}"/>{{ if not .Date.IsZero }}
   <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>{{ end }}
-  <id>{{ .Permalink }}</id>{{ with .Site.Author.name }}
-  <author>
-    <name>{{.}}</name>{{ with $.Site.Author.email }}
-    <email>{{.}}</email>{{end}}
-  </author>{{end}}
+  <id>{{ .Permalink }}</id>
+  {{ with .Site.Params.author }}
+    {{ $author := index $.Site.Data.authors . }}
+    <author>
+        <name>{{ $author.name }}</name>
+        <email>{{ $author.email }}</email>
+    </author>
+  {{end}}
   <generator>Hugo -- gohugo.io</generator>
   {{ range where .Pages "Type" "post" }}
   <entry>
     {{ `<title type="html"><![CDATA[` | safeHTML }}{{ .Title }}]]></title>
     <link href="{{ .Permalink }}"/>
-    <id>{{ .Permalink }}</id>{{ with .Site.Params.Author }}
-    <author>
-      <name>{{.}}</name>
-    </author>{{end}}
+    <id>{{ .Permalink }}</id>
+    {{ with .Params.Author }}
+      {{ $author := index $.Site.Data.authors . }}
+      <author>
+        <name>{{ $author.name }}</name>
+      </author>
+    {{end}}
     <published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
     <updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
     {{ `<content type="html"><![CDATA[` | safeHTML }}{{ .Content }}]]></content>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index fcf6b57..13214bb 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -24,10 +24,9 @@
         </span>
 
         {{ with .Params.Author }}
-            {{ $key := . }}
-            {{ $author := index $.Site.Data.authors $key }}
+            {{ $author := index $.Site.Data.authors . }}
 
-            {{ with $.Site.GetPage (printf "/authors/%s" $author.name | urlize) }}
+            {{ with $.Site.GetPage (printf "/author/%s" $author.name | urlize) }}
             <span class="post-footer__button">
               <i class="fas fa-user post-footer__icon"></i>
               <a class="post-footer__link" href="{{ .RelPermalink }}" title="Alle Artikel des Autors">{{ $author.name }}</a>