diff --git a/pelicanconf.py b/pelicanconf.py
index 09fb0f4..a1bac20 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1,15 +1,51 @@
+###############################################################################
+#                             Main settings                                   #
+###############################################################################
+
 AUTHOR = 'Tobias Radloff'
 SITENAME = 'Tobias Radloff'
 SITESUBTITLE = "Schriftsteller"
 SITETAG = "Schriftsteller"
-SITEURL = "tobias-radloff.de"
-
-PATH = "content"
-ARTICLE_PATHS = ["posts"]
+SITEURL = ""
 
 TIMEZONE = 'Europe/Berlin'
 DEFAULT_LANG = 'de'
 
+THEME = "theme/"
+
+
+###############################################################################
+#                          URL & Path Settings                                #
+###############################################################################
+
+PATH = "content"
+ARTICLE_PATHS = ["posts"]
+PAGE_PATHS = ["pages"]
+
+#PATH_METADATA = '(?P<path_no_ext>.*)\..*'
+#PAGE_SAVE_AS = '{path_no_ext}.html'
+ARTICLE_SAVE_AS = '{category}/{slug}.html'
+
+DEFAULT_PAGINATION = 5
+
+# Uncomment following line if you want document-relative URLs when developing
+RELATIVE_URLS = True
+
+DISPLAY_PAGES_ON_MENU = DISPLAY_CATEGORIES_ON_MENU = False
+MENUITEMS = (
+    ("Werke", "/werke/"),
+    ("Neues", "/neues/"),
+    ("Termine", "/termine/"),
+    ("Autor", "/autor/"),
+    ("Kontakt", "/kontakt/")
+)
+
+IGNORE_FILES = ['**/.*']
+
+###############################################################################
+#                          Feed & Link Settings                               #
+###############################################################################
+
 # Feed generation is usually not desired when developing
 FEED_ALL_ATOM = None
 CATEGORY_FEED_ATOM = None
@@ -31,20 +67,14 @@ SOCIAL = (
     ("Another social link", "#"),
 )
 
-DEFAULT_PAGINATION = 5
 
-# Uncomment following line if you want document-relative URLs when developing
-RELATIVE_URLS = True
+###############################################################################
+#                           Technical Settings                                #
+###############################################################################
+
+JINJA_ENVIRONMENT = { "extensions": ["jinja2.ext.debug"] }
+
 
-THEME = "theme/"
-DISPLAY_PAGES_ON_MENU = False
-MENUITEMS = (
-    ("Werke", "/werke/"),
-    ("Neues", "/neues/"),
-    ("Termine", "/termine/"),
-    ("Autor", "/autor/"),
-    ("Kontakt", "/kontakt/")
-)
 
 
 ###############################################################################
diff --git a/publishconf.py b/publishconf.py
index 6f1308b..35dece2 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -8,7 +8,7 @@ sys.path.append(os.curdir)
 from pelicanconf import *
 
 # If your site is available via HTTPS, make sure SITEURL begins with https://
-SITEURL = ""
+SITEURL = "https://tobias-radloff.de"
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = "feeds/all.atom.xml"