diff --git a/pelicanconf.py b/pelicanconf.py
index 508d145..d01d053 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -18,7 +18,7 @@ JINJA_ENVIRONMENT = {'trim_blocks': True, 'lstrip_blocks': True, 'extensions' :
 ## Footer
 FOOTER_INCLUDE = 'myfooter.html'
 IGNORE_FILES = [FOOTER_INCLUDE]
-EXTRA_TEMPLATES_PATHS = [os.path.dirname(__file__)]
+THEME_TEMPLATES_OVERRIDES = [os.path.dirname(__file__)]
 ## Images
 
 # Static paths
@@ -30,13 +30,6 @@ TIMEZONE = 'Europe/Paris'
 DEFAULT_LANG = 'en'
 DEFAULT_DATE_FORMAT = '%Y.%m.%d'
 
-# Feed generation is usually not desired when developing
-FEED_ALL_ATOM = None
-CATEGORY_FEED_ATOM = None
-TRANSLATION_FEED_ATOM = None
-AUTHOR_FEED_ATOM = None
-AUTHOR_FEED_RSS = None
-
 # Blogroll
 LINKS = (('Pelican', 'http://getpelican.com/'),
          ('Python.org', 'http://python.org/'),
diff --git a/publishconf.py b/publishconf.py
index 7dfb170..9efd9b0 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -16,9 +16,6 @@ RELATIVE_URLS = False
 PIWIK_URL = 'epheme.re/stats/piwik'
 PIWIK_SITE_ID = '4'
 
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
-
 DELETE_OUTPUT_DIRECTORY = True
 
 # Following items are often useful when publishing
diff --git a/themes/clean-blog b/themes/clean-blog
index e3bc6df..d24d07b 160000
--- a/themes/clean-blog
+++ b/themes/clean-blog
@@ -1 +1 @@
-Subproject commit e3bc6df468af4638beaada8c90455a0b77f6e5ac
+Subproject commit d24d07bb072fae828fdc6115d5377a22a51c0906