diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..84f5661
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 74a9223..5b79dc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,8 @@ _site/
# Ignore folders generated by Bundler
.bundle/
vendor/
+Gemfile.lock
+
+.DS_Store
+
+*/.DS_Store
\ No newline at end of file
diff --git a/.gitignore copy b/.gitignore copy
deleted file mode 100644
index 6b1cc31..0000000
--- a/.gitignore copy
+++ /dev/null
@@ -1,8 +0,0 @@
-_site
-.sass-cache
-.jekyll-metadata
-.DS_Store
-node_modules
-
-
-Gemfile.lock
\ No newline at end of file
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 0000000..396906d
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,42 @@
+# Development
+
+This site is built using [Jekyll](https://jekyllrb.com).
+
+
+## Local Development
+If you want to develop locally, you first have to change some configuration.
+
+In `_config.yaml` you can comment out the `url` and `baseurl` keys. These are needed for GitHub pages to create urls.
+
+you can use the [Docker Compose](./docker-compose.yml) file.
+
+```bash
+docker-compose up -d
+```
+
+This runs the Jekyll engine and watches for any changes. After changing a file, you can simply reload the webbrowser to see the changes.
+
+> **_NOTE:_** Changes made to `_config.yaml` require a restart from docker-compose.
+
+
+## Structure
+
+### Includes
+The includes folder contains HTML and MarkDown partials that can be reused and included into layouts.
+
+### Layouts
+The layouts folder contains the HTML layout for any page. To use a layout, you can add FrontMatter to a page or post specifying the layout (without extension).
+
+```
+---
+layout: default
+---
+```
+### Assets
+The assets folder contains static assets that are loaded by layouts and/or pages.
+
+### Collections
+The collections folder contain collections that are used by Jekyll. If you want to add a new guide, simply create a new MarkDown file in `collections/_guides`.
+
+### Pages
+The pages folder contains static pages that are rendered by Jekyll into HTML. This folder can contain MarkDown files as well as HTML files.
\ No newline at end of file
diff --git a/LICENSE copy b/LICENSE copy
deleted file mode 100644
index 9e9795f..0000000
--- a/LICENSE copy
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Kitty Giraudel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/_config.yml b/_config.yml
index 78764c5..a454501 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,8 +11,8 @@ description: > # this means to ignore newlines until "baseurl:"
Write an awesome description for your new site here. You can edit this
line in _config.yml. It will appear in your document head meta (for
Google search results) and in your feed.xml site description.
-baseurl: "/Documentation" # the subpath of your site, e.g. /blog
-url: "https://openscd.github.io" # the base hostname & protocol for your site
+#baseurl: "/Documentation" # the subpath of your site, e.g. /blog
+#url: "https://openscd.github.io" # the base hostname & protocol for your site
collections_dir: collections
# Markdown settings
diff --git a/_includes/footer.html b/_includes/footer.html
new file mode 100644
index 0000000..80b3d24
--- /dev/null
+++ b/_includes/footer.html
@@ -0,0 +1,20 @@
+
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index 916e9e4..3c0e30e 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,9 +1,37 @@
{% unless page.hide_landing %}
-
+
-
+
{{ page.title }}
diff --git a/_layouts/aside.html b/_layouts/aside.html
deleted file mode 100644
index 2ff88d9..0000000
--- a/_layouts/aside.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- {% include head.html %}
-
-
- {% include header.html %}
-
-
-
-
-
-
-
diff --git a/_layouts/component.html b/_layouts/component.html
deleted file mode 100644
index aef380a..0000000
--- a/_layouts/component.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- {% include head.html %}
-
-
- {% include header.html %}
-
-
-
-
-
-
-
-
diff --git a/_layouts/default.html b/_layouts/default.html
index 4f83e76..e25abf6 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,6 +8,7 @@
{{ content }}
+ {% include footer.html %}