\ No newline at end of file
diff --git a/content/contact/index.en.md b/content/contact/index.en.md
new file mode 100644
index 0000000..48b0ea9
--- /dev/null
+++ b/content/contact/index.en.md
@@ -0,0 +1,34 @@
+---
+title: "Contact"
+date: 2018-11-19T22:07:56+02:00
+draft: false
+type: "page"
+---
+
+# Contact
+
+We have public issue trackers in the different [code repos](https://code.vikunja.io).
+
+We'll have some kind of forum one day, until we fugure that out, please use one of these email addresses to get in touch with us:
+
+#### General
+
+[hello@vikunja.io](mailto:hello@vikunja.io)
+
+General inqueries and requests.
+
+#### Maintainers
+
+[maintainers@vikunja.io](mailto:maintainers@vikunja.io)
+
+Say hello to our maintainers.
+
+#### Security
+
+When you find security-related bugs or other things you don't want to disclose publicly via our bug tracker, this is the mail to use.
+
+[security@vikunja.io](mailto:security@vikunja.io)
+
+**PGP-Key:** 2DD15B4BBC0FFB1AEF056662182B59A2D78D7303
+
+You can download the public key from [here](security.pub).
diff --git a/content/contact/security.pub b/content/contact/security.pub
new file mode 100644
index 0000000..287bfb2
--- /dev/null
+++ b/content/contact/security.pub
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFvzNeABCADQgTEhYVe2BDenDOuOEmfbt17LbVNYW9XFxRRTMYH56effjuNJ
+BdVbBIgbuTAuKgurfMD0IKpen4N1dSG2aYROa9Fe7F9GB29+VQUDcEcCwn52OcJJ
+5lZw7UiIZvoWixesK1j01N19niZLEYGBxrcwsLDFQ/AsNgyW/qZJsHmAYvL3uvvb
+aAOQ2jQgJh3nHUuKLsEOA0ZGrBGqbtInKD+y7tQ+AOmh1F2egDMIIxRBAH7/ld+n
+xJIEHe6C/+VUOaSjjWvlVOYjsb2bMlHuDFrIRy5vQDsi/VKQe1R14kkrVLPCQlHQ
+VRopvfen22eH3QyrQkR6y/VFWgboLUO+dFuVABEBAAG0JlZpa3VuamEgU2VjdXJp
+dHkgPHNlY3VyaXR5QHZpa3VuamEuaW8+iQFUBBMBCAA+FiEELdFbS7wP+xrvBWZi
+GCtZoteNcwMFAlvzNeACGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
+CgkQGCtZoteNcwN3KQf9Hrt/i3WTuk3O01/yq9cldXeab3rPSzfw4axnUhjpfWpH
+qGfewcBMK//V97XBVDinYAlZOHr1IP4nXMKc1i0f+36Ot/hE8+iMrvyQtQ6xtMti
+5bivdkHoVQV+LfZQJ+j8WuVuvp8UF06sIZ2c6mV8QQdpbaD1jKTdQ51cIPABLVYm
+xTgV8kWNE5mPK42qq6MqtyJyxGz68I4D/eHfm3I2HYX1QOjTRU3k4t9hpurbKmmC
+nUbgn+JiQ3DFOMCAnhDH5FHrDWFGqSSlaEWFpFPuznh4FW7vZxX3HD9yLxr7RhWd
+KoSl5OIU86YB1PC2TJBjgSGEu2bbEKgefY23UPdmirkBDQRb8zXgAQgAnemQ6t5i
+HHq8SYE2ILfunZ95j4CzfcHKgcQ1yrk9Hj5K6Gds5mWBZ5kY2BwLvVid7OvkhHgr
+dZo9y+6k9VKm/0g7Et7Xh9BUjO4ExSQ0N864BEio6jvl757eoP1EvKDS3Wu4LGkZ
+QzbYaxUGMWMJ60m5NtQZezwV64PSnv4fd1ovwkDjgx33hIDDaJL0xCyDekL5wTNE
+o9J9IXXCfcKyrU/9ASB5qSXHaptMP5yvufFKyySzmZcmZF/bUrhC/r5PNDIgucHo
++BoN08fX1rZViu8t3fh4eT9bBNYKXqHLwUDDjGTgSdiA1Ft0okmiCbYt9H/DSNI8
+Uk819mBBMvV99QARAQABiQE8BBgBCAAmFiEELdFbS7wP+xrvBWZiGCtZoteNcwMF
+AlvzNeACGwwFCQPCZwAACgkQGCtZoteNcwNAYQf+Ioa8PXhrukrXesiueN4DEenK
+SHmS1MKeGDXxuE7ej0SNTI1KVsTzvZvl74mql5u4XfUSCid6p4X4O+BaTcUe3ogY
+tSAaI7IetJqM5didSppBkfpEFj4glXo9EyoErM0IFGoMqshHReF6ZRHL9QUdrkMz
+FO2Ege+XLBAgumEyCWNptSsuVMtlNarOGpciSlulGYIUbp3lZmFjKCRzcZWRMUUv
+6Ys7zvEww5p2IcMS44jARe64c95+fHtqMCVeLlh/qjStOX7KP6DNLTQROsZDXM5V
+IcPCEKM8RD08pCASs4uFbhRG3iJIE5y43y6xuS3mywcmBdUFOQTbe0XEajEU6A==
+=66iu
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/content/download/index.en.md b/content/download/index.en.md
new file mode 100644
index 0000000..9601dd1
--- /dev/null
+++ b/content/download/index.en.md
@@ -0,0 +1,36 @@
+---
+title: "Download"
+date: 2018-10-13T22:07:56+02:00
+draft: false
+type: "page"
+menu:
+ page:
+ title: "Download"
+ weight: 30
+---
+
+# Downloads
+
+Vikunja is currently Beta, if you find any bugs or other issues, please [report them](http://code.vikunja.io/api/issues).
+
+You can download Vikunja in various forms:
+
+## Backend (API-Server)
+
+Latest [Stable](https://storage.kolaente.de/minio/vikunja/0.2/) or [Current master](https://storage.kolaente.de/minio/vikunja/master/). Everytime a commit to master is made, the latest build gets updated.
+
+You can also [get the source code](http://code.vikunja.io/api) and compile it yourself. Instructions on how to do this can be found in the repo.
+
+## Frontend (Javascript)
+
+You can get all frontend version on [our minio server](https://storage.kolaente.de/minio/vikunja-frontend/).
+
+You can also [get the source code](http://code.vikunja.io/frontend) and build it yourself. Instructions on how to do this can be found in the repo.
+
+## Mobile apps
+
+We have [pre-built apks for Android](https://storage.kolaente.de/minio/vikunja-app/) which you can download and install on your device. We'll publish it to F-Droid and the Google Play Store once the app is feature complete.
+
+As the app is built with flutter, we'll have binaries for iOS once we figured out a good way to build these with our infrastructure. Due to restrictions in the iOS platform, you'll have to sign these yourself to install it on your apple device. We'll also publish these to the app store one day.
+
+You can also [get the source code](http://code.vikunja.io/app) and build it yourself (for both Android and iOS). Instructions on how to do this can be found in the repo.
diff --git a/content/features/index.en.md b/content/features/index.en.md
new file mode 100644
index 0000000..06d81de
--- /dev/null
+++ b/content/features/index.en.md
@@ -0,0 +1,135 @@
+---
+title: "Features"
+date: 2018-10-13T21:59:47+02:00
+draft: false
+type: "features"
+menu:
+ page:
+ title: "Features"
+ weight: 20
+---
+
+
+
+
+
+ Think of Vikunja like the notebook you have with all your things to keep track of.
+
+
+ But better.
+
+
+
+
+
+
+
+
+
+
+
+
+
Lists
+
+
First things first: Vikunja can create lists. And yes, you can add tasks to a list. But it can do so much more
+ (or at least, it will be able to do a lot more at some point).
+
+
Namespaces
+
+
A... what? A namespace is something like a group of lists. Every list is part of a particular namespace which you can then share
+ or simply use as a method to keep track of multiple lists more easily.
+
+
Tasks
+
+
Tasks are not only simple tasks. You can let Vikunja remind you of tasks when they're due. Never miss an important deadline again!
+
+
+
+
+
+
Sharing
+
+
+ Ever wished you could just share that grocery list with your roomate instead of having to send dozens of texts on your way to the supermarket?
+ With Vikunja, you can. Simply share a list or a namespace with all its lists to another user.
+ Don't want your roommate to add new things to the grocery list and only do the shopping?
+ You can also share a list with read-only access!
+
+
+ Planning a bigger thing? You can use teams to share a list or namespace with multiple people at a time!
+
+
+
+
+
+
+
+### CalDAV
+
+Ever discovered that web app with all its great features, but somewhat... not good to use? Not to say [our app](https://vikunja.io/download) is not easy to
+use - but you don't have to use it! Vikunja comes with a calDAV-integration which lets you use the tools you already use and love.
+
+
Use Vikunja on your own server or hosted*. Your data will always be yours, we won't sell your grocery list to Amazon. Don't trust us?
+Check for yourself.
+
+
Also, did I mention "the cloud"? Vikunja syncs across all your devices, no matter if you created a task on the mobile app or on your laptop, enabling
+you to continue where you left off.
+
+* We don't have any stable hosted instances of Vikunja available, yet.
+
+
+
+
+
+
Open-Source
+
+
Vikunja is completly open source and released under the LGPLv3.
+
+
You can contribute in multiple ways, even if you're not a developer! It already helps a lot when you use Vikunja and report
+features you'd like or bugs you find.
+
+
And if you are a developer and know your way around Go or
+Vue.js, any help is appreceated.
+
+
+
+
+## Roadmap
+
+But of course, there's more to come! Take a look at this list of things we've planned to add:
+
+* Labels for todo lists and tasks
+* Prioritize tasks
+* Assign users to tasks
+* Subtasks
+* Repeating tasks
+* Attachments on tasks
+* Get all tasks for you per interval (day/month/period)
+* More sharing features
+ * Share via a world-readable link with or without password, like Nextcloud
+
+
+
+
\ No newline at end of file
diff --git a/content/features/lists.png b/content/features/lists.png
new file mode 100644
index 0000000..775eabf
Binary files /dev/null and b/content/features/lists.png differ
diff --git a/content/features/sharing-user.png b/content/features/sharing-user.png
new file mode 100644
index 0000000..3efc977
Binary files /dev/null and b/content/features/sharing-user.png differ
diff --git a/content/features/task.png b/content/features/task.png
new file mode 100644
index 0000000..b26f800
Binary files /dev/null and b/content/features/task.png differ
diff --git a/nginx.conf b/nginx.conf
index 8265406..e6479f3 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -9,7 +9,8 @@ server {
index index.html index.htm;
}
- error_page 500 502 503 504 /50x.html;
+ error_page 404 /en/404.html;
+ error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
diff --git a/src/index.html b/src/index.html
deleted file mode 100644
index def7323..0000000
--- a/src/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Vikunja
-
-
-
-
-