diff --git a/projects/cwi/pelicanconf.py b/projects/cwi/pelicanconf.py
index cc10dca9af787e33a4bd6e111326767b22669c78..7979485c0d4f345fa0cd9c71351df0b49984c7df 100644
--- a/projects/cwi/pelicanconf.py
+++ b/projects/cwi/pelicanconf.py
@@ -3,21 +3,18 @@
 from __future__ import unicode_literals
 
 AUTHOR = u'M.A. Guravage'
+DEFAULT_LANG = u'en'
+PATH = 'content'
 SITENAME = u'CWI Pelican Template'
 SITEURL = ''
-
-PATH = 'content'
-
 TIMEZONE = 'Europe/Amsterdam'
 
-DEFAULT_LANG = u'en'
-
 # 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
+CATEGORY_FEED_ATOM = None
+FEED_ALL_ATOM = None
+TRANSLATION_FEED_ATOM = None
 
 # Blogroll
 LINKS = (('CWI', 'http://www.cwi.nl'),
@@ -28,24 +25,47 @@ LINKS = (('CWI', 'http://www.cwi.nl'),
 SOCIAL = (('twitter', 'https://twitter.com/CWInl'),
           ('github', 'http://github.com'),)
 
-STATIC_PATHS = ['static', 'images', 'private', 'extras/.htaccess', 'extras/.htpassword', 'extras/favicon.ico']
-PAGE_PATHS = ['pages']
+STATIC_PATHS = ['static', 'images', 'private',
+                'extras/.htaccess', 'extras/.htpassword',
+                'extras/top-htaccess', 'extras/favicon.ico']
+
 ARTICLE_PATHS = ['News']
-ARTICLE_URL = 'articles/{slug}.html'
-ARTICLE_SAVE_AS = 'articles/{slug}.html'
+ARTICLE_URL = 'news/{slug}'
+ARTICLE_SAVE_AS = 'news/{slug}.html'
+
+# AUTHOR_URL = 'speakers/{slug}'
+# AUTHOR_SAVE_AS = 'speakers/{slug}.html'
+# AUTHORS_URL = 'speakers'
+# AUTHORS_SAVE_AS = 'speakers/index.html'
+
+CATEGORY_URL = 'category/{slug}'
+CATEGORY_SAVE_AS = 'category/{slug}.html'
+
+PAGE_PATHS = ['pages']
+PAGE_URL = 'pages/{slug}'
 
 DEFAULT_PAGINATION = 10
-USE_FOLDER_AS_CATEGORY = True
 DISPLAY_CATEGORIES_ON_MENU = True
 DISPLAY_PAGES_ON_MENU = True
 LOAD_CONTENT_CACHE = False
+USE_FOLDER_AS_CATEGORY = True
 
 EXTRA_PATH_METADATA = {
     'extras/.htaccess': {'path': 'private/.htaccess'},
     'extras/.htpassword': {'path': 'private/.htpassword'},
-    'extras/favicon.ico': {'path': 'favicon.ico'}
+    'extras/favicon.ico': {'path': 'favicon.ico'},
+    'extras/top-htaccess': {'path': '.htaccess'},
     }
 
+# DIRECT_TEMPLATES = ('authors', 'archives', 'tags')
+# MENUITEMS = [
+#     ('Welcome', ''),
+#     ('Presentations', '/category/presentations'),
+#     ('Speakers', '/speakers'),
+#     ('Tags', '/tags'),
+#     ('Archives', '/archives'),
+# ]
+
 THEME = 'cwi'
 
 # Uncomment following line if you want document-relative URLs when developing