diff --git a/cookbook/locale/de/LC_MESSAGES/django.po b/cookbook/locale/de/LC_MESSAGES/django.po
index 91e24fe80..94076a925 100644
--- a/cookbook/locale/de/LC_MESSAGES/django.po
+++ b/cookbook/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-03 21:25+0200\n"
+"POT-Creation-Date: 2018-05-03 21:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 #: .\cookbook\forms.py:14 .\cookbook\forms.py:32
 msgid "Name"
 msgstr ""
@@ -26,186 +27,171 @@ msgstr ""
 #: .\cookbook\views\edit.py:37 .\cookbook\views\edit.py:107
 #: .\cookbook\views\lists.py:15 .\cookbook\views\new.py:29
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #: .\cookbook\forms.py:16 .\cookbook\forms.py:34
 msgid "Keywords"
-msgstr ""
+msgstr "Schlagwörter"
 
 #: .\cookbook\forms.py:23 .\cookbook\forms.py:42
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: .\cookbook\forms.py:35 .\cookbook\forms.py:46
 msgid "Path"
-msgstr ""
+msgstr "Pfad"
 
 #: .\cookbook\forms.py:52 .\cookbook\templates\batch\monitor.html:6
 msgid "Sync"
-msgstr ""
+msgstr "Synchronisieren"
 
 #: .\cookbook\forms.py:56
 msgid "Search String"
-msgstr ""
+msgstr "Such Wort"
 
 #: .\cookbook\forms.py:64
 msgid "Update"
-msgstr ""
+msgstr "Aktualisieren"
 
 #: .\cookbook\tables.py:16 .\cookbook\tables.py:26 .\cookbook\tables.py:36
 #: .\cookbook\tables.py:45 .\cookbook\tables.py:54
 #: .\cookbook\templates\generic\delete_template.html:5
 #: .\cookbook\templates\generic\delete_template.html:9
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: .\cookbook\templates\base.html:39 .\cookbook\templates\base.html:47
 #: .\cookbook\templates\index.html:6
 msgid "Cookbook"
-msgstr ""
+msgstr "Kochbuch"
 
 #: .\cookbook\templates\base.html:53
 #: .\cookbook\templates\generic\new_template.html:5
 #: .\cookbook\templates\generic\new_template.html:9
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #: .\cookbook\templates\base.html:57 .\cookbook\templates\index.html:62
 #: .\cookbook\views\edit.py:73 .\cookbook\views\edit.py:85
 #: .\cookbook\views\new.py:17
 msgid "Recipe"
-msgstr ""
+msgstr "Rezept"
 
 #: .\cookbook\templates\base.html:61 .\cookbook\templates\base.html:73
 #: .\cookbook\views\edit.py:51 .\cookbook\views\edit.py:118
 #: .\cookbook\views\lists.py:23 .\cookbook\views\new.py:41
 msgid "Keyword"
-msgstr ""
+msgstr "Schlagwort"
 
 #: .\cookbook\templates\base.html:67
 #: .\cookbook\templates\generic\list_template.html:6
 #: .\cookbook\templates\generic\list_template.html:10
 msgid "List"
-msgstr ""
+msgstr "Liste"
 
 #: .\cookbook\templates\base.html:79
 msgid "Manage Data"
-msgstr ""
+msgstr "Daten Verwalten"
 
 #: .\cookbook\templates\base.html:83
 msgid "Configure Sync"
-msgstr ""
+msgstr "Sync Einstellen"
 
 #: .\cookbook\templates\base.html:85
 msgid "Manage imported Recipes"
-msgstr ""
+msgstr "Importe verwalten"
 
 #: .\cookbook\templates\base.html:87
 msgid "Batch Edit"
-msgstr ""
+msgstr "Massenbearbeitung"
 
 #: .\cookbook\templates\base.html:94
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: .\cookbook\templates\base.html:98
 msgid "Logout"
-msgstr ""
+msgstr "Ausloggen"
 
 #: .\cookbook\templates\base.html:101
 msgid "Login"
-msgstr ""
+msgstr "Einloggen"
 
 #: .\cookbook\templates\batch\edit.html:6
 msgid "Batch edit Category"
-msgstr ""
+msgstr "Kategorie massenbearbeitung"
 
 #: .\cookbook\templates\batch\edit.html:11
 msgid "Batch edit Recipes"
-msgstr ""
+msgstr "Rezept massenbearbeitung"
 
 #: .\cookbook\templates\batch\edit.html:12
 msgid ""
 "Add the specified category and keywords to all recipes containing a word"
 msgstr ""
+"Ausgewählte Kategorie und Schlagwörtern zu allen Rezepten die das Suchwort "
+"enthalten hinzufügen"
 
 #: .\cookbook\templates\batch\import.html:5
-msgid "Imported Recipes"
-msgstr ""
-
 #: .\cookbook\templates\batch\import.html:9
-msgid "Update imported Recipes"
-msgstr ""
+msgid "Imported Recipes"
+msgstr "Importierte Rezepte"
 
 #: .\cookbook\templates\batch\import.html:13
-msgid "Auto import all"
-msgstr ""
+#, fuzzy
+#| msgid "Auto import all"
+msgid "import all"
+msgstr "Alle importieren"
 
 #: .\cookbook\templates\batch\monitor.html:10
 msgid "Manage watched Folders"
-msgstr ""
+msgstr "Überwachte Ordner verwalten"
 
 #: .\cookbook\templates\batch\monitor.html:12
 msgid ""
 "On this Page you can manage all DropBox folder locations that should be "
 "monitored and synced"
 msgstr ""
+"Auf dieser Seite kannst du alle Dropbox Ordner verwalten die überwacht und synchronisiert werden sollen"
+
 
 #: .\cookbook\templates\batch\monitor.html:13
 msgid "The path must be in the following format"
-msgstr ""
+msgstr "Der Pfad muss in folgendem Format sein"
 
 #: .\cookbook\templates\batch\monitor.html:15
 msgid "Sync Now!"
-msgstr ""
+msgstr "Jetzt Synchronisieren!"
 
 #: .\cookbook\templates\generic\delete_template.html:14
 #, python-format
 msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
-msgstr ""
+msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll"
 
 #: .\cookbook\templates\generic\edit_template.html:5
 #: .\cookbook\templates\generic\edit_template.html:9
 msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
 
 #: .\cookbook\templates\index.html:15
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: .\cookbook\templates\index.html:34
 msgid "Log in to view Recipies"
-msgstr ""
+msgstr "Bitte einloggen um Rezepte zu sehen"
 
 #: .\cookbook\templates\index.html:73
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #: .\cookbook\templates\index.html:86
 msgid "Open Recipe"
-msgstr ""
-
-#: .\cookbook\templates\new\category.html:6
-#: .\cookbook\templates\new\category.html:11
-msgid "New Category"
-msgstr ""
-
-#: .\cookbook\templates\new\category.html:12
-msgid "New recipe Category"
-msgstr ""
-
-#: .\cookbook\templates\new\keyword.html:6
-#: .\cookbook\templates\new\keyword.html:11
-msgid "New Keyword"
-msgstr ""
-
-#: .\cookbook\templates\new\keyword.html:12
-msgid "New recipe Keyword"
-msgstr ""
+msgstr "Rezept öffnen"
 
 #: .\cookbook\templates\registration\login.html:8
 msgid "Your username and password didn't match. Please try again."
-msgstr ""
+msgstr "Nutzername oder Passwort falsch. Bitte versuch es erneut."
 
 #: .\cookbook\views\edit.py:23 .\cookbook\views\edit.py:96
 msgid "Monitor"
@@ -213,12 +199,12 @@ msgstr ""
 
 #: .\cookbook\views\edit.py:61
 msgid "Changes saved!"
-msgstr ""
+msgstr "Änderungen gespeichert"
 
 #: .\cookbook\views\edit.py:65
 msgid "Error saving changes!"
-msgstr ""
+msgstr "Fehler beim Speichern der Daten."
 
 #: .\cookbook\views\edit.py:129
 msgid "Import Recipe"
-msgstr ""
+msgstr "Rezept Importieren"
diff --git a/cookbook/locale/en/LC_MESSAGES/django.po b/cookbook/locale/en/LC_MESSAGES/django.po
deleted file mode 100644
index bfa418baa..000000000
--- a/cookbook/locale/en/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 11:27+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: .\templates\index.html:10
-msgid "Cookbook"
-msgstr ""
-
-#: .\templates\index.html:17
-msgid "Log in to view recipes"
-msgstr ""
diff --git a/cookbook/templates/batch/import.html b/cookbook/templates/batch/import.html
index 0fcadf5a8..f2732f760 100644
--- a/cookbook/templates/batch/import.html
+++ b/cookbook/templates/batch/import.html
@@ -6,11 +6,11 @@
 
 {% block content %}
 
-    <h3>{% trans 'Update imported Recipes' %}</h3>
+    <h3>{% trans 'Imported Recipes' %}</h3>
     <br>
     <form action="{% url 'batch_import_all' %}" method="post">
         {% csrf_token %}
-        <input type="submit" value="{% trans 'Auto import all' %}" class="btn btn-primary"/>
+        <input type="submit" value="{% trans 'import all' %}" class="btn btn-primary"/>
     </form>
     <br>
 
diff --git a/cookbook/templates/edit/recipe.html b/cookbook/templates/edit/recipe.html
deleted file mode 100644
index b4c6839a9..000000000
--- a/cookbook/templates/edit/recipe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_tags %}
-
-{% block content %}
-    {% crispy form %}
-{% endblock %}
\ No newline at end of file
diff --git a/cookbook/templates/index.html b/cookbook/templates/index.html
index b49019ab9..0090df706 100644
--- a/cookbook/templates/index.html
+++ b/cookbook/templates/index.html
@@ -6,7 +6,6 @@
 {% block title %}{% trans "Cookbook" %}{% endblock %}
 
 {% block content %}
-
     <div class="row">
         <div class="col md-12">
             {% if filter %}
diff --git a/cookbook/templates/new/category.html b/cookbook/templates/new/category.html
deleted file mode 100644
index bcf64f9e4..000000000
--- a/cookbook/templates/new/category.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-{% load django_tables2 %}
-
-{% block title %}{% trans 'New Category' %}{% endblock %}
-
-{% block content %}
-
-    <h3>
-        {% trans 'New Category' %}
-        <small class="text-muted">{% trans 'New recipe Category' %}</small>
-    </h3>
-
-    <form method="POST" class="post-form">{% csrf_token %}
-        {% crispy form %}
-    </form>
-
-    {% if table %}
-        {% render_table table %}
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/cookbook/templates/new/keyword.html b/cookbook/templates/new/keyword.html
deleted file mode 100644
index a5f83eaea..000000000
--- a/cookbook/templates/new/keyword.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-{% load django_tables2 %}
-
-{% block title %}{% trans 'New Keyword' %}{% endblock %}
-
-{% block content %}
-
-    <h3>
-        {% trans 'New Keyword' %}
-        <small class="text-muted">{% trans 'New recipe Keyword' %}</small>
-    </h3>
-
-    <form method="POST" class="post-form">{% csrf_token %}
-        {% crispy form %}
-    </form>
-
-    {% if table %}
-        {% render_table table %}
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/cookbook/templates/new/recipe.html b/cookbook/templates/new/recipe.html
deleted file mode 100644
index b4c6839a9..000000000
--- a/cookbook/templates/new/recipe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_tags %}
-
-{% block content %}
-    {% crispy form %}
-{% endblock %}
\ No newline at end of file