diff --git a/www/templates/404.html b/www/templates/404.html
new file mode 100644
index 00000000..2753b2a1
--- /dev/null
+++ b/www/templates/404.html
@@ -0,0 +1,11 @@
+{% extends "htmx-theme/templates/base.html" %}
+
+{% block title %}
+ {% set html_title = "</> htmx ~ 404 Not found " %}
+{% endblock title %}
+
+{% block content %}
+
+ 404 Not Found
+
+{% endblock content %}
diff --git a/www/themes/htmx-theme/templates/base.html b/www/themes/htmx-theme/templates/base.html
index 309b1d77..ea6b194d 100644
--- a/www/themes/htmx-theme/templates/base.html
+++ b/www/themes/htmx-theme/templates/base.html
@@ -9,7 +9,7 @@
{# This block should set html_title appropriately -#}
{% block title %} {% endblock title -%}
{{ html_title | default(value=config.title) | safe }}
-
+ {% if current_url %} {% endif %}
{#TODO: only generate this for the home page #}