diff --git a/data/templates/atom-item.xml b/data/templates/atom-item.xml
index 6d0e28f..e9185f2 100644
--- a/data/templates/atom-item.xml
+++ b/data/templates/atom-item.xml
@@ -1,7 +1,7 @@
- $title
-
- $root$url
- $timestamp
-
+ $title$
+
+ $root$$url$
+ $timestamp$
+
diff --git a/data/templates/atom.xml b/data/templates/atom.xml
index a2b7a2b..5a7c0cf 100644
--- a/data/templates/atom.xml
+++ b/data/templates/atom.xml
@@ -1,12 +1,12 @@
- $title
-
-
- $root$url
+ $title$
+
+
+ $root$$url$
- $authorName
+ $authorName$
- $timestamp
- $body
+ $timestamp$
+ $body$
diff --git a/data/templates/rss-item.xml b/data/templates/rss-item.xml
index ddfd975..f8f9fcf 100644
--- a/data/templates/rss-item.xml
+++ b/data/templates/rss-item.xml
@@ -1,7 +1,7 @@
-
- $title
- $root$url
-
- $timestamp
- $root$url
+ $title$
+ $root$$url$
+
+ $timestamp$
+ $root$$url$
diff --git a/data/templates/rss.xml b/data/templates/rss.xml
index 36f3abd..d2f3915 100644
--- a/data/templates/rss.xml
+++ b/data/templates/rss.xml
@@ -1,12 +1,12 @@
- $title
- $root
-
- $title$
+ $root$
+
+
- $timestamp
- $body
+ $timestamp$
+ $body$