diff --git a/capsule/templates/_default/atom.xml b/capsule/templates/_default/atom.xml
index 66ae306..803eeb2 100644
--- a/capsule/templates/_default/atom.xml
+++ b/capsule/templates/_default/atom.xml
@@ -3,12 +3,19 @@
 <id>{{ .URL }}</id>
 <title>{{ .Title }}</title>
 <updated>{{ site.Generated.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+<author>
+        <name>Valvin</name>
+</author>
 <link href="{{ .URL | safeURL }}" rel="alternate"/>
+<link href="{{ .URL | safeURL }}/atom.xml" rel="self"/>
 {{ range .Pages }}<entry>
         <link href="{{ .URL | safeURL }}" rel="alternate"/>
 	<id>{{ .URL }}</id>
 	<title>{{ .Title }}</title>
 	<updated>{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+        {{ if .Params.tags }}{{ range strings.Split .Params.tags "," -}}
+        <category term="{{ strings.ReplaceAll . " " "" }}" />
+        {{ end }}{{ end -}}
 </entry>
 {{ end -}}
 </feed>