diff --git a/projects/cwi/pelicanconf.py b/projects/cwi/pelicanconf.py
index b69d30e176ebab5a95c84f889df2485e462e9d62..cc10dca9af787e33a4bd6e111326767b22669c78 100644
--- a/projects/cwi/pelicanconf.py
+++ b/projects/cwi/pelicanconf.py
@@ -20,31 +20,34 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 # Blogroll
-LINKS = (('Pelican', 'http://getpelican.com/'),
-         ('Python.org', 'http://python.org/'),
-         ('Jinja2', 'http://jinja.pocoo.org/'),)
+LINKS = (('CWI', 'http://www.cwi.nl'),
+         ('STW', 'http://www.stw.nl'),
+         ('NWO', 'http://www.nwo.nl'),)
 
 # Social widget
 SOCIAL = (('twitter', 'https://twitter.com/CWInl'),
           ('github', 'http://github.com'),)
 
-STATIC_PATHS = ['static', 'images', 'extras/.htaccess', 'extras/.htpassword', 'extras/favicon.ico']
-PAGE_PATHS = ['pages','news', 'private']
-ARTICLE_PATHS = ['blog']
+STATIC_PATHS = ['static', 'images', 'private', 'extras/.htaccess', 'extras/.htpassword', 'extras/favicon.ico']
+PAGE_PATHS = ['pages']
+ARTICLE_PATHS = ['News']
+ARTICLE_URL = 'articles/{slug}.html'
+ARTICLE_SAVE_AS = 'articles/{slug}.html'
 
 DEFAULT_PAGINATION = 10
-THEME = 'cwi'
 USE_FOLDER_AS_CATEGORY = True
-DISPLAY_CATEGORIES_ON_MENU = False
+DISPLAY_CATEGORIES_ON_MENU = True
 DISPLAY_PAGES_ON_MENU = True
 LOAD_CONTENT_CACHE = False
 
 EXTRA_PATH_METADATA = {
-    'extras/.htaccess': {'path': 'pages/.htaccess'},
-    'extras/.htpassword': {'path': 'pages/.htpassword'},
+    'extras/.htaccess': {'path': 'private/.htaccess'},
+    'extras/.htpassword': {'path': 'private/.htpassword'},
     'extras/favicon.ico': {'path': 'favicon.ico'}
     }
 
+THEME = 'cwi'
+
 # Uncomment following line if you want document-relative URLs when developing
 #RELATIVE_URLS = True