diff --git a/_layouts/event.html b/_layouts/event.html
deleted file mode 100644
index 8fb889709d5d052577994b93d665e872e352126d..0000000000000000000000000000000000000000
--- a/_layouts/event.html
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: default
----
-<div class="post">
-
-  <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
-		<p class="event-date">
-			Anfang: {{ page.eventstart | date: "%d.%m.%Y %H:%M" }}<br />
-			Ende: {{ page.eventend | date: "%d.%m.%Y %H:%M" }}<br />
-			Ort: {% if page.location %}{{ page.location }}{% else %}Free Software Lab{% endif %}
-			{% if page.organizer %}<br />Organisation: {{ page.organizer }}{% endif %}
-		</p>
-	</header>
-
-  <article class="post-content">
-    {{ content }}
-  </article>
-
-</div>
diff --git a/_layouts/post.html b/_layouts/post.html
index a2b4e52fefe1eae18257e3417f57826ceea5068c..a7a8904113d39f057c39b296087bb583d9043896 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,8 +4,17 @@ layout: default
 <div class="post">
 
   <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
+    <h1 class="post-title">{% if page.categories contains 'event' %}Termin: {% endif %}{{ page.title }}</h1>
     <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    {% if page.categories contains 'event' %}
+    <p class="event-date">
+      Anfang: {{ page.eventstart | date: "%d.%m.%Y %H:%M" }}<br />
+      Ende: {{ page.eventend | date: "%d.%m.%Y %H:%M" }}<br />
+      Ort: {% if page.location %}{{ page.location }}{% else %}Free Software Lab{% endif %}
+      {% if page.organizer %}<br />Organisation: {{ page.organizer }}{% endif %}
+    </p>
+    {% endif %}
+
   </header>
 
   <article class="post-content">
diff --git a/_posts/events/2015-05-15-chaos-cologne.markdown b/_posts/events/2015-05-15-chaos-cologne.markdown
index c054a678093a2e56e05de505d39f36fc60ac850b..02cd3f97570bb8130ef02b351f64c4f6a24798b0 100644
--- a/_posts/events/2015-05-15-chaos-cologne.markdown
+++ b/_posts/events/2015-05-15-chaos-cologne.markdown
@@ -1,5 +1,5 @@
 ---
-layout:     event
+layout:     post
 title:      "Chaos Cologne"
 date:       2015-04-28 17:20:36
 eventstart: 2015-05-15 20:00:00
diff --git a/index.html b/index.html
index cd5532d6e84bac65eaa64ab162e9f9145421d514..6930837b1c38ab0421ca30c2fc54f1b433735817 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@ layout: default
         <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
 
         <h2>
-          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{% if post.categories contains 'event' %}Termin: {% endif %}{{ post.title }}</a>
         </h2>
       </li>
     {% endfor %}