diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 229c6b52..ddc49bc3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -189,6 +189,15 @@ repos:
         args:
           - --target-version=5.2  # Minimum supported Django version for AA. Update as needed.
 
+  - repo: https://github.com/adamchainz/djade-pre-commit
+    rev: "52a7ce253113456c2a1113186a4a19b15c8b68af"  # frozen: 1.9.0
+    hooks:
+      - id: djade
+        name: Djade
+        description: Check for problems in Django template files.
+        args:
+          - --target-version=5.2  # Minimum supported Django version for AA. Update as needed.
+
   - repo: https://github.com/asottile/pyupgrade
     rev: 75992aaa40730136014f34227e0135f63fc951b4  # frozen: v3.21.2
     hooks:
diff --git a/aa_intel_tool/locale/django.pot b/aa_intel_tool/locale/django.pot
index 6e5aa768..95b7fe8b 100644
--- a/aa_intel_tool/locale/django.pot
+++ b/aa_intel_tool/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Intel Tool\n"
 "Report-Msgid-Bugs-To: https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-intel-tool/\n"
-"POT-Creation-Date: 2026-10-04 09:47+0200\n"
+"POT-Creation-Date: 2026-10-09 12:24+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"
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: aa_intel_tool/__init__.py:10
-#: aa_intel_tool/templates/aa_intel_tool/base.html:7
-#: aa_intel_tool/templates/aa_intel_tool/base.html:11
+#: aa_intel_tool/templates/aa_intel_tool/base.html:6
+#: aa_intel_tool/templates/aa_intel_tool/base.html:10
 #: aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html:5
 #: aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html:5
 #: aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html:5
@@ -44,13 +44,13 @@ msgid "Chat list"
 msgstr ""
 
 #: aa_intel_tool/constants.py:71 aa_intel_tool/models.py:22
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:28
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:27
 msgid "D-Scan"
 msgstr ""
 
 #: aa_intel_tool/constants.py:77 aa_intel_tool/models.py:23
 #: aa_intel_tool/models.py:123
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:33
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:32
 msgid "Fleet composition"
 msgstr ""
 
@@ -180,23 +180,23 @@ msgstr ""
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:23
+#: aa_intel_tool/templates/aa_intel_tool/base.html:22
 msgid "Permalink successfully copied"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:24
+#: aa_intel_tool/templates/aa_intel_tool/base.html:23
 msgid "Something went wrong. Nothing copied. Maybe your browser does not support this function."
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:25
+#: aa_intel_tool/templates/aa_intel_tool/base.html:24
 msgid "Unaffiliated"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:26
+#: aa_intel_tool/templates/aa_intel_tool/base.html:25
 msgid "No Alliance"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/base.html:27
+#: aa_intel_tool/templates/aa_intel_tool/base.html:26
 msgid "NPC Corp"
 msgstr ""
 
@@ -219,42 +219,42 @@ msgstr ""
 msgid "Join our team of translators!"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:10
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:9
 msgid "What can I paste?"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:16
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:15
 msgid "Chat member list"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:21
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:20
 #, python-format
 msgid "Limited to a maximum of %(max_pilots)s pilot per scan."
 msgid_plural "Limited to a maximum of %(max_pilots)s pilots per scan."
 msgstr[0] ""
 msgstr[1] ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:39
 msgid "Please keep in mind, parsing large amounts of data can take some time. Be patient, CCP's API is not the fastest to answer …"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:51
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:50
 msgid "Submit"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:60
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:59
 msgid "Working on it, please be patient …"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:63
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:62
 msgid "Detecting the intel type"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:64
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:63
 msgid "Fetching potentially missing information from ESI (this might take a moment)"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:65
+#: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:64
 msgid "Parsing data"
 msgstr ""
 
@@ -266,25 +266,25 @@ msgstr ""
 msgid "Copy permalink"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:7
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:6
 msgid "Alliances breakdown"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:18
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:17
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:19
 msgid "Alliance"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:19
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:19
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:18
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:18
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:18
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:24
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:21
 msgid "Count"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:31
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:31
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:30
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:30
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:31
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/interesting-on-grid/items.html:29
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:41
@@ -292,11 +292,11 @@ msgstr ""
 msgid "No data …"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:7
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:6
 msgid "Corporations breakdown"
 msgstr ""
 
-#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:18
+#: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:17
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/pilots.html:18
 msgid "Corporation"
 msgstr ""
diff --git a/aa_intel_tool/templates/aa_intel_tool/base.html b/aa_intel_tool/templates/aa_intel_tool/base.html
index fb1db3dc..d3a4a5d5 100644
--- a/aa_intel_tool/templates/aa_intel_tool/base.html
+++ b/aa_intel_tool/templates/aa_intel_tool/base.html
@@ -1,11 +1,10 @@
 {% extends "allianceauth/base-bs5.html" %}
 
-{% load i18n %}
-{% load aa_i18n %}
+{% load aa_i18n i18n %}
 
 {% block page_title %}
     {% translate "Intel Parser" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block header_nav_brand %}
     {% translate "Intel Parser" %}
@@ -94,4 +93,4 @@
             {% include "aa_intel_tool/partials/footer/app-translation-footer.html" %}
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
diff --git a/aa_intel_tool/templates/aa_intel_tool/partials/index/form.html b/aa_intel_tool/templates/aa_intel_tool/partials/index/form.html
index e94051ef..2245ebd7 100644
--- a/aa_intel_tool/templates/aa_intel_tool/partials/index/form.html
+++ b/aa_intel_tool/templates/aa_intel_tool/partials/index/form.html
@@ -1,5 +1,4 @@
-{% load django_bootstrap5 %}
-{% load i18n %}
+{% load django_bootstrap5 i18n %}
 
 <div class="card card-default mb-3">
     <div class="card-body">
diff --git a/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html b/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html
index 0205b43d..3a96e44f 100644
--- a/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html
+++ b/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load evelinks %}
+{% load evelinks i18n %}
 
 <div class="col-md-6 col-lg-3 aa-intel-chatscan-alliances">
     <header class="aa-intel-section-header my-4">
diff --git a/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html b/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html
index 3d8f9083..94f5c79e 100644
--- a/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html
+++ b/aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load evelinks %}
+{% load evelinks i18n %}
 
 <div class="col-md-6 col-lg-3 aa-intel-chatscan-corporations">
     <header class="aa-intel-section-header my-4">
diff --git a/aa_intel_tool/templates/aa_intel_tool/views/index.html b/aa_intel_tool/templates/aa_intel_tool/views/index.html
index fd4fd615..a2f7f65c 100644
--- a/aa_intel_tool/templates/aa_intel_tool/views/index.html
+++ b/aa_intel_tool/templates/aa_intel_tool/views/index.html
@@ -1,16 +1,15 @@
 {% extends "aa_intel_tool/base.html" %}
 
-{% load evelinks %}
-{% load i18n %}
+{% load evelinks i18n %}
 
 {% block aa_intel_tool_body %}
     {% include "aa_intel_tool/partials/index/form.html" %}
     {% include "aa_intel_tool/partials/body/scan-retention-note.html" %}
-{% endblock %}
+{% endblock aa_intel_tool_body %}
 
 {% block extra_css %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
-{% endblock %}
+{% endblock extra_css %}
 
 {% block extra_javascript %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-js.html" %}
diff --git a/aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html b/aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html
index 9f3dc70b..634f82da 100644
--- a/aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html
+++ b/aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html
@@ -11,7 +11,7 @@ <h1>{{ parser_title|title }}</h1>
 
     {% include "aa_intel_tool/partials/scan/evetime.html" %}
     {% include "aa_intel_tool/partials/scan/buttons.html" %}
-{% endblock %}
+{% endblock aa_intel_tool_header %}
 
 {% block aa_intel_tool_body %}
     <div class="local-scan-result row" id="aa-intel-chatscan-row">
@@ -19,14 +19,14 @@ <h1>{{ parser_title|title }}</h1>
         {% include "aa_intel_tool/partials/scan/chatlist/corporations.html" %}
         {% include "aa_intel_tool/partials/scan/chatlist/pilots.html" %}
     </div>
-{% endblock %}
+{% endblock aa_intel_tool_body %}
 
 {% block extra_css %}
     {% include "bundles/datatables-2-css-bs5.html" %}
     {% include "bundles/datatables-2-columncontrol-css-bs5.html" %}
     {% include "bundles/datatables-2-responsive-css.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
-{% endblock %}
+{% endblock extra_css %}
 
 {% block extra_javascript %}
     <script>
diff --git a/aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html b/aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html
index 00892f2c..375aa62a 100644
--- a/aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html
+++ b/aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html
@@ -11,19 +11,19 @@ <h1>{{ parser_title|title }}</h1>
 
     {% include "aa_intel_tool/partials/scan/evetime.html" %}
     {% include "aa_intel_tool/partials/scan/buttons.html" %}
-{% endblock %}
+{% endblock aa_intel_tool_header %}
 
 {% block aa_intel_tool_body %}
     {% include "aa_intel_tool/partials/scan/dscan/system-information.html" %}
     {% include "aa_intel_tool/partials/scan/dscan/ships-breakdown.html" %}
     {% include "aa_intel_tool/partials/scan/dscan/interesting-on-grid.html" %}
-{% endblock %}
+{% endblock aa_intel_tool_body %}
 
 {% block extra_css %}
     {% include "bundles/datatables-2-css-bs5.html" %}
     {% include "bundles/datatables-2-columncontrol-css-bs5.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
-{% endblock %}
+{% endblock extra_css %}
 
 {% block extra_javascript %}
     <script>
diff --git a/aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html b/aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html
index f24b3bb9..2f81f5b9 100644
--- a/aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html
+++ b/aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html
@@ -11,7 +11,7 @@ <h1>{{ parser_title|title }}</h1>
 
     {% include "aa_intel_tool/partials/scan/evetime.html" %}
     {% include "aa_intel_tool/partials/scan/buttons.html" %}
-{% endblock %}
+{% endblock aa_intel_tool_header %}
 
 {% block aa_intel_tool_body %}
     {% include "aa_intel_tool/partials/scan/fleetcomp/fleet-details.html" %}
@@ -19,13 +19,13 @@ <h1>{{ parser_title|title }}</h1>
     {% if app_settings.INTELTOOL_ENABLE_MODULE_CHATSCAN %}
         {% include "aa_intel_tool/partials/scan/fleetcomp/participation.html" %}
     {% endif %}
-{% endblock %}
+{% endblock aa_intel_tool_body %}
 
 {% block extra_css %}
     {% include "bundles/datatables-2-css-bs5.html" %}
     {% include "bundles/datatables-2-columncontrol-css-bs5.html" %}
     {% include "aa_intel_tool/bundles/aa-intel-tool-css.html" %}
-{% endblock %}
+{% endblock extra_css %}
 
 {% block extra_javascript %}
     <script>