diff --git a/_layouts/default.html b/_layouts/default.html
new file mode 100644
index 0000000..18a8d0b
--- /dev/null
+++ b/_layouts/default.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang={{site.language}}>
+  {% include head.html %}
+  <body>
+    <div id="wrapper">
+      <div id="logo">&nbsp;</div>
+      <h1 id="lefttitle">{{page.title}}</h1>
+        {{content}}
+    </div> <!-- /wrapper -->
+  </body>
+</html>
diff --git a/_layouts/overview.html b/_layouts/overview.html
deleted file mode 100644
index 784718c..0000000
--- a/_layouts/overview.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang={{site.language}}>
-  {% include head.html %}
-  <body>
-    <div id="wrapper">
-      <div id="logo">&nbsp;</div>
-      <h1 id="lefttitle">{{page.title}}</h1>
-      <div id="table-of-contents">
-          <ul id="toc">
-            {% for recipe in site.posts reversed %}
-                <li><a href="{{site.url}}{{site.baseurl}}{{recipe.url}}">{{recipe.title}}</a></li>
-            {% endfor %}
-          </ul>
-      </div> <!-- /table-of-contents -->
-    </div> <!-- /wrapper -->
-  </body>
-</html>
diff --git a/_posts/2017-08-20-html-ragout.md b/_posts/2017-08-20-html-ragout.md
index ea0df53..617f913 100644
--- a/_posts/2017-08-20-html-ragout.md
+++ b/_posts/2017-08-20-html-ragout.md
@@ -3,6 +3,7 @@ layout: recipe
 title: Blindtext an HTML-Ragout
 persons: 4
 image:
+categories: vegetarian
 ---
 
 <!-- Zutaten -->
diff --git a/_posts/2017-08-21-css-ragout.md b/_posts/2017-08-21-css-ragout.md
index 9563bcb..efa6469 100644
--- a/_posts/2017-08-21-css-ragout.md
+++ b/_posts/2017-08-21-css-ragout.md
@@ -3,6 +3,7 @@ layout: recipe
 title: Blindtext an CSS-Ragout
 persons: 4
 image: kaiserschmarrn.jpg
+tags: easy fast
 ---
 
 <!-- Zutaten -->
diff --git a/categories.md b/categories.md
new file mode 100644
index 0000000..2c5bd5e
--- /dev/null
+++ b/categories.md
@@ -0,0 +1,37 @@
+---
+layout: default
+title: Categories
+permalink: /categories/
+---
+<!-- Get the category name for every category on the site and set them
+to the `site_categories` variable. -->
+{% capture site_categories %}{% for category in site.categories %}{{ category | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+
+<!-- `category_words` is a sorted array of the category names. -->
+{% assign category_words = site_categories | split:',' | sort %}
+
+<!-- List of all categories -->
+<ul class="categories">
+  {% for item in (0..site.categories.size) %}{% unless forloop.last %}
+    {% capture this_word %}{{ category_words[item] }}{% endcapture %}
+    <li>
+      <a href="#{{ this_word | cgi_escape }}" class="category">{{ this_word }}
+        <span>({{ site.categories[this_word].size }})</span>
+      </a>
+    </li>
+  {% endunless %}{% endfor %}
+</ul>
+
+<!-- Posts by category -->
+<div>
+  {% for item in (0..site.categories.size) %}{% unless forloop.last %}
+    {% capture this_word %}{{ category_words[item] }}{% endcapture %}
+    <h2 id="{{ this_word | cgi_escape }}">{{ this_word }}</h2>
+    {% for post in site.categories[this_word] %}{% if post.title != null %}
+      <div>
+          <a href="{{site.url}}{{site.baseurl}}{{ post.url }}">{{ post.title }}</a>
+      </div>
+      <div style="clear: both;"></div>
+    {% endif %}{% endfor %}
+  {% endunless %}{% endfor %}
+</div>
diff --git a/index.md b/index.md
index 135e089..a6b4983 100644
--- a/index.md
+++ b/index.md
@@ -1,4 +1,11 @@
 ---
-layout: overview
+layout: default
 title: Übersicht #Overview
 ---
+<div id="table-of-contents">
+    <ul id="toc">
+      {% for recipe in site.posts reversed %}
+          <li><a href="{{site.url}}{{site.baseurl}}{{recipe.url}}">{{recipe.title}}</a></li>
+      {% endfor %}
+    </ul>
+</div> <!-- /table-of-contents -->
diff --git a/tags.md b/tags.md
new file mode 100644
index 0000000..888db92
--- /dev/null
+++ b/tags.md
@@ -0,0 +1,38 @@
+---
+layout: default
+title: Tags
+permalink: /tags/
+---
+
+<!-- Get the tag name for every tag on the site and set them
+to the `site_tags` variable. -->
+{% capture site_tags %}{% for tag in site.tags %}{{ tag | first }}{% unless forloop.last %},{% endunless %}{% endfor %}{% endcapture %}
+
+<!-- `tag_words` is a sorted array of the tag names. -->
+{% assign tag_words = site_tags | split:',' | sort %}
+
+<!-- List of all tags -->
+<ul class="tags">
+  {% for item in (0..site.tags.size) %}{% unless forloop.last %}
+    {% capture this_word %}{{ tag_words[item] }}{% endcapture %}
+    <li>
+      <a href="#{{ this_word | cgi_escape }}" class="tag">{{ this_word }}
+        <span>({{ site.tags[this_word].size }})</span>
+      </a>
+    </li>
+  {% endunless %}{% endfor %}
+</ul>
+
+<!-- Posts by Tag -->
+<div>
+  {% for item in (0..site.tags.size) %}{% unless forloop.last %}
+    {% capture this_word %}{{ tag_words[item] }}{% endcapture %}
+    <h2 id="{{ this_word | cgi_escape }}">{{ this_word }}</h2>
+    {% for post in site.tags[this_word] %}{% if post.title != null %}
+      <div>
+          <a href="{{site.url}}{{site.baseurl}}{{ post.url }}">{{ post.title }}</a>
+      </div>
+      <div style="clear: both;"></div>
+    {% endif %}{% endfor %}
+  {% endunless %}{% endfor %}
+</div>
