diff --git a/_drafts/gallery.md b/_drafts/gallery.md
index 29441dd..06af569 100644
--- a/_drafts/gallery.md
+++ b/_drafts/gallery.md
@@ -1,38 +1,23 @@
 ---
 layout: page
-title:
 subheadline: 
+title:
+teaser:
 meta_description:
-description:
+permalink:
 categories:
     - 
 tags:
-    - photos
-    - gallery
+    - 
 image:
-   thumb: "gallery_thumb.jpg"
+   thumb:
 ---
 
 <ul class="clearing-thumbs small-block-grid-3" data-clearing>
-  <li><a href="{{ site.url }}/images/_1.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
-  <li><a href="{{ site.url }}/images/_2.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
-  <li><a href="{{ site.url }}/images/_3.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
-  <li><a href="{{ site.url }}/images/_4.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
-  <li><a href="{{ site.url }}/images/_5.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
-  <li><a href="{{ site.url }}/images/_6.jpg"><img  data-caption="" class="th" src="{{ site.url }}/images/thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_1.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_2.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_3.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_4.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_5.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
+  <li><a href="{{ site.urlimg }}_6.jpg"><img  data-caption="" class="th" src="{{ site.urlimg }}thumb.jpg"></a></li>
 </ul>
-
-
-
-
-
- [1]: #
- [2]: #
- [3]: #
- [4]: #
- [5]: #
- [6]: #
- [7]: #
- [8]: #
- [9]: #
- [10]: #
\ No newline at end of file
diff --git a/_drafts/page_all_frontmatter.md b/_drafts/page_all_frontmatter.md
index 6038768..a4ca8ca 100644
--- a/_drafts/page_all_frontmatter.md
+++ b/_drafts/page_all_frontmatter.md
@@ -2,33 +2,30 @@
 layout: page
 subheadline: 
 title: 
-description: 
+teaser: 
+meta_description:
+permalink:
 categories:
     - 
 tags:
     - 
+header: no
 header:
-    image:  ""
-    pattern:  ""
-    color:  ""
+    image_fullwidth: "unsplash_brooklyn-bridge_header.jpg"
+    image:
+    pattern:
+    color:
+    background-color:  "#fabb00"
+    title: header with text
 image:
-    homepage: ""
-    thumb:  ""
-    credit: ""
-    url: ""
+    title:
+    homepage:
+    thumb:
+    credit:
+    url:
+show_meta: false
+sidebar: left
+comments: true
+breadcrumb: true
 ---
 
-
-
-
-
- [1]: #
- [2]: #
- [3]: #
- [4]: #
- [5]: #
- [6]: #
- [7]: #
- [8]: #
- [9]: #
- [10]: #
\ No newline at end of file
diff --git a/_drafts/page_simple.md b/_drafts/page_simple.md
new file mode 100644
index 0000000..f694652
--- /dev/null
+++ b/_drafts/page_simple.md
@@ -0,0 +1,8 @@
+---
+layout: page
+title: 
+teaser: 
+permalink:
+header: no
+---
+
diff --git a/_drafts/page_with_image.md b/_drafts/page_with_image.md
new file mode 100644
index 0000000..02db73a
--- /dev/null
+++ b/_drafts/page_with_image.md
@@ -0,0 +1,32 @@
+---
+layout: page
+subheadline: 
+title: 
+teaser:
+meta_description:
+permalink:
+categories:
+    - 
+tags:
+    - 
+image:
+    header: 
+    thumb: 
+    homepage:
+    credit:
+    url:
+---
+
+
+
+
+ [1]: #
+ [2]: #
+ [3]: #
+ [4]: #
+ [5]: #
+ [6]: #
+ [7]: #
+ [8]: #
+ [9]: #
+ [10]: #
\ No newline at end of file
diff --git a/_drafts/page_with_table_of_contents.md b/_drafts/page_with_table_of_contents.md
index 5843293..7b2d232 100644
--- a/_drafts/page_with_table_of_contents.md
+++ b/_drafts/page_with_table_of_contents.md
@@ -2,8 +2,9 @@
 layout: page-fullwidth
 subheadline:
 title:
-description:
+teaser:
 meta_description:
+permalink:
 categories:
     - 
 tags:
@@ -12,7 +13,7 @@ tags:
 <div class="row">
 <div class="medium-4 medium-push-8 columns" markdown="1">
 <div class="panel radius" markdown="1">
-**Table of Contents**
+**Inhalt**
 {: #toc }
 *  TOC
 {:toc}
diff --git a/_drafts/page_without_image.md b/_drafts/page_without_image.md
new file mode 100644
index 0000000..2eb198d
--- /dev/null
+++ b/_drafts/page_without_image.md
@@ -0,0 +1,12 @@
+---
+layout: page
+title:
+subheadline:
+teaser:
+meta_description:
+permalink:
+categories:
+    - 
+tags:
+    - 
+---
diff --git a/_drafts/video.md b/_drafts/video.md
index 111844f..41d48ef 100644
--- a/_drafts/video.md
+++ b/_drafts/video.md
@@ -1,9 +1,10 @@
 ---
 layout: video
-title:
 subheadline:
+title:
+teaser:
 meta_description:
-description:
+permalink:
 image:
 categories:
     - 
diff --git a/pages/documentation.md b/pages/documentation.md
index 63ecfe4..d369681 100644
--- a/pages/documentation.md
+++ b/pages/documentation.md
@@ -125,7 +125,7 @@ There are several types of images you can define via front matter. If you want t
 
 ~~~
 image:
-    title: thumbnail_image.jpg
+    title: image.jpg
 ~~~
 
 
diff --git a/pages/roadmap.md b/pages/roadmap.md
index 474750d..3f1e1da 100644
--- a/pages/roadmap.md
+++ b/pages/roadmap.md
@@ -11,6 +11,7 @@ permalink: "/roadmap/"
 ## Ideas and possible new features
 {: .t30 }
 
+* Layout/Template for category-archives
 * Clean bare-bones version of *Feeling Responsive*
 * Landingpage
 * Even better responsive typography