diff --git a/doc/templates/category.html.jinja b/doc/templates/category.html.jinja
index 9a5af51f..0d00a729 100644
--- a/doc/templates/category.html.jinja
+++ b/doc/templates/category.html.jinja
@@ -1,16 +1,13 @@
-{% import "macros.html.jinja" as macros %}
+{% import "macros.html.jinja" as macros -%}
+
 <section id="{{ category.id.path }}">
   {% call macros.maybe_spoilered(category) %}
-    <h2 class="category-title page-header">
-      {{ category.name | hexdoc_block }}
-      {{ macros.jump_to_top() }}
-      {{ macros.permalink(category.id.path) }}
-    </h2>
+    {{ macros.header(category, "category-title") }}
     {{ category.description | hexdoc_block }}
   {% endcall %}
   {% for entry in category.entries %}
     {% if entry.id not in blacklist %}
-      entry
+      {% include "entry.html.jinja" %}
     {% endif %}
   {% endfor %}
 </section>
\ No newline at end of file
diff --git a/doc/templates/entry.html.jinja b/doc/templates/entry.html.jinja
new file mode 100644
index 00000000..a1334aa2
--- /dev/null
+++ b/doc/templates/entry.html.jinja
@@ -0,0 +1,10 @@
+{% import "macros.html.jinja" as macros -%}
+
+<div id="{{ entry.id.path }}">
+  {% call macros.maybe_spoilered(entry) %}
+    {{ macros.header(entry, "entry-title") }}
+    {% for page in entry.pages %}
+      page
+    {% endfor %}
+  {% endcall %}
+</div>
\ No newline at end of file
diff --git a/doc/templates/macros.html.jinja b/doc/templates/macros.html.jinja
index ac5db9f9..47909ab7 100644
--- a/doc/templates/macros.html.jinja
+++ b/doc/templates/macros.html.jinja
@@ -25,3 +25,11 @@
     <i class="bi bi-box-arrow-up"></i>
   </a>
 {%- endmacro %}
+
+{% macro header(value, class_name) %}
+  <h3 class="{{ class_name }} page-header">
+    {{ value.name | hexdoc_block }}
+    {{ jump_to_top() }}
+    {{ permalink(value.id.path) }}
+  </h3>
+{%- endmacro %}