diff --git a/homepage/content/pages/404.md b/homepage/content/pages/404.md
index 96939ee..fc40732 100644
--- a/homepage/content/pages/404.md
+++ b/homepage/content/pages/404.md
@@ -1,10 +1,8 @@
-Title: Page not found | Offen
+title: Page not found | Offen
 description: This link isn’t working.
 save_as: 404.html
-href: /404.html
 no_stats: true
 exclude_from_sitemap: true
-sm_image_url: /theme/images/offen-logo-social-media.jpg
 
 
 ![Page not Found](/theme/images/content-404.webp){:class="image-text-600-338"}
diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md
index 93e2c9d..6e590aa 100644
--- a/homepage/content/pages/about.md
+++ b/homepage/content/pages/about.md
@@ -1,8 +1,6 @@
-Title: About | Offen
+title: About | Offen
 description: Who we are, who supports us and how you can can get in touch.
-save_as: about/index.html
-href: /about/
-sm_image_url: /theme/images/offen-logo-social-media.jpg
+slug: about
 
 ## About
 
diff --git a/homepage/content/pages/blog-0010-milestone1.md b/homepage/content/pages/blog-0010-milestone1.md
index 6a7e0f3..84cee4f 100644
--- a/homepage/content/pages/blog-0010-milestone1.md
+++ b/homepage/content/pages/blog-0010-milestone1.md
@@ -1,4 +1,4 @@
-Title: Laying the foundation for fair web analytics | Offen
+title: Laying the foundation for fair web analytics | Offen
 description: Our milestone 1 achievements include extensible architecture, a localization option and an improved server structure.
 save_as: blog/laying-foundation-for-fair-web-analytics/index.html
 href: /blog/laying-foundation-for-fair-web-analytics/
diff --git a/homepage/content/pages/blog.md b/homepage/content/pages/blog.md
deleted file mode 100644
index 17ea494..0000000
--- a/homepage/content/pages/blog.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: Fair analytics blog | Offen
-description: Developing Offen. A free and open source analytics software for websites and web applications that allows respectful handling of data.
-save_as: blog/index.html
-href: /blog/
-exclude_from_sitemap: true
-sm_image_url: /theme/images/offen-logo-social-media.jpg
-
-
-## Fair analytics blog
-### Developing Offen. A free and open source analytics software for websites and web applications that allows respectful handling of data.
-
----
-
-12 Dec 2019
-
-[![Milestone 1 - Laying the foundation for fair web analytics](/theme/images/offen-blog-0010-milestone1.jpg){:class="image-text-600-322"}](/blog/laying-foundation-for-fair-web-analytics/)
-
-## [Episode One — Laying the foundation for fair web analytics](/blog/laying-foundation-for-fair-web-analytics/)
\ No newline at end of file
diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md
index 744110b..fc005d6 100644
--- a/homepage/content/pages/deep-dive.md
+++ b/homepage/content/pages/deep-dive.md
@@ -1,9 +1,7 @@
-Title: Deep dive | Offen
+title: Deep dive | Offen
 description: What do users know about their data? How can they access it? Do operators benefit from a careful handling of user data? Does Offen work in accordance with GDPR?
-save_as: deep-dive/index.html
-href: /deep-dive/
+slug: deep-dive
 sitemap_priority: 0.7
-sm_image_url: /theme/images/offen-logo-social-media.jpg
 
 ## Deep dive
 
diff --git a/homepage/content/pages/index.md b/homepage/content/pages/index.md
index c9f0b3c..83b71bc 100644
--- a/homepage/content/pages/index.md
+++ b/homepage/content/pages/index.md
@@ -1,10 +1,8 @@
-Title: Transparent web analytics for everyone | Offen
+title: Transparent web analytics for everyone | Offen
 description: Offen is a free and open source analytics software for websites and web applications. Users can access their data while the operators treat it with respect.
 save_as: index.html
-href: /
 template: index
 sitemap_priority: 1.0
-sm_image_url: /theme/images/offen-logo-social-media.jpg
 
 ## Summary
 
diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md
index ec3aa07..8728fb1 100644
--- a/homepage/content/pages/legal-notice.md
+++ b/homepage/content/pages/legal-notice.md
@@ -1,9 +1,7 @@
-Title: Legal Notice | Offen
+title: Legal Notice | Offen
 description: Information in accordance with Section 5 TMG
-save_as: legal-notice/index.html
-href: /legal-notice/
+slug: legal-notice
 exclude_from_sitemap: true
-sm_image_url: /theme/images/offen-logo-social-media.jpg
 
 ## Legal Notice
 
diff --git a/homepage/content/pages/opt-out.md b/homepage/content/pages/opt-out.md
deleted file mode 100644
index 2fb24a3..0000000
--- a/homepage/content/pages/opt-out.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Title: Opt-out | Offen
-description: Prevent Offen from aggregating the actions you have taken on participating websites.
-save_as: opt-out/index.html
-exclude_from_sitemap: true
-sm_image_url: /theme/images/offen-logo-social-media.jpg
-
-## You are opted out
-
-This will prevent Offen from aggregating the actions you have taken on participating websites.
-
-Operators now cannot draw any conclusions from your actions via Offen. At the same time, however, they *cannot create a better experience* for you and other users.
-
-<script>
-  var vault = document.createElement('iframe')
-  vault.style.display = 'none'
-  vault.setAttribute('width', '0')
-  vault.setAttribute('height', '0')
-  vault.setAttribute('frameBorder', '0')
-  vault.setAttribute('scrolling', 'no')
-  vault.addEventListener('load', function (e) {
-    vault.contentWindow.postMessage({
-      type: 'OPTOUT',
-      payload: {
-        status: true
-      }
-    }, '*')
-  })
-  vault.src = 'https://vault-alpha.offen.dev'
-  document.body.append(vault)
-</script>
diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py
index 4c15740..4ccf746 100644
--- a/homepage/pelicanconf.py
+++ b/homepage/pelicanconf.py
@@ -37,6 +37,7 @@ TAGS_SAVE_AS = None
 # keep this for access to page variable
 DIRECT_TEMPLATES = ['sitemap']
 SITEMAP_SAVE_AS = 'sitemap.xml'
+PAGE_SAVE_AS = '{slug}/index.html'
 
 PLUGIN_PATHS = ['./plugins']
 PLUGINS = ['decorate_content', 'assets']
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html
index 188a094..e3f89e2 100644
--- a/homepage/theme/templates/base.html
+++ b/homepage/theme/templates/base.html
@@ -13,11 +13,11 @@
   <meta property="og:title" content="{{ page.title }}">
   <meta property="og:description" content="{{ page.description }}">
   <meta property="og:type" content="website">
-  <meta property="og:url" content="{{ SITEURL }}{{ page.href or page.url or page.save_as }}">
+  <meta property="og:url" content="{{ SITEURL }}/{{ page.save_as | replace('index.html', '') }}">
   <meta property="og:image" content="{{ SITEURL }}{{ page.sm_image_url }}">
   <meta name="twitter:image:alt" content="Offen logo">
   <meta name="twitter:card" content="summary_large_image">
-  <link rel="canonical" href="{{ SITEURL }}{{ page.href or page.url or page.save_as }}">
+  <link rel="canonical" href="{{ SITEURL }}/{{ page.save_as | replace('index.html', '') }}">
   <link rel="shortcut icon" type="image/x-icon" href="/theme/images/favicon.ico">
   {% assets filters="libsass,postcss,cssmin", output="css/style.min.css", "css/normalize.css", "css/fonts.css", "css/style.scss" %}
     <link rel="stylesheet" href="/{{ ASSET_URL }}">
@@ -26,7 +26,7 @@
     <script async src="/script.js" data-account-id="{{ OFFEN_ACCOUNT_ID }}"></script>
   {% endif %}
 </head>
-<body class="{{page.template}}">
+<body class="{{ page.template }}">
   <div class="menu">
     <section class="nav-bar">
       <div class="nav-container">
@@ -49,10 +49,10 @@
               <a href="/about/">About</a>
             </li>
             <li>
-              <a href="{{GITHUB_ORG}}" rel="noopener" target="_blank">GitHub</a>
+              <a href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a>
             </li>
             <li>
-              <a href="{{PATREON_URL}}" rel="noopener" target="_blank">Patreon</a>
+              <a href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a>
             </li>
           </ul>
         </nav>
@@ -103,7 +103,7 @@
                 We're working hard to ensure that Offen is independent, cutting-edge and can be sustained for years to come.
               </p>
               <div class="btn-wrapper">
-                <a class="btn btn-color-black" href="{{PATREON_URL}}" rel="noopener" target="_blank">Support us</a>
+                <a class="btn btn-color-black" href="{{ PATREON_URL }}" rel="noopener" target="_blank">Support us</a>
               </div>
             </div>
           </div>
@@ -121,22 +121,22 @@
       </div>
       <div class="footer-card">
         <p>
-          <a href="mailto:{{CONTACT_EMAIL}}">{{CONTACT_EMAIL}}</a>
-          <a target="_blank" href="/theme/{{GPG_KEY_FILE}}">[GPG Key]</a>
+          <a href="mailto:{{ CONTACT_EMAIL }}">{{CONTACT_EMAIL}}</a>
+          <a target="_blank" href="/theme/{{ GPG_KEY_FILE }}">[GPG Key]</a>
         </p>
         <p>
-          <a href="{{GITHUB_ORG}}" rel="noopener" target="_blank">GitHub</a>
+          <a href="{{ GITHUB_ORG }}" rel="noopener" target="_blank">GitHub</a>
         </p>
         <p>
-          <a href="{{PATREON_URL}}" rel="noopener" target="_blank">Patreon</a>
+          <a href="{{ PATREON_URL }}" rel="noopener" target="_blank">Patreon</a>
         </p>
       </div>
       <div class="footer-card">
         <p>
-          <a href="{{LINKEDIN_URL}}" rel="noopener" target="_blank">LinkedIn</a>
+          <a href="{{ LINKEDIN_URL }}" rel="noopener" target="_blank">LinkedIn</a>
         </p>
         <p>
-          <a href="{{TWITTER_URL}}" rel="noopener" target="_blank">Twitter</a>
+          <a href="{{ TWITTER_URL }}" rel="noopener" target="_blank">Twitter</a>
         </p>
         <p>
           <a href="/legal-notice/">Legal Notice</a>
diff --git a/homepage/theme/templates/sitemap.html b/homepage/theme/templates/sitemap.html
index 59d1001..fd21308 100644
--- a/homepage/theme/templates/sitemap.html
+++ b/homepage/theme/templates/sitemap.html
@@ -3,7 +3,7 @@
 {% for page in pages %}
   {% if not page.exclude_from_sitemap %}
     <url>
-      <loc>{{ SITEURL }}{{ page.href }}</loc>
+      <loc>{{ SITEURL }}/{{ page.save_as | replace('index.html', '') }}</loc>
       <priority>{{ page.sitemap_priority or 0.5 }}</priority>
     </url>
   {% endif %}