diff --git a/theme/blog/index.atom.ep b/theme/blog/index.atom.ep
index 9420e82..88acc72 100644
--- a/theme/blog/index.atom.ep
+++ b/theme/blog/index.atom.ep
@@ -2,7 +2,7 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
   <id><%= $site->url($self->links('alternate')->href) %></id>
   <title><%= $site->title %></title>
-  <updated><%= Time::Piece->new->strftime('%Y-%m-%dT%H:%M:%SZ') %></updated>
+  <updated><%= $self->date->new->strftime('%Y-%m-%dT%H:%M:%SZ') %></updated>
   <link rel="self" href="<%= $site->url($self->path) %>"/>
   <link rel="alternate" href="<%= $site->url($self->links('alternate')->href) %>"/>
   <generator version="<%= $Statocles::VERSION %>">Statocles</generator>
diff --git a/theme/blog/index.rss.ep b/theme/blog/index.rss.ep
index e02928b..5a8578b 100644
--- a/theme/blog/index.rss.ep
+++ b/theme/blog/index.rss.ep
@@ -26,7 +26,7 @@
         % }
         </p>
       ]]></description>
-      <pubDate><%= $p->date->strftime('%a, %d %b %Y %H:%M:%S ') . sprintf q{%+05d}, $p->date->tzoffset / 36 %></pubDate>
+      <pubDate><%= $p->date->strftime('%a, %d %b %Y %H:%M:%S ') . sprintf q{%+05d}, $p->date->offset / 36 %></pubDate>
     </item>
     % }
   </channel>
diff --git a/theme/site/layout.html.ep b/theme/layout/default.html.ep
similarity index 100%
rename from theme/site/layout.html.ep
rename to theme/layout/default.html.ep