diff --git a/theme/static/contact.php b/theme/static/contact.php
deleted file mode 100644
index 17b5ed4..0000000
--- a/theme/static/contact.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-  //source: https://www.unixdude.net/posts/2017/Nov/29/pelican-contact-form/
-  if(isset($_POST['address']) && $_POST['address'] == ''){
-    //The form was submitted
-    $ouremail = 'kontakt@tobias-radloff.de';
-    // Important: if we add any form fields to the HTML,
-    // and want them included in the email, we will need to add them here also
-    $body = "Diese Nachricht wurde soeben durch das Kontaktformular auf t-r.de übermittelt:
-    Name:  $_POST[name]
-    Emailadresse: $_POST[email]
-    Nachricht: $_POST[nachricht]";
-    // From:
-    $headers = "From: $_POST[email]";
-    // send the message
-    mail($ouremail, 'Nachricht ueber das Kontaktformular von t-r.de!', $body, $headers );
-    header('Location: /kontakt/danke/');
-  }
-?>
diff --git a/theme/templates/includes/subscribe.html b/theme/templates/includes/subscribe.html
index ca04327..4da806c 100644
--- a/theme/templates/includes/subscribe.html
+++ b/theme/templates/includes/subscribe.html
@@ -1,6 +1,6 @@
 <hgroup>
-  <h2>Abonniere meinen Newsletter!</h2>
-  <p>Erfahre zuerst von Neuerscheinungen, Lesungen und allem anderen. Mein Dankeschön: ein unveröffentlichtes Gedicht.</p>
+  <h2>Abonniere meinen Newsletter</h2>
+  <p>Erfahre zuerst von Neuerscheinungen, Lesungen und dem ganzen Rest. Mein Dankeschön für dich: ein unveröffentlichtes Gedicht.</p>
 </hgroup>
 <form class="newsletter-form" method="post" action="{{ SITEURL }}/subscribe.php">
   <input class="newsletter-email" type="email" name="email" placeholder="Emailadresse" autocomplete="email" aria-label="Emailadresse" required/>
diff --git a/theme/templates/includes/unsubscribe.html b/theme/templates/includes/unsubscribe.html
index 27e6ef3..551a527 100644
--- a/theme/templates/includes/unsubscribe.html
+++ b/theme/templates/includes/unsubscribe.html
@@ -1,6 +1,6 @@
 <hgroup>
   <h2>Newsletter-Abmeldung</h2>
-  <p>Komm bald wiederm okay?</p>
+  <p>Komm gerne wieder, irgendwann.</p>
 </hgroup>
 <form class="newsletter-form" method="get" action="{{ SITEURL }}/unsubscribe.php">
   <input class="newsletter-email" type="email" name="email" placeholder="Emailadresse" autocomplete="email" aria-label="Emailadresse" required/>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 4a2c50d..1af703d 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -1,25 +1,26 @@
-{% extends "base.html" %} 
-
-{% block content_body %}
-{% for p in pages %}
-{% if p.title == "Index" %}
-{% set lr = cycler("row", "row-reverse") %}
+{% extends "base.html" %}
+{% block content_body %} 
+{% for p in pages if p.title == "Index" %} 
+{% set lr = cycler("row", "row-reverse") %} 
 {% if p.featured is defined %}
-<div class="index-featured">
-</div>
-{% endif %}
+<div class="index-featured"></div>
+{% endif %} 
 {% for e in p.elements %}
 <div class="index" style="flex-direction: {{ lr.next() }};">
   <figure>
     <a href="{{ e.link }}" alt="{{ e.text }}"><img src="{{ e.pic }}" /></a>
-    {% if e.credit is defined %}<figcaption>Bild: {{ e.credit }}</figcaption>{% endif %}
+    {% if e.credit is defined %}
+    <figcaption>Bild: {{ e.credit }}</figcaption>
+    {% endif %}
   </figure>
-  <p>{{ e.text }}<br>
-    <span class="index-link"><a href="{% if e.more_link is defined %}{{ e.more_link }}{% else %}{{ e.link }}{% endif %}">{{ e.more }}</a></span>
+  <p>
+    {{ e.text }}<br />
+    <span class="index-link">
+      <a href="{% if e.more_link is defined %}{{ e.more_link }}{% else %}{{ e.link }}{% endif %}">{{ e.more }}</a>
+    </span>
   </p>
 </div>
-{% endfor %}
-
-{% endif %}
-{% endfor %}
-{% endblock content_body %}
+{% endfor %} 
+{% endfor %} 
+{% include "includes/subscribe.html" %} {%
+endblock content_body %}