diff --git a/website/content/pages/index.md b/website/content/pages/index.md
index 39fd507..ab4acfc 100644
--- a/website/content/pages/index.md
+++ b/website/content/pages/index.md
@@ -1,7 +1,5 @@
 title: offen.software
 description: TBD
 save_as: index.html
-template: page
+template: index
 sitemap_priority: 1.0
-
-### offen.software website
diff --git a/website/pelicanconf.py b/website/pelicanconf.py
index b4635b2..0713f27 100644
--- a/website/pelicanconf.py
+++ b/website/pelicanconf.py
@@ -58,7 +58,6 @@ MARKDOWN = {
 }
 
 DECORATE_CONTENT = {
-    'h1': ['ma0'],
     'h2': ['ma0'],
     'h3': ['ma0'],
     'h4': ['ma0'],
diff --git a/website/theme/static/css/styles.css b/website/theme/static/css/styles.css
index 770e799..9c6b036 100644
--- a/website/theme/static/css/styles.css
+++ b/website/theme/static/css/styles.css
@@ -7,3 +7,9 @@ COLORS
 .color-extra {
   color: #F5BEA7;
 }
+/* ---------------------------------------------------
+TYPOGRAPHY
+----------------------------------------------------*/
+.trackedWide {
+  letter-spacing:  0.04em;
+}
diff --git a/website/theme/templates/base.html b/website/theme/templates/base.html
index 780d27a..4fd0b45 100644
--- a/website/theme/templates/base.html
+++ b/website/theme/templates/base.html
@@ -31,10 +31,17 @@
   -->
 </head>
 {% endblock %}
-<body class="f5 poppins no-js color-extra bgColor-extra">
-  {% block content %}{% endblock %}
+<body class="poppins f4 trackedWide lh-title no-js color-extra bgColor-extra">
+
+  <main class="w-100">
+    <div class="mw7 center pa3">
+      {% block content %}{% endblock %}
+    </div>
+  </main>
+
   <script>
     document.body.classList.remove('no-js');
   </script>
+
 </body>
 </html>
diff --git a/website/theme/templates/index.html b/website/theme/templates/index.html
index a9f8d04..8d75580 100644
--- a/website/theme/templates/index.html
+++ b/website/theme/templates/index.html
@@ -1,5 +1,11 @@
-{% extends "base.html" %}
+{% extends "page.html" %}
 {% set index = True %}
 
 {% block content %}
+<h1 class="f4 trackedWide ma0 mb3">
+  <span class="fw4">offen.</span><span class="fw7">software</span>
+</h1>
+<p class="ma0">
+  <span class="fw4">We </span><span class="fw7">think up, create and ship </span><span class="fw4">software for organisations and individuals who embrace </span><span class="fw7">societal change.</span>
+</p>
 {% endblock %}
diff --git a/website/theme/templates/page.html b/website/theme/templates/page.html
index ec1fb5f..f94e5b5 100644
--- a/website/theme/templates/page.html
+++ b/website/theme/templates/page.html
@@ -1,8 +1,9 @@
 {% extends "base.html" %}
 
-{% set href = page.href %}
 {% set title = page.title %}
 {% set description = page.description %}
+{% set href = page.save_as.replace('index.html', '') %}
+{% set template = page.template %}
 
 {% block content %}
   {{ page.content }}
