diff --git a/templates/base.tera b/templates/base.tera
new file mode 100644
index 00000000..80f4b4b7
--- /dev/null
+++ b/templates/base.tera
@@ -0,0 +1,11 @@
+
+
+
+
+ {% block title %}{% endblock title %} ⋅ Plume
+
+
+ {% block content %}
+ {% endblock content %}
+
+
diff --git a/templates/blogs/new.tera b/templates/blogs/new.tera
index 66cf3a34..5f44f928 100644
--- a/templates/blogs/new.tera
+++ b/templates/blogs/new.tera
@@ -1,16 +1,15 @@
-
-
-
-
- New blog
-
-
- Create a blog
-
-
-
+{% block title %}
+New blog
+{% endblock title %}
+
+{% block content %}
+Create a blog
+
+{% endblock content %}
diff --git a/templates/instance/configure.tera b/templates/instance/configure.tera
index c9332efb..4fd83a01 100644
--- a/templates/instance/configure.tera
+++ b/templates/instance/configure.tera
@@ -1,16 +1,15 @@
-
-
-
-
- Configuration
-
-
- Configure your instance
-
-
-
+{% block title %}
+Configuration
+{% endblock title %}
+
+{% block content %}
+Configure your instance
+
+{% endblock content %}
diff --git a/templates/posts/new.tera b/templates/posts/new.tera
index d3c0e588..f6d8ae0e 100644
--- a/templates/posts/new.tera
+++ b/templates/posts/new.tera
@@ -1,22 +1,21 @@
-
-
-
-
- New post
-
-
- Create a post
-
-
-
+
+
+
+
+
+
+
+
+{% endblock content %}
diff --git a/templates/session/login.tera b/templates/session/login.tera
index cb1ce97a..eb2cebe8 100644
--- a/templates/session/login.tera
+++ b/templates/session/login.tera
@@ -1,19 +1,18 @@
-
-
-
-
- Login
-
-
- Login
-
-
-
+{% block content %}
+Login
+
+{% endblock content %}
diff --git a/templates/users/details.tera b/templates/users/details.tera
index 7e8658a3..2cfa16eb 100644
--- a/templates/users/details.tera
+++ b/templates/users/details.tera
@@ -1,13 +1,12 @@
-
-
-
-
- {{ user.display_name }}
-
-
- {{ user.display_name }}
-
- {{ user.summary | safe }}
-
-
-
+{% extends "base" %}
+
+{% block title %}
+{{ user.display_name }}
+{% endblock title %}
+
+{% block content %}
+{{ user.display_name }}
+
+ {{ user.summary | safe }}
+
+{% endblock content %}
diff --git a/templates/users/new.tera b/templates/users/new.tera
index 6dd3f791..e1cd7489 100644
--- a/templates/users/new.tera
+++ b/templates/users/new.tera
@@ -1,25 +1,24 @@
-
-
-
-
- New account
-
-
- Create an account
-
-
-
+
+
+
+
+
+
+
+
+{% endblock content %}