diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59b46ed..093ed4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 1. [](#improved)
     * Invert order of previous and next button in the blog posts navigation
+1. [](#bugfix)
+    * Fix forms not working as expected. Drop the form twig overrides as they break the forms, and don't really customise the output
 
 # v1.5.0
 ## 07/14/2016
diff --git a/templates/forms/data.html.twig b/templates/forms/data.html.twig
deleted file mode 100644
index c0d8021..0000000
--- a/templates/forms/data.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for field in form.fields %}
-    <div><strong>{{ field.label }}</strong>: {{ form.value(field.name)|e }}</div>
-{% endfor %}
diff --git a/templates/forms/data.txt.twig b/templates/forms/data.txt.twig
deleted file mode 100644
index fab7e63..0000000
--- a/templates/forms/data.txt.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for field in form.fields %}
-{{ field.label }}: {{ form.value(field.name)|e }}
-{% endfor %}
diff --git a/templates/forms/form.html.twig b/templates/forms/form.html.twig
deleted file mode 100644
index 50e4351..0000000
--- a/templates/forms/form.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="alert">{{ form.message }}</div>
-
-<form name="{{ form.name }}"
-      action="{{ uri.rootUrl ~ (form.action|default(page.route)) }}"
-      method="{{ form.method|upper|default('POST') }}">
-{% for field in form.fields %}
-    {% set value = form.value(field.name) %}
-    <div>
-        {% include "forms/fields/#{field.type}/#{field.type}.html.twig" %}
-    </div>
-{% endfor %}
-
-	<div class="buttons">
-	{% for button in form.buttons %}
-	    <button class="button" type="{{ button.type|default('submit') }}">{{ button.value|default('Submit') }}</button>
-	{% endfor %}
-	</div>
-	
-	{{ nonce_field('form', 'form-nonce') }}
-
-</form>