diff --git a/content/_index.en.md b/content/_index.en.md
new file mode 100644
index 0000000..86e2622
--- /dev/null
+++ b/content/_index.en.md
@@ -0,0 +1,23 @@
+---
+title: "Home"
+date: 2018-10-13T19:26:34+02:00
+draft: false
+type: "home"
+heading:
+  heading: Vikunja (/vɪˈkuːnjə/)
+  content: The to-do app to organize your life.
+  subtitle: Also one of the two wild South American camelids which live in the high<br/>
+            alpine areas of the Andes and a [relative of the llama](https://en.wikipedia.org/wiki/Vicu%C3%B1a).
+  subsubtitle: Vikunja is a [self-hosted](https://vikunja.io/docs/installation) To-Do list application with 
+               a web app and [mobile apps](download) for all platforms.
+               It is licensed under the [LGPLv3](https://code.vikunja.io/api/src/branch/master/LICENSE). 
+menu:
+  page:
+    title: "Home"
+    weight: 10
+---
+
+<div class="container">
+<a class="button is-success is-large" href="https://try.vikunja.io" target="_blank">Try it</a>
+<a class="button is-light is-large" href="https://vikunja.io/docs">Docs</a>
+</div>
\ No newline at end of file
diff --git a/content/download.en.md b/content/download/index.en.md
similarity index 100%
rename from content/download.en.md
rename to content/download/index.en.md
diff --git a/content/features.en.md b/content/features/index.en.md
similarity index 100%
rename from content/features.en.md
rename to content/features/index.en.md
diff --git a/content/index.en.md b/content/index.en.md
deleted file mode 100644
index e4b8645..0000000
--- a/content/index.en.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: "Home"
-date: 2018-10-13T19:26:34+02:00
-draft: false
-type: "home"
-menu:
-  page:
-    title: "Home"
-    weight: 10
----
-
-<h1 class="title is-1">Vikunja (/vɪˈkuːnjə/)</h1>
-<h3 class="subtitle is-3">The to-do app to organize your life.</h3>
-<h4 class="subtitle is-4">
-Also one of the two wild South American camelids which live in the high <br/>
-alpine areas of the Andes and a [relative of the llama](https://en.wikipedia.org/wiki/Vicu%C3%B1a).
-</h3>
-<h4 class="subtitle text-normal">
-    Vikunja is a [self-hosted](https://vikunja.io/docs/installation) To-Do list application with 
-    a web app and [mobile apps](download) for all platforms.
-    It is licensed under the [LGPLv3](https://code.vikunja.io/api/src/branch/master/LICENSE).
-</h4>
-
-<div class="container">
-<a class="button is-success is-large" href="https://try.vikunja.io" target="_blank">Try it</a>
-<a class="button is-light is-large" href="https://vikunja.io/docs">Docs</a>
-</div>
\ No newline at end of file
diff --git a/themes/vikunja/layouts/doc/list.html b/themes/vikunja/layouts/doc/list.html
deleted file mode 100644
index e69de29..0000000
diff --git a/themes/vikunja/layouts/home/list.html b/themes/vikunja/layouts/home/list.html
deleted file mode 100644
index e69de29..0000000
diff --git a/themes/vikunja/layouts/index.html b/themes/vikunja/layouts/index.html
new file mode 100644
index 0000000..88ccb1e
--- /dev/null
+++ b/themes/vikunja/layouts/index.html
@@ -0,0 +1,33 @@
+{{ partial "header.html" . }}
+
+<section class="homepage-hero hero is-dark is-medium">
+	<!-- Hero head: will stick at the top -->
+	<div class="hero-head">
+		{{ partial "navbar-blank.html" . }}
+	</div>
+
+	<!-- Hero content: will be in the middle -->
+	<div class="hero-body">
+		<div class="container has-text-centered">
+
+			{{ if .Params.heading }}
+				{{ if .Params.heading.heading }}
+					<h1 class="title is-1">{{.Params.heading.heading | markdownify}}</h1>
+				{{end}}
+				{{ if .Params.heading.content }}
+					<h3 class="subtitle is-3">{{.Params.heading.content | markdownify}}</h3>
+				{{end}}
+				{{ if .Params.heading.subtitle }}
+					<h4 class="subtitle is-4">{{.Params.heading.subtitle | markdownify}}</h4>
+				{{end}}
+				{{ if .Params.heading.subsubtitle }}
+					<h4 class="subtitle text-normal">{{.Params.heading.subsubtitle | markdownify}}</h4>
+				{{end}}
+			{{end}}
+
+			{{ .Content | markdownify}}
+		</div>
+	</div>
+</section>
+
+{{ partial "footer.html" . }}
diff --git a/themes/vikunja/layouts/page/list.html b/themes/vikunja/layouts/page/list.html
deleted file mode 100644
index e69de29..0000000