diff --git a/src/backoffice/templates/backoffice/assembly_auth.html b/src/backoffice/templates/backoffice/assembly_auth.html
index 595d30e0afe8a31b8c92ff975af51f6119789b9f..c68808285979e2794320ffa3a9dd69a86fbb71c8 100644
--- a/src/backoffice/templates/backoffice/assembly_auth.html
+++ b/src/backoffice/templates/backoffice/assembly_auth.html
@@ -4,7 +4,7 @@
 
 {% block title %}
   {% trans "Assembly__authentication" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -91,4 +91,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_auth_app.html b/src/backoffice/templates/backoffice/assembly_auth_app.html
index 5da10aa5958b2f6a83fa6ff582bcc005bf14f097..4bf8556c10fa8f9008ac5f902b171af56df370c5 100644
--- a/src/backoffice/templates/backoffice/assembly_auth_app.html
+++ b/src/backoffice/templates/backoffice/assembly_auth_app.html
@@ -2,7 +2,9 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block title %}{{ object.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  {{ object.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -27,4 +29,4 @@
       </form>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_badge_renewed.html b/src/backoffice/templates/backoffice/assembly_badge_renewed.html
index 8b417afe5ab7fec61fa762b001903420b5bd8d15..408c0895640e246c2857b133e0f0d94722fe0872 100644
--- a/src/backoffice/templates/backoffice/assembly_badge_renewed.html
+++ b/src/backoffice/templates/backoffice/assembly_badge_renewed.html
@@ -1,7 +1,9 @@
 {% extends "backoffice/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ badge.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  {{ badge.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -20,4 +22,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_badges.html b/src/backoffice/templates/backoffice/assembly_badges.html
index 6b01e0ce7e83d8c24c7ce7ca5389f7e3d8d1f878..055cb24c9745afa95580f63fc88e993ceded85d3 100644
--- a/src/backoffice/templates/backoffice/assembly_badges.html
+++ b/src/backoffice/templates/backoffice/assembly_badges.html
@@ -3,7 +3,7 @@
 
 {% block title %}
   {% trans "Badges" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -64,4 +64,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_create.html b/src/backoffice/templates/backoffice/assembly_create.html
index f664bd96c0089659272b780e95895b0923758b1e..fcedd63627a2c9cc570eaacab931e78e8f323612 100644
--- a/src/backoffice/templates/backoffice/assembly_create.html
+++ b/src/backoffice/templates/backoffice/assembly_create.html
@@ -19,4 +19,4 @@
       </div>
     {% endif %}
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_detail.html b/src/backoffice/templates/backoffice/assembly_detail.html
index 929a77623af428dd2580437b8144a93a8dac094d..4a5503cc67e4156a54b25351719068f47b0294ea 100644
--- a/src/backoffice/templates/backoffice/assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assembly_detail.html
@@ -1,7 +1,9 @@
 {% extends "backoffice/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block content %}
   <div class="row">
@@ -168,4 +170,4 @@
       {% endif %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_edit.html b/src/backoffice/templates/backoffice/assembly_edit.html
index 5da375d08b7b2005593f494820b1bf32ac9914a1..1b5cead2dc6c4d41bbf5b420f6f48ff6ada7354f 100644
--- a/src/backoffice/templates/backoffice/assembly_edit.html
+++ b/src/backoffice/templates/backoffice/assembly_edit.html
@@ -156,4 +156,4 @@
       </div>
     </div>
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_editchildren.html b/src/backoffice/templates/backoffice/assembly_editchildren.html
index 62eb31596fc32ca43b987eaa77fcff3c985cf8bf..68c0092a0ffbd31b4ca465af7e5549fe99d361f1 100644
--- a/src/backoffice/templates/backoffice/assembly_editchildren.html
+++ b/src/backoffice/templates/backoffice/assembly_editchildren.html
@@ -64,4 +64,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_editlinks.html b/src/backoffice/templates/backoffice/assembly_editlinks.html
index 4d16958f6e99c622d1cd4c18f230217e3177146a..b08a37a0c1cdabbe2ac6bd7fa7ac02d3898adcc8 100644
--- a/src/backoffice/templates/backoffice/assembly_editlinks.html
+++ b/src/backoffice/templates/backoffice/assembly_editlinks.html
@@ -66,4 +66,4 @@
     </div>
   {% endwith %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_events.html b/src/backoffice/templates/backoffice/assembly_events.html
index 50e77bf4776c22d921c43084ec18accf3dcd2cd0..ec65a69bfd4c9dd41a5dd8d4499dcc22f24118bf 100644
--- a/src/backoffice/templates/backoffice/assembly_events.html
+++ b/src/backoffice/templates/backoffice/assembly_events.html
@@ -4,12 +4,12 @@
 
 {% block title %}
   {% trans "Events" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -44,7 +44,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -84,4 +84,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_list.html b/src/backoffice/templates/backoffice/assembly_list.html
index dea10b8fc60469c84fd3b83742105cab8822ed16..8533161011ab7d3e272ed3b24c0cf7fb5b52ac01 100644
--- a/src/backoffice/templates/backoffice/assembly_list.html
+++ b/src/backoffice/templates/backoffice/assembly_list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -115,4 +115,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_list_export.html b/src/backoffice/templates/backoffice/assembly_list_export.html
index 6971243ef1cb9ea4517fcd7474ac81941c0ad671..62e8176083417b5076af34546906029a6d467518 100644
--- a/src/backoffice/templates/backoffice/assembly_list_export.html
+++ b/src/backoffice/templates/backoffice/assembly_list_export.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block title %}
   {% trans "Assemblys" %} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 {% block content %}
   <div class="row">
     <div class="col-md-12">
@@ -144,4 +144,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_members.html b/src/backoffice/templates/backoffice/assembly_members.html
index f2e86966fbeb7cf4e4fdd4e2a9e27d6dd811f97c..709497ad1a67ebff7983a1e0347f81c0a728cab1 100644
--- a/src/backoffice/templates/backoffice/assembly_members.html
+++ b/src/backoffice/templates/backoffice/assembly_members.html
@@ -4,7 +4,7 @@
 
 {% block title %}
   {% trans "Assembly__members" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -135,4 +135,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_members_edit.html b/src/backoffice/templates/backoffice/assembly_members_edit.html
index 6ac9e9c09af956869833f8908f9a38e1fbb56363..23fc934277bae33df3af576341da71c29bd09631 100644
--- a/src/backoffice/templates/backoffice/assembly_members_edit.html
+++ b/src/backoffice/templates/backoffice/assembly_members_edit.html
@@ -47,4 +47,4 @@
     </div>
 
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_room.html b/src/backoffice/templates/backoffice/assembly_room.html
index f99be68efcb1919767725d1442055a93f1937474..ac51ff19d1501b8fdcbaf79dcd385b35569f787c 100644
--- a/src/backoffice/templates/backoffice/assembly_room.html
+++ b/src/backoffice/templates/backoffice/assembly_room.html
@@ -3,13 +3,15 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
-{% block title %}{{ room.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  {{ room.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block htmlhead %}
   <style type="text/css">
     div#description h3 { font-size: 100%; text-transform: uppercase; border-bottom: 1px solid #CCCCCC; }
   </style>
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -122,4 +124,4 @@
   {% if not link_edit %}
     {% include "backoffice/assembly_room_mgmt.html" %}
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_room_wa.html b/src/backoffice/templates/backoffice/assembly_room_wa.html
index 6e168da35dd7c63cf8adc0ccd2c3474aa3758382..b1626d44d98d23adb7b4ca08b862681fd521a9ee 100644
--- a/src/backoffice/templates/backoffice/assembly_room_wa.html
+++ b/src/backoffice/templates/backoffice/assembly_room_wa.html
@@ -4,7 +4,9 @@
 {% load i18n %}
 {% load widget_tweaks %}
 
-{% block title %}{{ room.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  {{ room.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block htmlhead %}
   <style type="text/css">
@@ -14,7 +16,7 @@
             border-bottom: 1px solid #CCCCCC;
         }
   </style>
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -120,4 +122,4 @@
                   </div>
                   {# djlint:on #}
                   {% include "backoffice/assembly_room_mgmt.html" %}
-                {% endblock %}
+                {% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_vouchers.html b/src/backoffice/templates/backoffice/assembly_vouchers.html
index 3eb9651963ee8854808b88bd2c4fb8fdf0d16c82..746544a45f9bde07494b514288fcf18e2f4e3289 100644
--- a/src/backoffice/templates/backoffice/assembly_vouchers.html
+++ b/src/backoffice/templates/backoffice/assembly_vouchers.html
@@ -4,7 +4,7 @@
 
 {% block title %}
   {% trans "Vouchers" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -55,4 +55,4 @@
   {% endfor %}
 
   <div class="pb-10rem"></div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
index e95922538fda8832a7ba16434beb47b81acf5895..99b475e9374aabb92cad5764adb77d408b6bd180 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
@@ -347,4 +347,4 @@
   btn_msg.addEventListener("click", function() { for (const el of document.getElementsByClassName("logentry")) { if (el.getAttribute("data-has-msg") == "n") el.classList.add("d-none"); } });
   btn_msg.click();
   </script>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html b/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
index 9391cdcc30b552ae5cb9a3658bb886b7319daee2..b134f209d3e35f7c05459e89f580a3a345b3aaad 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
@@ -40,4 +40,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_editposition.html b/src/backoffice/templates/backoffice/assemblyteam_editposition.html
index cfe2876910251f133d2bc3d5110b68089c098362..aec20bf0c062ed5bb369cbdfb593fd5bc15141e1 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_editposition.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_editposition.html
@@ -114,4 +114,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_editstate.html b/src/backoffice/templates/backoffice/assemblyteam_editstate.html
index b9c98b229271ade33c0b0f185a2bc0fd6b3737aa..11d3f279503600963c2a4c4948d680ed78b264f8 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_editstate.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_editstate.html
@@ -40,4 +40,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_message.html b/src/backoffice/templates/backoffice/assemblyteam_message.html
index 1406a87fe1bd751f1d4b18ee76d6f03b328ab7de..9ce754e3180e2ba4293e098f332e99811e162df4 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_message.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_message.html
@@ -112,4 +112,4 @@
     </div>
   {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/base.html b/src/backoffice/templates/backoffice/base.html
index dbb0a7d993c7b2dd857bac298ec8ef70d9065550..d87a697a7885c88421fa7fe289a2e3fdcb446ae6 100644
--- a/src/backoffice/templates/backoffice/base.html
+++ b/src/backoffice/templates/backoffice/base.html
@@ -7,7 +7,7 @@
     <title>
       {% block title %}
         {{ conference.slug }} {% trans "title_suffix" %}
-      {% endblock %}
+      {% endblock title %}
     </title>
     <!-- FNORD -->
     <link rel="stylesheet"
@@ -20,7 +20,8 @@
     {% if uses_map %}
       {% include "core/map_header.html" %}
     {% endif %}
-    {% block htmlhead %}{% endblock %}
+    {% block htmlhead %}
+    {% endblock htmlhead %}
   </head>
 
   <body>
@@ -281,7 +282,7 @@
               {% endfor %}
             </nav>
           {% endif %}
-        {% endblock %}
+        {% endblock sidebar %}
 
         <div class="container{% if user.is_authenticated and conferencemember == None %} pb-10rem{% endif %}"
              style="margin-top: 1em">
@@ -294,20 +295,22 @@
             </div>
           {% endif %}
 
-          {% block content %}{% endblock %}
+          {% block content %}
+          {% endblock content %}
 
           {% block footer %}
             {% if user.is_authenticated and conference.require_ticket and conferencemember == None %}
               <!-- This is not very elegant but should do the job -->
               <div class="alert alert-warning fixed-bottom mx-3">⚠ {% trans "backoffice__not_a_conference_member" %}</div>
             {% endif %}
-          {% endblock %}
+          {% endblock footer %}
         </div>
       </div>
-    {% endblock %}
+    {% endblock fullcontent %}
     <script src="{% static 'jquery-3.7.1.min.js' %}"></script>
     <script src="{% static 'vendor/bootstrap5/bootstrap.bundle.min.js' %}"></script>
-    {% block scripts %}{% endblock %}
+    {% block scripts %}
+    {% endblock scripts %}
     <div class="legal-footer bg-dark p-1">
       <a class="link-light"
          href="https://legal.cccv.de/"
diff --git a/src/backoffice/templates/backoffice/event/list.html b/src/backoffice/templates/backoffice/event/list.html
index d047cd27c502c60f3fb54943aefce50e32c95a73..4ce972dd2a88167b0c6702e29f6dd85a13164306 100644
--- a/src/backoffice/templates/backoffice/event/list.html
+++ b/src/backoffice/templates/backoffice/event/list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
diff --git a/src/backoffice/templates/backoffice/index.html b/src/backoffice/templates/backoffice/index.html
index 851e5cf1f3fc0b34dd6244ebd18527f287e16510..693606dc0fba264f8774e59ba73410eaf3a5dd79 100644
--- a/src/backoffice/templates/backoffice/index.html
+++ b/src/backoffice/templates/backoffice/index.html
@@ -64,4 +64,4 @@
     <p>{% trans "welcome_text" %}</p>
 
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/login.html b/src/backoffice/templates/backoffice/login.html
index 690ce6c3a8d62ea2726c6135e703d02b6e4f442e..d5bafa91f3b79acce3ff0659fd9f1dff75722372 100644
--- a/src/backoffice/templates/backoffice/login.html
+++ b/src/backoffice/templates/backoffice/login.html
@@ -35,4 +35,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_floor_form.html b/src/backoffice/templates/backoffice/map_floor_form.html
index d110951c883bc16df0031d0dad4a2c2c4861a2bb..22e1b402187f9024d45784451a018fecbd461d74 100644
--- a/src/backoffice/templates/backoffice/map_floor_form.html
+++ b/src/backoffice/templates/backoffice/map_floor_form.html
@@ -2,7 +2,9 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block title %}{{ object.name }}{% endblock %}
+{% block title %}
+  {{ object.name }}
+{% endblock title %}
 
 {% block content %}
   <div class="row mb-3">
@@ -35,4 +37,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_floor_list.html b/src/backoffice/templates/backoffice/map_floor_list.html
index 1638ec1f26e3f136aebf5d3fdb8ab9995e7a7dec..3fb085ee97647215022f7c5af285caf9e2c61469 100644
--- a/src/backoffice/templates/backoffice/map_floor_list.html
+++ b/src/backoffice/templates/backoffice/map_floor_list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
 
@@ -74,4 +74,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock title %}
diff --git a/src/backoffice/templates/backoffice/map_poi_form.html b/src/backoffice/templates/backoffice/map_poi_form.html
index a49c1a3b0b01afd96f4a5b17d28da92255ff3a07..99c57dec33e1a83b10a7454197ee691e66593c83 100644
--- a/src/backoffice/templates/backoffice/map_poi_form.html
+++ b/src/backoffice/templates/backoffice/map_poi_form.html
@@ -2,7 +2,9 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block title %}{{ object.name }}{% endblock %}
+{% block title %}
+  {{ object.name }}
+{% endblock title %}
 
 {% block content %}
   <div class="row mb-3">
@@ -48,4 +50,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_poi_list.html b/src/backoffice/templates/backoffice/map_poi_list.html
index 63a111c6f36f023c03ea7747c76a3fbb73e9c23b..fe3088da3deb1b0b102509f7ad3fbef025873e13 100644
--- a/src/backoffice/templates/backoffice/map_poi_list.html
+++ b/src/backoffice/templates/backoffice/map_poi_list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock script %}
 
 {% block content %}
 
@@ -74,4 +74,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_assembly-detail.html b/src/backoffice/templates/backoffice/moderation_assembly-detail.html
index 358260ca40e7665f2bac2a93a5780e5db6fb89e0..282cec37c9cf1bc6e776e26e81a44693f0315fae 100644
--- a/src/backoffice/templates/backoffice/moderation_assembly-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_assembly-detail.html
@@ -113,4 +113,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_assembly-list.html b/src/backoffice/templates/backoffice/moderation_assembly-list.html
index d071e30daf0db1ce64de385d342fc73924fc558c..e9ddaae2045f637f28facecfcf6f3693936e6521 100644
--- a/src/backoffice/templates/backoffice/moderation_assembly-list.html
+++ b/src/backoffice/templates/backoffice/moderation_assembly-list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -124,4 +124,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_badge-detail.html b/src/backoffice/templates/backoffice/moderation_badge-detail.html
index 7e41944ecc94c3d06e85c1f1f63080437042ff9a..acaca02b9647fcd96dfe84945ba19e3cc0423d09 100644
--- a/src/backoffice/templates/backoffice/moderation_badge-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_badge-detail.html
@@ -83,4 +83,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_badge-list.html b/src/backoffice/templates/backoffice/moderation_badge-list.html
index 307cbf2ce20919fa710170e61b6a23ef49e09a28..170d5823fd427129924c53b350f24e80ff9c7ced 100644
--- a/src/backoffice/templates/backoffice/moderation_badge-list.html
+++ b/src/backoffice/templates/backoffice/moderation_badge-list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -78,4 +78,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_board-detail.html b/src/backoffice/templates/backoffice/moderation_board-detail.html
index 8e054eb00d4789a0bb87e966ef60475551ba71e2..88f61e64f23ea61e82709e4b6e9d7ad0e9ceb0b1 100644
--- a/src/backoffice/templates/backoffice/moderation_board-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_board-detail.html
@@ -78,4 +78,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_board-list.html b/src/backoffice/templates/backoffice/moderation_board-list.html
index cc2d3bb36f61e43eb30a3eaed00b0dd16f36c650..986750ecfd8902e09ae3ed92926b7aa0f04195b3 100644
--- a/src/backoffice/templates/backoffice/moderation_board-list.html
+++ b/src/backoffice/templates/backoffice/moderation_board-list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -80,4 +80,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_event-detail.html b/src/backoffice/templates/backoffice/moderation_event-detail.html
index efc8115513e140973af8d673626d27a819ad1224..032da6aa7361697a14733ac3c4079bdb9f33fe9e 100644
--- a/src/backoffice/templates/backoffice/moderation_event-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_event-detail.html
@@ -149,4 +149,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_index.html b/src/backoffice/templates/backoffice/moderation_index.html
index 84a0b9a2fec25716c2c0ddf5f002ab87f014d53c..d383b916d1397a69420996089140778e7f961c51 100644
--- a/src/backoffice/templates/backoffice/moderation_index.html
+++ b/src/backoffice/templates/backoffice/moderation_index.html
@@ -61,4 +61,4 @@
       </div>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_project-detail.html b/src/backoffice/templates/backoffice/moderation_project-detail.html
index e92eaaedd60a3a5c7222d14aff307ff9b8d6d49b..b1d68c1c901fcbd1d333264fff87a6bdf7ad6031 100644
--- a/src/backoffice/templates/backoffice/moderation_project-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_project-detail.html
@@ -110,4 +110,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-detail.html b/src/backoffice/templates/backoffice/moderation_user-detail.html
index d72de0238d0144b005710153161a0b0539d7cad1..1c50614938cfc0594baf6ed8e8e11934099405f1 100644
--- a/src/backoffice/templates/backoffice/moderation_user-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_user-detail.html
@@ -233,4 +233,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-list.html b/src/backoffice/templates/backoffice/moderation_user-list.html
index c833fa33b932ec5fcdfd5bb21a8ea6b19294560c..8d82c41fe65f8f14334dfd8c4ac331d6a7de16e0 100644
--- a/src/backoffice/templates/backoffice/moderation_user-list.html
+++ b/src/backoffice/templates/backoffice/moderation_user-list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -76,4 +76,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-rename.html b/src/backoffice/templates/backoffice/moderation_user-rename.html
index e16efb75225df7980897964593c46aefaae46ecf..935dfb2253bd4b753a8ff33da9b9bb9ffd8398ff 100644
--- a/src/backoffice/templates/backoffice/moderation_user-rename.html
+++ b/src/backoffice/templates/backoffice/moderation_user-rename.html
@@ -36,4 +36,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_wiki-detail.html b/src/backoffice/templates/backoffice/moderation_wiki-detail.html
index 34aa0770da63352d96aa0667b98bcfdc122ab1d4..889664cf096f2c4b490332ace88bd807d1029658 100644
--- a/src/backoffice/templates/backoffice/moderation_wiki-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_wiki-detail.html
@@ -92,4 +92,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_wiki-list.html b/src/backoffice/templates/backoffice/moderation_wiki-list.html
index 4646e257a5bbcf374144e43884ba2b035fd879e2..d30fe275b7292ae9de26998a11da38934842b518 100644
--- a/src/backoffice/templates/backoffice/moderation_wiki-list.html
+++ b/src/backoffice/templates/backoffice/moderation_wiki-list.html
@@ -6,7 +6,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -78,4 +78,4 @@
 
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/profile.html b/src/backoffice/templates/backoffice/profile.html
index 1b4331f8de99a38a1503581c70a496ea62585c6f..b716108c3bb2c4e5bacb6068a24ae9544cb6751c 100644
--- a/src/backoffice/templates/backoffice/profile.html
+++ b/src/backoffice/templates/backoffice/profile.html
@@ -9,4 +9,4 @@
 
   <p>Hi {{ user.get_full_name|default:user.username }}!</p>
   <p>Hier gibt es derzeit nichts einzustellen. / There is nothing to be configured here right now.</p>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/room-new.html b/src/backoffice/templates/backoffice/room-new.html
index cf4e720a45a362b0ff51cb671ec9f169d8af21bd..816d64cbe52806a8bbeb3e7b851d191501052b5a 100644
--- a/src/backoffice/templates/backoffice/room-new.html
+++ b/src/backoffice/templates/backoffice/room-new.html
@@ -2,7 +2,9 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 
-{% block title %}room++ | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+  room++ | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
 
 {% block content %}
   {% include "backoffice/assembly_edit_header.html" %}
@@ -176,4 +178,4 @@
       {% endif %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html b/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
index 5266d999b8f756dfb32b4d7f14254dcf0c4557a8..a9839909d91d4db5a7f9a78b88601615861861de 100644
--- a/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
+++ b/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
@@ -48,4 +48,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-detail.html b/src/backoffice/templates/backoffice/schedule_source-detail.html
index 5886ad0cc5c8ef65c107bd616d147858b38c811a..8407cc6cd4fa8168bde1feb0f36f0d20e0e5f1d2 100644
--- a/src/backoffice/templates/backoffice/schedule_source-detail.html
+++ b/src/backoffice/templates/backoffice/schedule_source-detail.html
@@ -119,4 +119,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-form.html b/src/backoffice/templates/backoffice/schedule_source-form.html
index d58adcabcca3e12928378fe66bab5cef80fa8254..644e6d720d264f7ca74fabcd1a224c0d4eba17e0 100644
--- a/src/backoffice/templates/backoffice/schedule_source-form.html
+++ b/src/backoffice/templates/backoffice/schedule_source-form.html
@@ -33,4 +33,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-list.html b/src/backoffice/templates/backoffice/schedule_source-list.html
index f73f41f3509ae19516d179f1b202edc7f380eea8..c284a73d2c81615dcd362e9c98152bff97e35c9c 100644
--- a/src/backoffice/templates/backoffice/schedule_source-list.html
+++ b/src/backoffice/templates/backoffice/schedule_source-list.html
@@ -67,4 +67,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source_import-detail.html b/src/backoffice/templates/backoffice/schedule_source_import-detail.html
index f7bd1b5b0e8b64e6f33352c01059be95562f8b2a..2e16e127146defc51d12375da6fe432f18434431 100644
--- a/src/backoffice/templates/backoffice/schedule_source_import-detail.html
+++ b/src/backoffice/templates/backoffice/schedule_source_import-detail.html
@@ -102,4 +102,4 @@
     </div>
   {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedules_index.html b/src/backoffice/templates/backoffice/schedules_index.html
index 911e90c3c506d02b34c9f560f0e55e6f31e3d6a7..e22f0592ee49068b8fd089597d2bf1978af1cfb1 100644
--- a/src/backoffice/templates/backoffice/schedules_index.html
+++ b/src/backoffice/templates/backoffice/schedules_index.html
@@ -84,4 +84,4 @@
 
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/sos.html b/src/backoffice/templates/backoffice/sos.html
index acd58bfa14e44d92cea49369f510976b8d6d0346..ca441a001aff5b8ce866161cf98ec24455a6380e 100644
--- a/src/backoffice/templates/backoffice/sos.html
+++ b/src/backoffice/templates/backoffice/sos.html
@@ -4,7 +4,7 @@
 
 {% block title %}
   {% trans "Self-organized content" %} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
 
 {% block htmlhead %}
   <link rel="stylesheet"
diff --git a/src/backoffice/templates/backoffice/vouchers-list.html b/src/backoffice/templates/backoffice/vouchers-list.html
index a4af34affa0e4923678d5093a6b3fba247b510af..9d6453fa5b1a298871e099b3ff532187f6581cd3 100644
--- a/src/backoffice/templates/backoffice/vouchers-list.html
+++ b/src/backoffice/templates/backoffice/vouchers-list.html
@@ -58,4 +58,4 @@
       </table>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-index.html b/src/backoffice/templates/backoffice/wa-index.html
index a0317336f275153ab26966972655fc264ce4391b..91e552381f1b1713f107089e676a942502270f65 100644
--- a/src/backoffice/templates/backoffice/wa-index.html
+++ b/src/backoffice/templates/backoffice/wa-index.html
@@ -75,4 +75,4 @@
       </div>
     {% endfor %}
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-map-detail.html b/src/backoffice/templates/backoffice/wa-map-detail.html
index 1a055bc3a1c38f57f6dff43a0f19dfb5a3408771..f5da6bc2cdd3f9f20c5051dac53084a4c25fe19b 100644
--- a/src/backoffice/templates/backoffice/wa-map-detail.html
+++ b/src/backoffice/templates/backoffice/wa-map-detail.html
@@ -21,7 +21,7 @@ $(function() {
   });
 });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -231,4 +231,4 @@ $(function() {
     </div>
   {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-map-list.html b/src/backoffice/templates/backoffice/wa-map-list.html
index 39c7e3dc0905aaf8d4f6afdbe98416c237ee2617..2d7a0f159b67babec8df3a4f6e6b117665b98bb1 100644
--- a/src/backoffice/templates/backoffice/wa-map-list.html
+++ b/src/backoffice/templates/backoffice/wa-map-list.html
@@ -5,7 +5,7 @@
 {% block htmlhead %}
   <link rel="stylesheet"
         href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
 
 {% block scripts %}
   <script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -40,7 +40,7 @@
           });
       });
   </script>
-{% endblock %}
+{% endblock scripts %}
 
 {% block content %}
 
@@ -80,4 +80,4 @@
       </table>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-session-detail.html b/src/backoffice/templates/backoffice/wa-session-detail.html
index daf38889410907aabbfde275188eadd514031f86..494270a9816e0a9a7bd852b1618efda4561e8cb5 100644
--- a/src/backoffice/templates/backoffice/wa-session-detail.html
+++ b/src/backoffice/templates/backoffice/wa-session-detail.html
@@ -151,4 +151,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-session-list.html b/src/backoffice/templates/backoffice/wa-session-list.html
index 3261bf3f886aa79ea4c2cfe54321ca65271bd412..51cf08e73ade36ab91cf228c92238e1b21cef1ce 100644
--- a/src/backoffice/templates/backoffice/wa-session-list.html
+++ b/src/backoffice/templates/backoffice/wa-session-list.html
@@ -48,4 +48,4 @@
       </table>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-texture-form.html b/src/backoffice/templates/backoffice/wa-texture-form.html
index 4d20f07375ba07f30f9d40e4c2569f899a335ad8..d016ebb3e62c6eace2d3224aa29362265aee0910 100644
--- a/src/backoffice/templates/backoffice/wa-texture-form.html
+++ b/src/backoffice/templates/backoffice/wa-texture-form.html
@@ -100,4 +100,4 @@
       </div>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-texture-list.html b/src/backoffice/templates/backoffice/wa-texture-list.html
index bb90bde69c788e33f1facb43e996865028dde8c4..07aa4b349de4c11cdfd07d288843889f28c8e34a 100644
--- a/src/backoffice/templates/backoffice/wa-texture-list.html
+++ b/src/backoffice/templates/backoffice/wa-texture-list.html
@@ -36,4 +36,4 @@
       </tbody>
     </table>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_lock_list.html b/src/backoffice/templates/backoffice/wiki_lock_list.html
index 80fcd670dfbf192bd1ed89ceeb3bb98463d6df72..2d0213a6cf4af94a3cf48357de097bc7285d3cae 100644
--- a/src/backoffice/templates/backoffice/wiki_lock_list.html
+++ b/src/backoffice/templates/backoffice/wiki_lock_list.html
@@ -78,4 +78,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_namespace_list.html b/src/backoffice/templates/backoffice/wiki_namespace_list.html
index fbe98aa62b21b8ec6260088a2c3d518e3f3b3cf8..b4b9d80f49b63e3a20c2c977b807cb24ed95e25d 100644
--- a/src/backoffice/templates/backoffice/wiki_namespace_list.html
+++ b/src/backoffice/templates/backoffice/wiki_namespace_list.html
@@ -27,4 +27,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_overview.html b/src/backoffice/templates/backoffice/wiki_overview.html
index c063f81af62f4ab85049e88d5165048087a96355..e7699227eafc578770832affd9dae1de14de27af 100644
--- a/src/backoffice/templates/backoffice/wiki_overview.html
+++ b/src/backoffice/templates/backoffice/wiki_overview.html
@@ -34,4 +34,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_page_detail.html b/src/backoffice/templates/backoffice/wiki_page_detail.html
index f5a38ea84b402f74af8e087b66f4f50521f31b26..f54315ced1a345b5ad07aeff7922cdc1d056dd08 100644
--- a/src/backoffice/templates/backoffice/wiki_page_detail.html
+++ b/src/backoffice/templates/backoffice/wiki_page_detail.html
@@ -86,4 +86,4 @@
     </div>
   {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_page_list.html b/src/backoffice/templates/backoffice/wiki_page_list.html
index d0c00ec838cba04a5df503deea2195da779d8381..28f85bb43bf8df1bef0c7443449ee2baf798558e 100644
--- a/src/backoffice/templates/backoffice/wiki_page_list.html
+++ b/src/backoffice/templates/backoffice/wiki_page_list.html
@@ -56,4 +56,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/change_password.html b/src/backoffice/templates/registration/change_password.html
index a549653bcf540e05529e27af606ea3b20f2cd74c..2df88c7646c123bf0b7a166412bb5a6d87273174 100644
--- a/src/backoffice/templates/registration/change_password.html
+++ b/src/backoffice/templates/registration/change_password.html
@@ -9,4 +9,4 @@
     {% bootstrap_form form %}
     <button type="submit" class="btn btn-primary">{% trans "password_change_btn" %}</button>
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/change_password_done.html b/src/backoffice/templates/registration/change_password_done.html
index c9ddf5cd26f5f6ac933228a67e415cf0b35d8918..f556f265c58f182c1ca6e93621eef25a00faf86c 100644
--- a/src/backoffice/templates/registration/change_password_done.html
+++ b/src/backoffice/templates/registration/change_password_done.html
@@ -6,4 +6,4 @@
   <div class="alert alert-success">
     <h3>{% trans "registration_change_password_done" %}</h3>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/registration_form.html b/src/backoffice/templates/registration/registration_form.html
index f593768786101f2627ccd663502091a9ccf74b70..2777ccd35be505eb41a3a3b86ce2bae5281d5dce 100644
--- a/src/backoffice/templates/registration/registration_form.html
+++ b/src/backoffice/templates/registration/registration_form.html
@@ -9,4 +9,4 @@
     {% bootstrap_form form %}
     <button type="submit" class="btn btn-primary">{% trans "registration_signup_btn" %}</button>
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_complete.html b/src/backoffice/templates/registration/reset_password_complete.html
index fd8617a4d4945a3abc0b0ca0c33a4e0665381d71..820bee56954477017d0d6573edeec584f56c9110 100644
--- a/src/backoffice/templates/registration/reset_password_complete.html
+++ b/src/backoffice/templates/registration/reset_password_complete.html
@@ -6,4 +6,4 @@
   <div class="alert alert-success">
     <p>{% trans "registration_reset_password_complete" %}</p>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_confirm.html b/src/backoffice/templates/registration/reset_password_confirm.html
index 26e5ae4dc066b9241ce68aa81edc11f1b5f825ad..479e2abc578662b9c9cea6440212c2a3217cb6ac 100644
--- a/src/backoffice/templates/registration/reset_password_confirm.html
+++ b/src/backoffice/templates/registration/reset_password_confirm.html
@@ -9,4 +9,4 @@
     {% bootstrap_form form %}
     <button type="submit" class="btn btn-primary">{% trans "password_reset_btn" %}</button>
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_done.html b/src/backoffice/templates/registration/reset_password_done.html
index 82973b42bc0e72af918f89604843df06b29c77ca..03100841c8436eb84852e8fcf390c2258f3f7c91 100644
--- a/src/backoffice/templates/registration/reset_password_done.html
+++ b/src/backoffice/templates/registration/reset_password_done.html
@@ -7,4 +7,4 @@
     <h3>{% trans "registration_reset_password_done" %}</h3>
     <p>{% trans "registration_reset_password_mailsent" %}</p>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/signup_done.html b/src/backoffice/templates/registration/signup_done.html
index 8505686e43b02cfb91e6d1a9813dd2bef089c04b..39f0e9150e120bee50f57dc5ad13151c4b79e064 100644
--- a/src/backoffice/templates/registration/signup_done.html
+++ b/src/backoffice/templates/registration/signup_done.html
@@ -7,4 +7,4 @@
     <h3>{% trans "registration_signup_done" %}</h3>
     <p>{% trans "registration_signup_mailsent" %}</p>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/core/templates/rest_framework/api.html b/src/core/templates/rest_framework/api.html
index 4110378e29a2c91dca356d0c4f908f435127d7d6..35b569ae4b996c9be414c60f60eab61061d7b774 100644
--- a/src/core/templates/rest_framework/api.html
+++ b/src/core/templates/rest_framework/api.html
@@ -3,10 +3,10 @@
 {% block title %}
   {% if name %}{{ name }} –{% endif %}
   HUB API
-{% endblock %}
+{% endblock title %}
 
 {% block branding %}
   <a class="navbar-brand"
      rel="nofollow"
      href="{% hub_absolute "api:index" %}">Hub API</a>
-{% endblock %}
+{% endblock branding %}
diff --git a/src/core/templates/rest_framework/login.html b/src/core/templates/rest_framework/login.html
index 63fb13f25cbed599c83d2666afb757cd1c86585a..df34795f335cac4123051d3a1a05a3d150de233c 100644
--- a/src/core/templates/rest_framework/login.html
+++ b/src/core/templates/rest_framework/login.html
@@ -1,2 +1,4 @@
 {% extends "rest_framework/login_base.html" %}
-{% block branding %}<h3 style="margin: 0 0 20px;">HUB API</h3>{% endblock %}
+{% block branding %}
+  <h3 style="margin: 0 0 20px;">HUB API</h3>
+{% endblock branding %}
diff --git a/src/plainui/jinja2/plainui/assemblies.html.j2 b/src/plainui/jinja2/plainui/assemblies.html.j2
index bf0861b951a74d27e35f03f7ee7db562dec831cd..4c14050ce6731f15e6863cdc4e1590a5600617fe 100644
--- a/src/plainui/jinja2/plainui/assemblies.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies.html.j2
@@ -6,7 +6,9 @@
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
 {% import "plainui/components/wiki.html.j2" as wikiMacro with context %}
 
-{% block title %}{{ conf.name }} - {{ _("Assemblies") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Assemblies") }}
+{% endblock title %}
 {% block content %}
   {{ navMacro.top_nav(_("Assemblies") ) }}
 
@@ -36,4 +38,4 @@
 
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assemblies_all.html.j2 b/src/plainui/jinja2/plainui/assemblies_all.html.j2
index fd68c118920e3cbadef3b564bc98f4915058ed04..06854a1e3c6679d4db089b0fa2da88152f4cd2c7 100644
--- a/src/plainui/jinja2/plainui/assemblies_all.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies_all.html.j2
@@ -3,7 +3,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("all assemblies") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("all assemblies") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("all assemblies") ) }}
@@ -42,4 +44,4 @@
   </div>
 
   <hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assemblies_events.html.j2 b/src/plainui/jinja2/plainui/assemblies_events.html.j2
index 6e3b6b35d7b8dbc4825b6203ec65d230e1f9cf04..32f9a1b01134a922f1d9ea6a532c66e088879a15 100644
--- a/src/plainui/jinja2/plainui/assemblies_events.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies_events.html.j2
@@ -3,7 +3,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("assembly events") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("assembly events") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("assembly events") ) }}
@@ -21,4 +23,4 @@
   </div>
 
   <hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assembly.html.j2 b/src/plainui/jinja2/plainui/assembly.html.j2
index 27bf9477adbbb62f0efe75a9a23efd7010fc57a7..ae8b3d11a4bca81254b19dc18515e755f9701bb1 100644
--- a/src/plainui/jinja2/plainui/assembly.html.j2
+++ b/src/plainui/jinja2/plainui/assembly.html.j2
@@ -10,7 +10,9 @@
 {% import "plainui/components/badge_elements.html.j2" as badge_elements with context %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
 
-{% block title %}{{ conf.name }} - Assembly {{ assembly.name }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - Assembly {{ assembly.name }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Assembly") , has_breadcrumbs=True) }}
@@ -127,4 +129,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/badges/token_detail.html.j2 b/src/plainui/jinja2/plainui/badges/token_detail.html.j2
index cf3230e8f6b5d748c984688671b3d8481a78aabb..1774b6c1fcf7e9660802ed55f86123e9af7c1a5b 100644
--- a/src/plainui/jinja2/plainui/badges/token_detail.html.j2
+++ b/src/plainui/jinja2/plainui/badges/token_detail.html.j2
@@ -26,4 +26,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/base.html.j2 b/src/plainui/jinja2/plainui/base.html.j2
index 564f63e2e012084d9803e56b923edffe924ac5c3..21a4bf7930a425dd02c3892fd8944f8734c59c1e 100644
--- a/src/plainui/jinja2/plainui/base.html.j2
+++ b/src/plainui/jinja2/plainui/base.html.j2
@@ -15,10 +15,12 @@
           href="{{ static('plainui/img/favicon.ico') }}"
           type="image/x-icon">
     <title>
-      {% block title %}{% endblock %}
+      {% block title %}
+      {% endblock title %}
     </title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    {% block head %}{% endblock %}
+    {% block head %}
+    {% endblock head %}
     <link href="{{ static('vendor/map/leaflet.css') }}" rel='stylesheet' />
     <script src="{{ static('vendor/map/leaflet.js') }}"></script>
     <link href="{{ static('vendor/map/leaflet.draw.css') }}" rel='stylesheet' />
@@ -74,7 +76,8 @@
                   {% endfor -%}
                 </div>
               {% endif %}
-              {%- block content %}{% endblock %}
+              {%- block content %}
+              {% endblock content %}
             </main>
           {% endblock fullpage -%}
           {%- block fullpage_add -%}
diff --git a/src/plainui/jinja2/plainui/board.html.j2 b/src/plainui/jinja2/plainui/board.html.j2
index 1f36738899efad8f926ae78ef09ceeebc17d5937..8c91735ac55e14e39c6a6bedbdc61e7ccc1b4c32 100644
--- a/src/plainui/jinja2/plainui/board.html.j2
+++ b/src/plainui/jinja2/plainui/board.html.j2
@@ -9,7 +9,7 @@
   {% else %}
     {{ _("Bulletin Board") }}
   {% endif %}
-{% endblock %}
+{% endblock title %}
 {% block content %}
   {% if private %}
     {{ navMacro.top_nav(_("My Bulletin Board") ) }}
@@ -87,4 +87,4 @@
     {# archive mode #}
     {{ _("archivemode_notavailable") }}
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/channel_events.html.j2 b/src/plainui/jinja2/plainui/channel_events.html.j2
index 2f1d431a281d53700a7c3f5a2dc8d0efa51e1fea..7581cb7e7061a5ace5f4e0bdffd7a880a9dd5330 100644
--- a/src/plainui/jinja2/plainui/channel_events.html.j2
+++ b/src/plainui/jinja2/plainui/channel_events.html.j2
@@ -5,8 +5,10 @@
 {% block head %}
   <script src="{{ static('plainui/js/player.js') }}"></script>
   <script async src="{{ static('plainui/js/modal.js') }}"></script>
-{% endblock %}
-{% block title %}{{ conf.name }} - {{ _("Main Program") }}{% endblock %}
+{% endblock head %}
+{% block title %}
+  {{ conf.name }} - {{ _("Main Program") }}
+{% endblock title %}
 {% block content %}
   {{ titleMacro.title(title=_("Main Program") ) }}
 
@@ -126,4 +128,4 @@
     </div>
   {% endfor %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/component_gallery.html.j2 b/src/plainui/jinja2/plainui/component_gallery.html.j2
index f20e86e133ad490fd63a3a6389f6dd420b091495..11a5149770992ea390ca3bbde0e88ed347db2643 100644
--- a/src/plainui/jinja2/plainui/component_gallery.html.j2
+++ b/src/plainui/jinja2/plainui/component_gallery.html.j2
@@ -18,7 +18,9 @@
 {% import "plainui/components/map.html.j2" as mapMacro %}
 {% import "plainui/components/alert.html.j2" as alert %}
 
-{% block title %}Components Gallery{% endblock %}
+{% block title %}
+  Components Gallery
+{% endblock title %}
 
 {% set image_url = "https://picsum.photos/1400/800" %}
 
@@ -335,4 +337,4 @@
       {% endcall %}
     </dd>
   </dl>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/conferences.html.j2 b/src/plainui/jinja2/plainui/conferences.html.j2
index 5ed87ec9e02cd7ead02f2f65036df529258a6795..4a5810f3221dbd993dc2b1cc690134219d9a0dd9 100644
--- a/src/plainui/jinja2/plainui/conferences.html.j2
+++ b/src/plainui/jinja2/plainui/conferences.html.j2
@@ -1,5 +1,7 @@
 {% extends "plainui/base.html.j2" %}
-{% block title %}{{ _("Conferences") }}{% endblock %}
+{% block title %}
+  {{ _("Conferences") }}
+{% endblock title %}
 {% block content %}
   {{ titleMacro.title(_("Conferences") ) }}
   <ul class="my-11">
@@ -9,4 +11,4 @@
       </li>
     {% endfor %}
   </ul>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/dereferrer.html.j2 b/src/plainui/jinja2/plainui/dereferrer.html.j2
index 92387d7bec12bc46c53820a4e6e895652406ef3e..c580ab3c2b4a5ad72d062a880718ebeb9abedd7b 100644
--- a/src/plainui/jinja2/plainui/dereferrer.html.j2
+++ b/src/plainui/jinja2/plainui/dereferrer.html.j2
@@ -1,5 +1,7 @@
 {% extends "plainui/base.html.j2" %}
-{% block title %}Dereferrer{% endblock %}
+{% block title %}
+  Dereferrer
+{% endblock title %}
 {% block content %}
 
   <article class="d-flex justify-content-center align-items-center my-11">
@@ -36,4 +38,4 @@
     </section>
   </article>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/event.html.j2 b/src/plainui/jinja2/plainui/event.html.j2
index 80428cfda06a294cc16702969a3a16eb0f6b4e36..ab52b602adf6012e2b76f50984bd17e6aff9b465 100644
--- a/src/plainui/jinja2/plainui/event.html.j2
+++ b/src/plainui/jinja2/plainui/event.html.j2
@@ -18,9 +18,13 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ event.name }} - {{ conf.slug.upper() }}{% endblock %}
+{% block title %}
+  {{ event.name }} - {{ conf.slug.upper() }}
+{% endblock title %}
 
-{% block head %}<script src="{{ static('plainui/js/player.js') }}"></script>{% endblock %}
+{% block head %}
+  <script src="{{ static('plainui/js/player.js') }}"></script>
+{% endblock head %}
 {% block content %}
   <article class="mt-10">
     {{ navMacro.top_nav(_("Event") , has_breadcrumbs=True) }}
@@ -175,4 +179,4 @@
     </div>
   </article>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/fahrplan.html.j2 b/src/plainui/jinja2/plainui/fahrplan.html.j2
index b7c1439f2916b34e5392479d02409c2c0932bea5..ffee9d5f19cb881a3080fa9a510ab46cf9f6d234 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/fahrplan.html.j2
@@ -22,7 +22,9 @@
                  {% endif %}">{{ t.name }}</button>
 {% endmacro %}
 
-{% block title %}Conference {{ conf.name }}{% endblock %}
+{% block title %}
+  Conference {{ conf.name }}
+{% endblock title %}
 {% block content %}
   {{ navMacro.top_nav(_("Fahrplan") ) }}
 
@@ -111,10 +113,10 @@
     {% endif %}
 
     {% if mode == 'list' %}{{ list_events.list(events, my_favorite_events) }}{% endif %}
-  {% endblock %}
+  {% endblock content %}
 
   {% block fullpage_add %}
 
     {% if mode == 'calendar' %}<div class="p-3 border m-2">{{ calendar(events) }}</div>{% endif %}
 
-  {% endblock %}
+  {% endblock fullpage_add %}
diff --git a/src/plainui/jinja2/plainui/index.html.j2 b/src/plainui/jinja2/plainui/index.html.j2
index 305a9cd2f0dafc80f3a5af6f3fbb5ec9835c4a90..5b25fab2714e156607fe6974640b9efa8f0f8c9d 100644
--- a/src/plainui/jinja2/plainui/index.html.j2
+++ b/src/plainui/jinja2/plainui/index.html.j2
@@ -6,8 +6,12 @@
 {% import "plainui/components/buttons.html.j2" as buttonsMacro %}
 {% import "plainui/components/list_events.html.j2" as list_events with context %}
 
-{% block title %}{{ conf.name }} - Index{% endblock %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block title %}
+  {{ conf.name }} - Index
+{% endblock title %}
+{% block head %}
+  <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
 {% block content %}
 
   {% set start_title, start_body = fetch_wiki_page('start') %}
@@ -66,4 +70,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/landing.html.j2 b/src/plainui/jinja2/plainui/landing.html.j2
index c33b6614df9c06aa307be1ade9b3dd42f8ee5829..12346f02da026ec6755d2d3fd7dcddd129591c7d 100644
--- a/src/plainui/jinja2/plainui/landing.html.j2
+++ b/src/plainui/jinja2/plainui/landing.html.j2
@@ -1,5 +1,7 @@
 {% extends "plainui/base.html.j2" %}
-{% block title %}Conference {{ conf.name }}{% endblock %}
+{% block title %}
+  Conference {{ conf.name }}
+{% endblock title %}
 {% block fullpage %}
 
   <article class="hub-landing">
@@ -75,4 +77,4 @@
     </header>
   </article>
 
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/login.html.j2 b/src/plainui/jinja2/plainui/login.html.j2
index e264e4bf018d1a9919f161fdc5727127864d4f2b..9f25baf47ed7664b0e2448b576106f4601a054cc 100644
--- a/src/plainui/jinja2/plainui/login.html.j2
+++ b/src/plainui/jinja2/plainui/login.html.j2
@@ -5,7 +5,7 @@
 
 {% block title %}
   {{ _("%(conf)s - Login", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="container">
@@ -53,4 +53,4 @@
     <hr class="hub-spacer">
   </article>
 
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_change.html.j2 b/src/plainui/jinja2/plainui/password_change.html.j2
index 9a5bb0a89841b892e8566744d8cc49859c0e2097..9ab7f71e0e207bbe7cbd49316ee46de04f78c649 100644
--- a/src/plainui/jinja2/plainui/password_change.html.j2
+++ b/src/plainui/jinja2/plainui/password_change.html.j2
@@ -1,7 +1,9 @@
 {% import "plainui/components/form_elements.html.j2" as form_elements %}
 {% import "plainui/components/logo.html.j2" as logoMacro %}
 {% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Change Password") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Change Password") }}
+{% endblock title %}
 {% block content %}
 
   <div class="row justify-content-center px-6 mt-11 mb-8">
@@ -25,4 +27,4 @@
     </div>
   </form>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/password_reset_complete.html.j2 b/src/plainui/jinja2/plainui/password_reset_complete.html.j2
index 434f1503374562b13dca3098e52e2ee559932297..3b8305dd52d98fa86f500e4d5744b32004706dff 100644
--- a/src/plainui/jinja2/plainui/password_reset_complete.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_complete.html.j2
@@ -2,7 +2,7 @@
 {% import "plainui/components/logo.html.j2" as logoMacro %}
 {% block title %}
   {{ _("%(conf)s - Password Reset complete", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="hub-landing">
@@ -24,4 +24,4 @@
 
     <hr class="hub-spacer">
   </article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_reset_confirm.html.j2 b/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
index 2b27e9b42b0c32e3c5f4fa3a8ac8e24cc4c4317f..e58765772532d17c50cf4a61ba6cd69494621b7b 100644
--- a/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
@@ -3,7 +3,7 @@
 {% extends "plainui/base.html.j2" %}
 {% block title %}
   {{ _("%(conf)s - Reset Password", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="hub-landing">
@@ -34,4 +34,4 @@
 
     <hr class="hub-spacer">
   </article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_reset_done.html.j2 b/src/plainui/jinja2/plainui/password_reset_done.html.j2
index 37feafd8311724dd18292cfd1579a2dae7a12afd..404a9cc02653be8532b42fb899d8140249a122b0 100644
--- a/src/plainui/jinja2/plainui/password_reset_done.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_done.html.j2
@@ -2,7 +2,7 @@
 {% import "plainui/components/logo.html.j2" as logoMacro %}
 {% block title %}
   {{ _("%(conf)s - Password Reset sent", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="hub-landing">
@@ -31,4 +31,4 @@
     <hr class="hub-spacer">
   </article>
 
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/personal_message_list.html.j2 b/src/plainui/jinja2/plainui/personal_message_list.html.j2
index 6b9ce22df7ae2d73ac6418ce804ceed806511cbc..19ddd35f584468154ce2c5059a6951ad92ad8812 100644
--- a/src/plainui/jinja2/plainui/personal_message_list.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_list.html.j2
@@ -3,7 +3,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("Personal Messages") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Personal Messages") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Personal Messages") ) }}
@@ -153,4 +155,4 @@
       <p class="font-headings text-white text-right p-0">{{ msgs | length }} {{ _("messages_x_of_n") }} {{ total }}</p>
     </form>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/personal_message_send.html.j2 b/src/plainui/jinja2/plainui/personal_message_send.html.j2
index 0bac33c6f902b89cfdb5d4d9f31efb13d3a007ae..e0c6eb5d58864642284d56c3814df6396b62ef82 100644
--- a/src/plainui/jinja2/plainui/personal_message_send.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_send.html.j2
@@ -3,7 +3,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("Personal Messages - Send") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Personal Messages - Send") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Send Personal Message") , has_breadcrumbs=True) }}
@@ -39,4 +41,4 @@
   </form>
 
   <hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/personal_message_show.html.j2 b/src/plainui/jinja2/plainui/personal_message_show.html.j2
index 9cf1d4feca7fb1df6640d29e71ec8d3b066e2eca..ae39db88d37495ddfddb6626376181a9955b66c0 100644
--- a/src/plainui/jinja2/plainui/personal_message_show.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_show.html.j2
@@ -4,7 +4,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("Personal Message") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Personal Message") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Message from %(user)s", user=msg.sender.display_name) , has_breadcrumbs=True) }}
@@ -61,4 +63,4 @@
 
     {{ markdown(msg_body) }}
   </article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/profile.html.j2 b/src/plainui/jinja2/plainui/profile.html.j2
index ed9587f11c8abd80b887cac24a6a3bd9be4529a0..1a95c223a7986624e99261745c7976157823a535 100644
--- a/src/plainui/jinja2/plainui/profile.html.j2
+++ b/src/plainui/jinja2/plainui/profile.html.j2
@@ -11,7 +11,9 @@
 {% import "plainui/components/tagbox.html.j2" as tagMacros %}
 {% import "plainui/components/badge_elements.html.j2" as badgeMacros with context %}
 
-{% block title %}{{ conf.name }} - {{ _("Profile") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Profile") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("My Dashboard") ) }}
@@ -132,4 +134,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/projects/detail.html.j2 b/src/plainui/jinja2/plainui/projects/detail.html.j2
index 97e0fe1f191f4ebdd7fe77f64b97b68dc4802d8f..dc5f2e6dc3a668af58c194413c532be1e82d0b6d 100644
--- a/src/plainui/jinja2/plainui/projects/detail.html.j2
+++ b/src/plainui/jinja2/plainui/projects/detail.html.j2
@@ -6,8 +6,12 @@
 {% import "plainui/components/function_btns.html.j2" as fbtns with context %}
 
 {% extends "plainui/base.html.j2" %}
-{% block title %}Conference {{ conf.name }} - Project {{ project.name }}{% endblock %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block title %}
+  Conference {{ conf.name }} - Project {{ project.name }}
+{% endblock title %}
+{% block head %}
+  <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
 {% block content %}
   {{ navMacro.top_nav(_("Project") , has_breadcrumbs=True) }}
   <nav aria-label="breadcrumb">
@@ -89,4 +93,4 @@
       {% endif %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/public_fahrplan.html.j2 b/src/plainui/jinja2/plainui/public_fahrplan.html.j2
index 54f8330028c4a1fb7912d029ff2425edf7a732e2..f69aca7d61413663560fcf4d9e82b3ced03a2525 100644
--- a/src/plainui/jinja2/plainui/public_fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/public_fahrplan.html.j2
@@ -14,7 +14,8 @@
           type="image/x-icon">
     <title>{{ _("%(conf)s - Public Fahrplan", conf=conf.name) }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    {% block head %}{% endblock %}
+    {% block head %}
+    {% endblock head %}
     <script>
             document.addEventListener('DOMContentLoaded', (e) => {
                 document.querySelector('html').classList.remove('no-js');
diff --git a/src/plainui/jinja2/plainui/redeem_badge.html.j2 b/src/plainui/jinja2/plainui/redeem_badge.html.j2
index 6e7ef8fbf3258c4babf3d76f723f1ce29c297e35..283cfa7de612969c87e115db5540b7edfe375528 100644
--- a/src/plainui/jinja2/plainui/redeem_badge.html.j2
+++ b/src/plainui/jinja2/plainui/redeem_badge.html.j2
@@ -1,7 +1,9 @@
 {% extends "plainui/base.html.j2" %}
 {% import "plainui/components/form_elements.html.j2" as form_elements %}
 
-{% block title %}{{ conf.name }} - {{ _("Profile") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Profile") }}
+{% endblock title %}
 {% block content %}
 
   {{ titleMacro.title(_("Redeem Badge Token") ) }}
@@ -24,4 +26,4 @@
     </form>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/redeem_token.html.j2 b/src/plainui/jinja2/plainui/redeem_token.html.j2
index fcedb2fcfb8b34e1bd23ec4757ff30969baa2ad0..b9e6c0a6740065c3860661e066950833956d83d0 100644
--- a/src/plainui/jinja2/plainui/redeem_token.html.j2
+++ b/src/plainui/jinja2/plainui/redeem_token.html.j2
@@ -5,7 +5,7 @@
 
 {% block title %}
   {{ _("Conference %(conf)s - Redeem Token", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 {% block content %}
   {{ titleMacro.title(_("Redeem Token") ) }}
 
@@ -107,4 +107,4 @@
   {% call alert.info(class="my-8") %}
     {{ _("User accounts from maschinenraum.rc3.world can be used to login.") }}
   {% endcall %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2 b/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
index b9b04457bed6b19f34ea3a93183581931911f349..dc1720129f5eea5898c203ec84d42aaa56546e3c 100644
--- a/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
+++ b/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
@@ -3,7 +3,7 @@
 {% extends "plainui/base.html.j2" %}
 {% block title %}
   {{ _("%(conf)s - Reset Password", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 {% block fullpage %}
   <article class="hub-landing">
     <figure class="hub-landing__logo">
@@ -42,4 +42,4 @@
 
     <hr class="hub-spacer">
   </article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/report_content.html.j2 b/src/plainui/jinja2/plainui/report_content.html.j2
index f68848515c2f9c4d8d7706013ac999d5558bfd47..363cdb9d27991110154e189459ad165374918460 100644
--- a/src/plainui/jinja2/plainui/report_content.html.j2
+++ b/src/plainui/jinja2/plainui/report_content.html.j2
@@ -4,7 +4,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}_("Report Content") - {{ conf.name }}{% endblock %}
+{% block title %}
+  _("Report Content") - {{ conf.name }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Help, there is a Problem...") ) }}
@@ -61,4 +63,4 @@
 
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/room.html.j2 b/src/plainui/jinja2/plainui/room.html.j2
index 91cc9c9aa427549da2885d56601963bcd1af38f6..0497b0a10383c6f50d04de45e73cd52420705fc8 100644
--- a/src/plainui/jinja2/plainui/room.html.j2
+++ b/src/plainui/jinja2/plainui/room.html.j2
@@ -6,9 +6,13 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}Conference {{ conf.name }} - Room {{ room.name }}{% endblock %}
+{% block title %}
+  Conference {{ conf.name }} - Room {{ room.name }}
+{% endblock title %}
 
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block head %}
+  <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Room") , has_breadcrumbs=True) }}
@@ -66,4 +70,4 @@
       {% endif %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/search.html.j2 b/src/plainui/jinja2/plainui/search.html.j2
index c9a2c5c7c6b07547256945ff3f4ac01453eb1b44..ca787b0a7ab973f438b1fb0f6d70eccc2e139bbd 100644
--- a/src/plainui/jinja2/plainui/search.html.j2
+++ b/src/plainui/jinja2/plainui/search.html.j2
@@ -3,7 +3,9 @@
 
 {% extends "plainui/base.html.j2" %}
 
-{% block title %}{{ conf.name }} - {{ _("Search Results") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Search Results") }}
+{% endblock title %}
 
 {% block content %}
 
@@ -46,4 +48,4 @@
       {{ _("No results, sorry!") }}
     {%- endfor %}
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/signup.html.j2 b/src/plainui/jinja2/plainui/signup.html.j2
index e4d6ae9426f4e35c1f1079a45dbd5945df436941..58d0f4db8829430c27491fe86229a25224c46555 100644
--- a/src/plainui/jinja2/plainui/signup.html.j2
+++ b/src/plainui/jinja2/plainui/signup.html.j2
@@ -3,7 +3,7 @@
 {% import "plainui/components/logo.html.j2" as logoMacro %}
 {% block title %}
   {{ _("%(conf)s - Registration", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="container">
@@ -40,4 +40,4 @@
     <hr class="hub-spacer">
   </article>
 
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/signup_done.html.j2 b/src/plainui/jinja2/plainui/signup_done.html.j2
index e366255eed939945075ff29dfbc2d0c1bb5ed4dd..01ab9bdcd3a5e626299cb13be6bd2387da890432 100644
--- a/src/plainui/jinja2/plainui/signup_done.html.j2
+++ b/src/plainui/jinja2/plainui/signup_done.html.j2
@@ -3,7 +3,7 @@
 {% import "plainui/components/logo.html.j2" as logoMacro %}
 {% block title %}
   {{ _("%(conf)s - Registration", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 
 {% block fullpage %}
   <article class="container">
@@ -17,4 +17,4 @@
     <hr class="hub-spacer">
   </article>
 
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/sos.html.j2 b/src/plainui/jinja2/plainui/sos.html.j2
index 366534526a952c4bf296651d85f5e6ce05db1d70..bb4e6ba3f83917b60f9180bf30f0f62dd03338ab 100644
--- a/src/plainui/jinja2/plainui/sos.html.j2
+++ b/src/plainui/jinja2/plainui/sos.html.j2
@@ -3,8 +3,10 @@
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
 {% import "plainui/components/wiki.html.j2" as wikiMacro with context %}
 
-{# Translators: Website title #}
-{% block title %}{{ conf.name }} - {{ _("self-organized sessions") }}{% endblock %}
+{% block title %}
+  {# Translators: Website title #}
+  {{ conf.name }} - {{ _("self-organized sessions") }}
+{% endblock title %}
 {% block content %}
   {{ navMacro.top_nav(_("self-organized sessions") ) }}
   <div class="hub-vlayout-l">
@@ -21,4 +23,4 @@
     </div>
 
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/sos_edit.html.j2 b/src/plainui/jinja2/plainui/sos_edit.html.j2
index 3d8f8d2d75f6b2579e03bd9fa7029a3195f53a27..171eba0374481cd1234f01059a4449117d7e93db 100644
--- a/src/plainui/jinja2/plainui/sos_edit.html.j2
+++ b/src/plainui/jinja2/plainui/sos_edit.html.j2
@@ -1,6 +1,8 @@
 {% import "plainui/components/form_elements.html.j2" as form_elements %}
 {% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - Edit Self-organized Session{% endblock %}
+{% block title %}
+  {{ conf.name }} - Edit Self-organized Session
+{% endblock title %}
 {% block content %}
   <form method="post"
         class="border p-0 mx-auto my-11 {% if form.errors %}border-danger{% endif %}">
@@ -30,4 +32,4 @@
       {{ form_elements.errors(form) }}
     </div>
   </form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page.html.j2 b/src/plainui/jinja2/plainui/static_page.html.j2
index 010138b323d64c74049d4c600a9bda93ad79cb04..4bc92c9a3cd833944acc8380dfdd4683323374e6 100644
--- a/src/plainui/jinja2/plainui/static_page.html.j2
+++ b/src/plainui/jinja2/plainui/static_page.html.j2
@@ -11,7 +11,7 @@
   {% else %}
     {{ _("missing page") }}
   {% endif %}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {%- if not page %}
@@ -60,4 +60,4 @@
       <article class="hub-text">{{ markdownMacro.markdown(markdown=page_body | safe, border=False) }}</article>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_diff.html.j2 b/src/plainui/jinja2/plainui/static_page_diff.html.j2
index 469e5432339dc2fb564d70c713d17356e069e94d..194e1d0c398a56dbb8d287a8b8a6c571b75686ce 100644
--- a/src/plainui/jinja2/plainui/static_page_diff.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_diff.html.j2
@@ -1,7 +1,9 @@
 {% extends "plainui/base.html.j2" %}
 {% import "plainui/components/markdown.html.j2" as markdownMacro %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ page.title }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Compare") ) }}
@@ -32,4 +34,4 @@
   </div>
   <article class="pb-11">{{ diff |safe }}</article>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_edit.html.j2 b/src/plainui/jinja2/plainui/static_page_edit.html.j2
index f18cfb0848bde8001de1bd0379a5d6679b4e87e1..aee948651652b58de00ba1d016686475020e5548 100644
--- a/src/plainui/jinja2/plainui/static_page_edit.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_edit.html.j2
@@ -2,7 +2,9 @@
 {% import "plainui/components/form_elements.html.j2" as formElements %}
 {% import "plainui/components/markdown.html.j2" as markdownMacro %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ page.title }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Edit") ) }}
@@ -65,7 +67,7 @@
       </div>
     </form>
   </article>
-{% endblock %}
+{% endblock content %}
 
 {% block jstools %}
   {% if page_slug and lock_id %}
@@ -84,4 +86,4 @@
   setInterval(refresh_lock, {{ lock_refresh_interval | tojson}} * 1000);
     </script>
   {% endif %}
-{% endblock %}
+{% endblock jstools %}
diff --git a/src/plainui/jinja2/plainui/static_page_global_history.html.j2 b/src/plainui/jinja2/plainui/static_page_global_history.html.j2
index f9865696a3baf4aa0caa96153569d06ed24a86b7..42217e6a05e2fcb105fcf24f85612f319d30e451 100644
--- a/src/plainui/jinja2/plainui/static_page_global_history.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_global_history.html.j2
@@ -1,7 +1,9 @@
 {% extends "plainui/base.html.j2" %}
 {% import "plainui/components/markdown.html.j2" as markdownMacro %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ _("Page Modifications") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Page Modifications") }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Page Modifications") ) }}
@@ -36,4 +38,4 @@
   </div>
 </article>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_history.html.j2 b/src/plainui/jinja2/plainui/static_page_history.html.j2
index 3fdbb0074f21a6b66ca3ae50be7514deb772fa81..7b41d0094bd4761ecba3c66aada157c506d80b28 100644
--- a/src/plainui/jinja2/plainui/static_page_history.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_history.html.j2
@@ -1,7 +1,9 @@
 {% extends "plainui/base.html.j2" %}
 {% import "plainui/components/markdown.html.j2" as markdownMacro %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ page.title }}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("History") ) }}
@@ -39,4 +41,4 @@
     </form>
   </article>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/tag.html.j2 b/src/plainui/jinja2/plainui/tag.html.j2
index 32a09c1acd3832356ab032390f5ed3add52aa0dc..64d94531b3693f87bf775620205e9537f079f81b 100644
--- a/src/plainui/jinja2/plainui/tag.html.j2
+++ b/src/plainui/jinja2/plainui/tag.html.j2
@@ -7,7 +7,7 @@
 
 {% block title %}
   {{ conf.name }} - {{ _("Tag %(name)s", name=tag.slug) }}
-{% endblock %}
+{% endblock title %}
 
 {% block content %}
   {{ navMacro.top_nav(_("Tag %(name)s", name=tag.slug) ) }}
@@ -28,4 +28,4 @@
       {{ list_projects.list(projects,my_favorite_projects, metadata=false) }}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/token_password_reset.html.j2 b/src/plainui/jinja2/plainui/token_password_reset.html.j2
index 5e304c7f34ab84dc163ad6d845fd742f8283b277..7fbe04ffe6c07fe347418cef1185eb0aa6b38e74 100644
--- a/src/plainui/jinja2/plainui/token_password_reset.html.j2
+++ b/src/plainui/jinja2/plainui/token_password_reset.html.j2
@@ -2,7 +2,7 @@
 {% import "plainui/components/form_elements.html.j2" as form_elements %}
 {% block title %}
   {{ _("Conference %(conf)s - Password Reset", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
 {% block content %}
   {{ titleMacro.title(_("Password Reset") ) }}
 
@@ -25,4 +25,4 @@
     </form>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/upcoming.html.j2 b/src/plainui/jinja2/plainui/upcoming.html.j2
index 40c75937c92a722562460b8a5c1467c58c06e9a0..50004f6395b92da395ac6167ddafbc3f2dcfb448 100644
--- a/src/plainui/jinja2/plainui/upcoming.html.j2
+++ b/src/plainui/jinja2/plainui/upcoming.html.j2
@@ -1,9 +1,11 @@
 {% extends "plainui/base.html.j2" %}
 {% import "plainui/components/list_events.html.j2" as list_events with context %}
 
-{% block title %}{{ conf.name }} - {{ _("Upcoming") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("Upcoming") }}
+{% endblock title %}
 {% block content %}
   {{ titleMacro.title(_("Upcoming events") ) }}
 
   <div class="border mt-8 mb-11 p-3">{{ list_events.slider(events, my_favorite_events) }}</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/user.html.j2 b/src/plainui/jinja2/plainui/user.html.j2
index 5134cc2658cc65a26094cf3f4b1f9f58192e4b2b..2e58c056ad3dcd75ad85e0c732bbffe561b78951 100644
--- a/src/plainui/jinja2/plainui/user.html.j2
+++ b/src/plainui/jinja2/plainui/user.html.j2
@@ -9,7 +9,7 @@
 
 {% block title %}
   {{ _("%(conf)s - User %(name)s", conf=conf.name, name=display_user.username) }}
-{% endblock %}
+{% endblock title %}
 {% block content %}
 
   {{ navMacro.top_nav(_("User Profile") ) }}
@@ -45,4 +45,4 @@
     </div>
   </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/wa_dereferrer.html.j2 b/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
index 284dad72887945de2410e8cfbfe2833256f5ef9c..637809279843de3e1a4751bf4fbb49d8df1103ce 100644
--- a/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
+++ b/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
@@ -1,5 +1,7 @@
 {% extends "plainui/base.html.j2" %}
-{% block title %}Dereferrer{% endblock %}
+{% block title %}
+  Dereferrer
+{% endblock title %}
 {% block body %}
 
   <article class="d-flex justify-content-center align-items-center">
@@ -36,4 +38,4 @@
     </section>
   </article>
 
-{% endblock %}
+{% endblock body %}
diff --git a/src/plainui/jinja2/plainui/world.html.j2 b/src/plainui/jinja2/plainui/world.html.j2
index 603a283bb24efe1704c7b5e0943e3522c7ab352c..3ede9c87b4838aec1447a3c2f20c6e5f35515757 100644
--- a/src/plainui/jinja2/plainui/world.html.j2
+++ b/src/plainui/jinja2/plainui/world.html.j2
@@ -2,7 +2,9 @@
 {% import "plainui/components/markdown.html.j2" as markdownMacro %}
 {% import "plainui/components/image.html.j2" as imageMacro %}
 
-{% block title %}{{ conf.name }} - {{ _("2D World") }}{% endblock %}
+{% block title %}
+  {{ conf.name }} - {{ _("2D World") }}
+{% endblock title %}
 {% block content %}
   <article>
     <div class="w-100 text-center my-12">
@@ -16,4 +18,4 @@
 
   <hr class="hub-spacer">
 
-{% endblock %}
+{% endblock content %}