diff --git a/view/atom_cmnt.tpl b/view/atom_cmnt.tpl
new file mode 100644
index 000000000..fb96fd918
--- /dev/null
+++ b/view/atom_cmnt.tpl
@@ -0,0 +1,15 @@
+	<entry>
+		<author>
+			<name>$name</name>
+			<uri>$profile_page</uri>
+			<dfrn:avatar>$thumb</dfrn:avatar>  
+		</author>
+
+		<thr:in-reply-to ref="$parent_id" />
+		<id>$item_id</id>
+		<title>$title</title>
+		<updated>$updated</updated>
+		<content>$content</content>
+		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
+	</entry>
+
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
new file mode 100644
index 000000000..c283ad8f7
--- /dev/null
+++ b/view/atom_feed.tpl
@@ -0,0 +1,14 @@
+<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:thr="http://purl.org/syndication/thread/1.0"
+      xmlns:at="http://purl.org/atompub/tombstones/1.0"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" >
+
+  <id>$feed_id</id>
+  <title>$feed_title</title>
+  <updated>$feed_updated</updated>
+
+  <author>
+    <name>$name</name>
+    <uri>$profile_page</uri>
+    <dfrn:avatar>$photo</dfrn:avatar>
+  </author>
diff --git a/view/atom_item.tpl b/view/atom_item.tpl
new file mode 100644
index 000000000..db2d7dfb5
--- /dev/null
+++ b/view/atom_item.tpl
@@ -0,0 +1,14 @@
+	<entry>
+		<author>
+			<name>$name</name>
+			<uri>$profile_page</uri>
+			<dfrn:avatar>$thumb</dfrn:avatar>
+		</author>
+
+		<id>$item_id</id>
+		<title>$title</title>
+		<published>$published</published>
+		<updated>$updated</updated>
+		<content>$content</content>
+		<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
+	</entry>
diff --git a/view/atom_tomb.tpl b/view/atom_tomb.tpl
new file mode 100644
index 000000000..99e1b943a
--- /dev/null
+++ b/view/atom_tomb.tpl
@@ -0,0 +1,3 @@
+
+	<at:deleted-entry ref="$id" when="$updated" />
+
diff --git a/view/atomic.tpl b/view/atomic.tpl
deleted file mode 100644
index 9a72a7489..000000000
--- a/view/atomic.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:foaf="http://xmlns.com/foaf/0.1" 
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
->
-  <id>$feed_id</id>
-  <title>$feed_title</title>
-  <updated>$feed_updated</updated>
-
-  <author>
-    <name>$name</name>
-    <foaf:homepage rdf:resource="$profile_page" />
-    <foaf:img rdf:resource="$thumb" />  
-  </author>
-
-
-  <entry>
-     <id>$item_id</id>
-     <title>$title</title>
-     <link href="$link" />
-     <updated>$updated</updated>
-     <summary>$summary</summary>
-     <content type="text/plain" >$content</content>
-  </entry>
-</feed>
\ No newline at end of file