diff --git a/fp-interface/sharedtpls/atom.tpl b/fp-interface/sharedtpls/atom.tpl
index a7d54c6..2549b07 100644
--- a/fp-interface/sharedtpls/atom.tpl
+++ b/fp-interface/sharedtpls/atom.tpl
@@ -4,7 +4,7 @@
 	<title>{$flatpress.title}</title>
 	<subtitle>{$flatpress.subtitle}</subtitle>
 	<link href="{$smarty.const.BLOG_BASEURL}" />
-	<link rel="self" href="{$smarty.server.REQUEST_URI|escape}" />
+	<link rel="self" href="{'atom'|theme_feed_link}" />
 	<generator uri="http://www.flatpress.org/" version="{$flatpress.version}">
   		FlatPress
 	</generator>
diff --git a/fp-interface/sharedtpls/comment-rss.tpl b/fp-interface/sharedtpls/comment-rss.tpl
index d7f65ae..acb3451 100644
--- a/fp-interface/sharedtpls/comment-rss.tpl
+++ b/fp-interface/sharedtpls/comment-rss.tpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="{$fp_config.locale.charset}" ?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 	{entry_block}
 		{entry}
@@ -9,8 +9,9 @@
 		<link>{$the_comment_link}</link>
 		<description><![CDATA[{$flatpress.subtitle}]]></description>
 		<copyright>Copyright {$smarty.now|date_format:"$Y"}, {$flatpress.author}</copyright>
-		<managingEditor>{$flatpress.email}</managingEditor>
-		<language>{$flatpress.lang}</language>
+ 		<managingEditor>{$flatpress.email} ({$flatpress.author})</managingEditor>
+		<language>{$fp_config.locale.lang}</language>
+		<atom:link rel="self" href="{'rss2'|theme_comments_feed_link:$id}" type="application/rss+xml" />
 
 		<generator>FlatPress</generator>
 		
@@ -36,4 +37,4 @@
 	{/entry_block}
 		
 	</channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/fp-interface/sharedtpls/rss.tpl b/fp-interface/sharedtpls/rss.tpl
index bb572b5..645e656 100755
--- a/fp-interface/sharedtpls/rss.tpl
+++ b/fp-interface/sharedtpls/rss.tpl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="{$fp_config.locale.charset}" ?>
-<rss version="2.0">
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<title>{$flatpress.title}</title>
 		<link>{$flatpress.www}</link>
 		<description><![CDATA[{$flatpress.subtitle}]]></description>
 		<copyright>Copyright {$smarty.now|date_format:"$Y"}, {$flatpress.author}</copyright>
-		<managingEditor>{$flatpress.email}</managingEditor>
-		<language>{$flatpress.lang}</language>
-
+		<managingEditor>{$flatpress.email} ({$flatpress.author})</managingEditor>
+		<language>{$fp_config.locale.lang}</language>
+		<atom:link rel="self" href="{'rss2'|theme_feed_link}" type="application/rss+xml" />
 		<generator>FlatPress</generator>
 		{entry_block}
 			{entry}
@@ -16,10 +16,10 @@
 			<title>{$subject}</title>
 			<link>{$id|link:post_link}</link>
 			<description><![CDATA[{$content|tag:the_content}]]></description>
-			{if ($categories)} <category>{$categories|@filed:false} </category>{/if}
+			{if ($categories)} <category><![CDATA[ {$categories|@filed:false} ]]></category>{/if}
 			<guid isPermaLink="true">{$id|link:post_link}</guid>
 
-			<author>{$flatpress.AUTHOR} {$flatpress.EMAIL}</author>
+			<author>{$flatpress.email} ($flatpress.author})</author>
 			<pubDate>{$date|date_format:"%a, %d %b %Y %H:%M:%S %z"}</pubDate>
 			<comments>{$id|link:comments_link}</comments>
 			
@@ -29,4 +29,4 @@
 		{/entry_block}
 		
 	</channel>
-</rss>
\ No newline at end of file
+</rss>