diff --git a/templates/404.html b/templates/404.html
index 8fe2981..f75fde3 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -1,53 +1,10 @@
-
-
-
-
- Fuck Your Day
-
-
- {% block body %}
-
-
-
404
-
You're so lost.
-
-
One of us has made a mistake.
Hang tight, let's try this again.
-
-
- {% endblock %}
-
+
+{% extends 'error.html' %} {% block content %}
+
+
{{ error }}
+
You're so lost.
+
+
One of us has made a mistake.
Hang tight, let's try this again.
+
+
+{% endblock %}
diff --git a/templates/500.html b/templates/500.html
new file mode 100644
index 0000000..9694edf
--- /dev/null
+++ b/templates/500.html
@@ -0,0 +1,8 @@
+
+{% extends 'error.html' %} {% block content %}
+
+
{{ error }}
+
oops!
+
Hang tight, let's try this again.
+
+{% endblock %}
diff --git a/templates/error.html b/templates/error.html
new file mode 100644
index 0000000..8c4958a
--- /dev/null
+++ b/templates/error.html
@@ -0,0 +1,44 @@
+
+
+
+
+ Fuck Your Day
+
+
+
+ {% block content %} {% endblock %}
+