From d2658429770c4ce9b30bb0e536abffbb14f543cf Mon Sep 17 00:00:00 2001
From: krmax44 <hi@krmax44.de>
Date: Mon, 13 Nov 2023 14:58:59 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20reformat=20all=20html=20files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/fds_blog/article/change_form.html   |   4 +-
 .../templates/fds_blog/_article_detail.html   | 177 +++----
 .../templates/fds_blog/article_detail.html    | 100 ++--
 .../templates/fds_blog/article_list.html      | 194 +++----
 .../fds_blog/templates/fds_blog/base.html     | 118 +++--
 .../templates/fds_blog/blog_preview.html      |  12 +-
 .../fds_blog/templates/fds_blog/content.html  |   4 +-
 .../fds_blog/content/_article_no_image.html   |   1 -
 .../templates/fds_blog/detailsbox.html        |   5 +-
 .../templates/fds_blog/full_content.html      |  90 ++--
 .../templates/fds_blog/header_blog.html       |   6 +-
 .../templates/fds_blog/includes/_picture.html |  31 +-
 .../fds_blog/includes/blog_feature_item.html  |  85 ++-
 .../fds_blog/includes/blog_item.html          |  49 +-
 .../fds_blog/includes/blog_picture.html       |   3 +-
 .../includes/blog_picture_detail.html         |  29 +-
 .../fds_blog/includes/blog_picture_small.html |  18 +-
 .../fds_blog/includes/blog_short_item.html    |  25 +-
 .../fds_blog/includes/blog_simple_item.html   |  20 +-
 .../fds_blog/includes/social_meta.html        |  42 +-
 .../templates/fds_blog/infotextbox.html       |   5 +-
 .../fds_blog/plugins/blog_content.html        |   7 +-
 .../fds_blog/plugins/featured_articles.html   |  15 +-
 .../fds_blog/plugins/latest_articles.html     |  13 +-
 .../fds_blog/plugins/simple_articles.html     |  13 +-
 .../fds_blog/plugins/slider_articles.html     |   9 +-
 .../fds_blog/templates/fds_blog/search.html   | 128 +++--
 .../fds_cms/templates/cms/base.html           |  94 ++--
 .../fds_cms/templates/cms/blog_base.html      |  15 +-
 .../fds_cms/templates/cms/breadcrumbs.html    |  16 +-
 .../fds_cms/templates/cms/help_base.html      | 127 ++---
 .../fds_cms/templates/cms/page.html           |   8 +-
 .../templates/cms/page_breadcrumb.html        |  23 +-
 .../templates/cms/page_headerless.html        |   2 -
 .../fds_cms/templates/cms/page_reduced.html   |   6 +-
 .../fds_cms/templates/cms/plugins/col.html    |   7 +-
 .../fds_cms/templates/cms/plugins/col_10.html |   1 -
 .../fds_cms/templates/cms/plugins/col_12.html |   1 -
 .../fds_cms/templates/cms/plugins/col_2.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_3.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_4.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_5.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_6.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_7.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_8.html  |   1 -
 .../fds_cms/templates/cms/plugins/col_9.html  |   1 -
 .../templates/cms/plugins/col_teaser.html     |   1 -
 .../templates/cms/plugins/container.html      |   7 +-
 .../cms/plugins/container_design.html         |  13 +-
 .../cms/plugins/container_fluid.html          |   7 +-
 .../templates/cms/plugins/container_grey.html |   9 +-
 .../templates/cms/plugins/continue_link.html  |   4 +-
 .../cms/plugins/dropdown_banner.html          |  17 +-
 .../templates/cms/plugins/page_submenu.html   |   3 +-
 .../cms/plugins/primarylink/_picture.html     |  58 +--
 .../cms/plugins/primarylink/campaign.html     |  74 +--
 .../cms/plugins/primarylink/default.html      |  21 +-
 .../cms/plugins/primarylink/featured.html     |  20 +-
 .../fds_cms/templates/cms/plugins/row.html    |   7 +-
 .../templates/cms/plugins/row_around.html     |   1 -
 .../templates/cms/plugins/row_between.html    |   1 -
 .../templates/cms/plugins/row_left.html       |   1 -
 .../templates/cms/plugins/row_narrow.html     |   1 -
 .../templates/cms/plugins/row_right.html      |   1 -
 .../templates/cms/plugins/submenu.html        |   4 +-
 .../templates/cms/plugins/submenu_child.html  |  10 +-
 .../fds_cms/templates/cms/pub_base.html       | 122 ++---
 .../fds_cms/templates/cms/scaffold.html       |  76 +--
 .../document_collection_embed.html            |   2 -
 .../document/cms_plugins/document_embed.html  |   1 -
 .../document/cms_plugins/document_pages.html  |  32 +-
 .../document/cms_plugins/page_annotation.html |  55 +-
 .../fds_cms/admin/static_placeholder.html     |  17 +-
 .../templates/fds_cms/bordered_section.html   |  18 +-
 .../fds_cms/templates/fds_cms/card/card.html  |  35 +-
 .../templates/fds_cms/card/card_header.html   |  23 +-
 .../templates/fds_cms/card/card_icon.html     |   4 +-
 .../templates/fds_cms/card/card_image.html    |  48 +-
 .../templates/fds_cms/card/card_inner.html    |   9 +-
 .../templates/fds_cms/card/card_link.html     |  11 +-
 .../templates/fds_cms/collapsible.html        |  16 +-
 .../fds_cms/templates/fds_cms/feedback.html   |  15 +-
 .../fds_cms/templates/fds_cms/modal.html      |  13 +-
 .../fds_cms/templates/fds_cms/reveal.html     |  28 +-
 .../fds_cms/templates/fds_cms/search.html     |  89 ++--
 .../templates/fds_cms/share_buttons.html      |  25 +-
 .../fds_cms/templates/fds_cms/slider.html     |  83 +--
 .../templates/fds_cms/social_meta.html        |  55 +-
 .../fds_cms/templates/fds_cms/svg_embed.html  |   2 +-
 .../fds_cms/templates/fds_cms/vega_chart.html |   8 +-
 .../foirequest/cms_plugins/list.html          |  14 +-
 .../foirequest/cms_plugins/list_follow.html   |  29 +-
 .../foirequest/cms_plugins/one_click.html     |   2 +-
 .../fds_donation/donation/change_list.html    |  85 +--
 .../admin/fds_donation/donor/change_form.html |  14 +-
 .../admin/fds_donation/donor/change_list.html |  25 +-
 .../admin/fds_donation/donor/export_jzwb.html |  48 +-
 .../fds_donation/donor/merge_donors.html      | 118 ++---
 .../templates/fds_donation/base.html          |   8 +-
 .../cms_plugins/donation_progress_bar.html    |  40 +-
 .../cms_plugins/donationgiftform.html         |  18 +-
 .../fds_donation/cms_plugins/donor_logic.html |   9 +-
 .../fds_donation/donation_complete.html       |  71 ++-
 .../fds_donation/donation_failed.html         |  22 +-
 .../templates/fds_donation/donation_form.html |  84 ++-
 .../templates/fds_donation/donor_detail.html  | 131 ++---
 .../templates/fds_donation/donor_form.html    |  40 +-
 .../fds_donation/forms/_donation_form.html    | 410 +++++++--------
 .../fds_donation/forms/donation.html          |  13 +-
 .../forms/widgets/amount_input.html           |  36 +-
 .../fds_donation/includes/banktransfer.html   |  64 +--
 .../includes/banktransfer_email.html          |  36 +-
 .../templates/fds_donation/pdf/zwb.html       | 265 +++++-----
 .../payment/status/banktransfer.html          |   4 +-
 .../subscription/banktransfer/detail.html     |  43 +-
 .../templates/fds_fximport/import_frag.html   |  79 +--
 .../emailtemplate/change_form.html            |  32 +-
 .../fds_mailing/mailing/change_form.html      |  53 +-
 .../fds_mailing/mailing/change_list.html      |  23 +-
 .../fds_mailing/mailing/send_mailing.html     |  51 +-
 .../mailingmessage/change_form.html           |  15 +-
 .../templates/email/default/action.html       |  65 ++-
 .../email/default/action_plugin.html          |  33 +-
 .../templates/email/default/base.html         | 171 ++++---
 .../templates/email/default/body.html         |  11 +-
 .../templates/email/default/header.html       |  17 +-
 .../templates/email/default/section.html      |  20 +-
 .../email/default/section_plugin.html         |   8 +-
 .../templates/email/default/story.html        |  33 +-
 .../templates/email/default/story_plugin.html |   8 +-
 .../templates/email/formal/base.html          |   8 +-
 .../templates/email/newsletter/base.html      |   3 +-
 .../fds_mailing/archive/mailing_detail.html   |  45 +-
 .../templates/fds_mailing/base.html           |   5 +-
 .../emailtemplate_update_form.html            | 105 ++--
 .../fds_mailing/plugins/archive.html          |  19 +-
 .../templates/fds_mailing/render_base.html    |  22 +-
 .../templates/fds_mailing/render_browser.html |   1 -
 .../newsletter/change_form.html               |  14 +-
 .../fds_newsletter/admin/import_csv.html      |  27 +-
 .../plugins/newsletter_form.html              |  51 +-
 .../plugins/newsletter_logic.html             |   7 +-
 .../plugins/smart_newsletter_form.html        |  63 ++-
 .../templates/fds_newsletter/subscribe.html   |  31 +-
 .../fds_newsletter/user_settings.html         |  30 +-
 .../templates/newsletter/message/message.html |  63 +--
 .../newsletter/message/subscribe.html         |  37 +-
 .../newsletter/message/unsubscribe.html       |  40 +-
 .../templates/newsletter/message/update.html  |  36 +-
 .../templates/fds_ogimage/base.html           |  35 +-
 .../templates/fds_ogimage/foirequest.html     | 127 +++--
 .../templates/fds_ogimage/govplan_plan.html   |  88 ++--
 .../fds_ogimage/govplan_section.html          |  23 +-
 .../templates/fds_ogimage/profile.html        | 136 +++--
 fragdenstaat_de/templates/_frontend.html      |   8 +-
 .../templates/account/admin_send_mail.html    |  58 ++-
 fragdenstaat_de/templates/account/login.html  |   3 +-
 .../templates/account/new_terms.html          |  43 +-
 .../templates/account/profile.html            |  18 +-
 .../templates/account/settings.html           |  37 +-
 fragdenstaat_de/templates/admin/base.html     |  10 +-
 .../admin/djangocms_icon/includes/assets.html |   3 +-
 fragdenstaat_de/templates/base.html           |  35 +-
 .../campaign/food/request_banner.html         |  49 +-
 .../djangocms_audio/default/audio_player.html |  13 +-
 .../djangocms_audio/default/file.html         |  95 ++--
 .../djangocms_audio/default/track.html        |   8 +-
 .../bootstrap5/grid_row.html                  |  14 +-
 .../djangocms_frontend/html_container.html    |   8 +-
 .../djangocms_picture/default/picture.html    | 127 ++---
 .../djangocms_picture/email/picture.html      |  36 +-
 .../djangocms_picture/hero/picture.html       |  19 +-
 .../djangocms_video/default/video_player.html |  17 +-
 fragdenstaat_de/templates/emails/footer.html  |   8 +-
 fragdenstaat_de/templates/error_base.html     |  23 +-
 .../fcdocs_annotation/annotate_document.html  | 117 ++---
 .../templates/filingcabinet/_fds_banner.html  |  29 +-
 .../filingcabinet/document_detail.html        |  57 +--
 .../filingcabinet/document_detail_embed.html  |   6 +-
 .../documentcollection_detail_embed.html      |   6 +-
 .../templates/flatpages/default.html          |   6 +-
 fragdenstaat_de/templates/flatpages/full.html |   6 +-
 .../templates/flatpages/full_blank.html       |   1 -
 .../templates/flatpages/full_nonav.html       |   7 +-
 .../templates/foirequest/body/body.html       | 112 ++--
 .../foirequest/body/correspondence.html       |  37 +-
 .../foirequest/body/message/message.html      | 131 ++---
 .../templates/foirequest/header/header.html   | 105 ++--
 .../templates/foirequest/header/info-box.html |   5 +-
 .../templates/foirequest/header/tabs.html     |  68 ++-
 .../templates/foirequest/sent.html            |  51 +-
 .../templates/foirequest/show.html            |  13 +-
 .../request_crowdfunding.html                 |   3 +-
 .../templates/froide_govplan/detail.html      |  14 +-
 .../templates/froide_govplan/section.html     |  12 +-
 .../templates/froide_payment/order/base.html  |   3 +-
 .../froide_payment/subscription/base.html     |   3 +-
 fragdenstaat_de/templates/header.html         | 483 +++++++++---------
 fragdenstaat_de/templates/header_minimal.html |  38 +-
 fragdenstaat_de/templates/header_reduced.html |   3 -
 fragdenstaat_de/templates/index.html          |  91 ++--
 .../legal_advice_builder/answer_form.html     | 130 ++---
 .../legal_advice_builder/form_wizard.html     | 381 +++++++-------
 .../includes/info_box.html                    | 118 ++---
 .../klageautomat_info.html                    |  73 ++-
 fragdenstaat_de/templates/menu/menu.html      |  23 +-
 .../includes/organization_item.html           |  42 +-
 .../organization/includes/user_card.html      |   3 +-
 .../organization/organization_detail.html     |  13 +-
 .../organization/organization_list.html       |  29 +-
 .../problem/message_toolbar_item.html         |  11 +-
 fragdenstaat_de/templates/snippets/meta.html  |  30 +-
 .../templates/snippets/tracking.html          |   8 +-
 213 files changed, 4106 insertions(+), 4616 deletions(-)

diff --git a/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html b/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html
index 6e75326e9..12d091bcb 100644
--- a/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html
+++ b/fragdenstaat_de/fds_blog/templates/admin/fds_blog/article/change_form.html
@@ -1,9 +1,7 @@
 {% extends "admin/change_form.html" %}
-
 {% load static %}
-
 {% block after_field_sets %}
     {{ block.super }}
     {{ adminform.model_admin.charcount_fields|json_script:"charcount-fields" }}
     <script src="{% static 'js/fds_blog/charcount.js' %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html
index 54bff5bad..59ace0c50 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/_article_detail.html
@@ -1,122 +1,105 @@
 {% load i18n cms_tags %}
 {% load markup %}
 {% load static %}
-
 {% block article_header %}
-<div class="blog-header-container">
-  <header class="blog-header">
-    <div class="row justify-content-center">
-      <div class="col-md-12 col-lg-10">
-
-        <h1 class="blog-header__title">
-          <span class="d-block fw-normal blog-header__meta mb-2">
-            {{ article.kicker }}
-          </span>
-          <span>{% render_model article "title" %}</span>
-        </h1>
-
-        {% if article.teaser %}
-          <div class="blog-lead">
-            {% render_model article "teaser" "" "" "safe" %}
-          </div>
-        {% endif %}
-
-        <div class="mt-3 mb-5 blog-header__meta">
-          <time datetime="{{ article.start_publication|date:'c' }}">
-            {{ article.start_publication|date:"DATE_FORMAT" }}
-          </time>
-          {% with authors=article.get_authors %}
-            {% if authors %}
-            <span> -
-              {% for author in authors %}
-                {% if author.get_absolute_url %}
-                  <a href="{{ author.get_absolute_url }}" rel="author">
-                {% endif %}
-                {{ author.get_full_name }}{% if author.get_absolute_url %}</a>{% endif %}{% if not forloop.last %},{% endif %}
-              {% endfor %}
-            </span>
-            {% endif %}
-          {% endwith %}
-        </div>
-
-        {% block article_header_image %}
-          {% if article.image %}
-            {% include "fds_blog/includes/blog_picture_detail.html" with picture=article.image columns="col-12 col-lg-10" loading="eager" %}
-          {% endif %}
-        {% endblock article_header_image %}
-
-      </div>
+    <div class="blog-header-container">
+        <header class="blog-header">
+            <div class="row justify-content-center">
+                <div class="col-md-12 col-lg-10">
+                    <h1 class="blog-header__title">
+                        <span class="d-block fw-normal blog-header__meta mb-2">{{ article.kicker }}</span>
+                        <span>{% render_model article "title" %}</span>
+                    </h1>
+                    {% if article.teaser %}
+                        <div class="blog-lead">{% render_model article "teaser" "" "" "safe" %}</div>
+                    {% endif %}
+                    <div class="mt-3 mb-5 blog-header__meta">
+                        <time datetime="{{ article.start_publication|date:'c' }}">
+                            {{ article.start_publication|date:"DATE_FORMAT" }}
+                        </time>
+                        {% with authors=article.get_authors %}
+                            {% if authors %}
+                                <span> -
+                                    {% for author in authors %}
+                                        {% if author.get_absolute_url %}<a href="{{ author.get_absolute_url }}" rel="author">{% endif %}
+                                            {{ author.get_full_name }}
+                                            {% if author.get_absolute_url %}</a>{% endif %}
+                                        {% if not forloop.last %},{% endif %}
+                                    {% endfor %}
+                                </span>
+                            {% endif %}
+                        {% endwith %}
+                    </div>
+                    {% block article_header_image %}
+                        {% if article.image %}
+                            {% include "fds_blog/includes/blog_picture_detail.html" with picture=article.image columns="col-12 col-lg-10" loading="eager" %}
+                        {% endif %}
+                    {% endblock article_header_image %}
+                </div>
+            </div>
+        </header>
     </div>
-  </header>
-</div>
 {% endblock article_header %}
-
 {% block article_updates %}
-{% if updated_articles %}
-  <div class="blog-content">
-    <p>
-      {% blocktranslate count counter=updated_articles|length %}
+    {% if updated_articles %}
+        <div class="blog-content">
+            <p>
+                {% blocktranslate count counter=updated_articles|length %}
         Updated article:
       {% plural %}
         Updated articles:
       {% endblocktranslate %}
-      {% for related_article in updated_articles %}
-        {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – <a href="{{ related_article.get_absolute_url }}">{{ related_article.title }}</a>{% if not forloop.last %},{% endif %}
-      {% endfor %}
-    </p>
-  </div>
-{% endif %}
+                {% for related_article in updated_articles %}
+                    {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – <a href="{{ related_article.get_absolute_url }}">{{ related_article.title }}</a>
+                    {% if not forloop.last %},{% endif %}
+                {% endfor %}
+            </p>
+        </div>
+    {% endif %}
 {% endblock %}
-
 {% block article_content %}
-  {% render_placeholder article.content_placeholder %}
+    {% render_placeholder article.content_placeholder %}
 {% endblock article_content %}
-
 {% block article_previous %}
-{% if previous_articles %}
-  <div class="blog-content">
-    <p>
-      {% blocktranslate count counter=previous_articles|length %}
+    {% if previous_articles %}
+        <div class="blog-content">
+            <p>
+                {% blocktranslate count counter=previous_articles|length %}
         Previous article:
       {% plural %}
         Previous articles:
       {% endblocktranslate %}
-      {% for related_article in previous_articles %}
-      {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – <a href="{{ related_article.get_absolute_url }}">{{ related_article.title }}</a>{% if not forloop.last %},{% endif %}
-      {% endfor %}
-    </p>
-  </div>
-{% endif %}
+                {% for related_article in previous_articles %}
+                    {{ related_article.publication_date|date:"SHORT_DATE_FORMAT" }} – <a href="{{ related_article.get_absolute_url }}">{{ related_article.title }}</a>
+                    {% if not forloop.last %},{% endif %}
+                {% endfor %}
+            </p>
+        </div>
+    {% endif %}
 {% endblock %}
-
 {% block article_ads %}
-{% static_placeholder "banner_ad" %}
+    {% static_placeholder "banner_ad" %}
 {% endblock article_ads %}
-
 {% block article_languages %}
-<div class="container">
-  <div class="row justify-content-center pt-5">
-    <div class="col-md-8">
-      {% with other_langs=article.other_languages %}
-        {% if other_langs %}
-          <p>
-            {% trans "This article is available in other languages." %}
-          </p>
-          <ul class="list-unstyled">
-            {% for lang_article in other_langs %}
-              <li>
-                {{ lang_article.language|language_name }}:
-                <a href="{{ lang_article.get_absolute_url }}">
-                  {{ lang_article.title }}
-                </a>
-              </li>
-            {% endfor %}
-          </ul>
-        {% endif %}
-      {% endwith %}
+    <div class="container">
+        <div class="row justify-content-center pt-5">
+            <div class="col-md-8">
+                {% with other_langs=article.other_languages %}
+                    {% if other_langs %}
+                        <p>{% trans "This article is available in other languages." %}</p>
+                        <ul class="list-unstyled">
+                            {% for lang_article in other_langs %}
+                                <li>
+                                    {{ lang_article.language|language_name }}:
+                                    <a href="{{ lang_article.get_absolute_url }}">{{ lang_article.title }}</a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    {% endif %}
+                {% endwith %}
+            </div>
+        </div>
     </div>
-  </div>
-</div>
 {% endblock article_languages %}
-
-{% block article_authors %}{% endblock article_authors %}
+{% block article_authors %}
+{% endblock article_authors %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html
index 330260731..0d29525e6 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/article_detail.html
@@ -3,63 +3,53 @@
 {% load markup %}
 {% load static %}
 {% load blog_tags %}
-
-{% block canonical_url %}<link rel="canonical" href="{{ meta.url }}"/>{% endblock canonical_url %}
+{% block canonical_url %}
+    <link rel="canonical" href="{{ meta.url }}" />
+{% endblock canonical_url %}
 {% block title %}{{ article.meta_title }}{% endblock %}
-
 {% block meta %}
-  {% include "snippets/meta.html" with description=article.teaser|striptags keywords=article.tag_list %}
-  {% include "fds_blog/includes/social_meta.html" with article=article %}
-  {% with other_langs=article.other_languages %}
-    {% for lang_article in other_langs %}
-      <link rel="alternate" hreflang="{{ lang_article.language }}" href="{{ lang_article.get_full_url }}"/>
-    {% endfor %}
-  {% endwith %}
+    {% include "snippets/meta.html" with description=article.teaser|striptags keywords=article.tag_list %}
+    {% include "fds_blog/includes/social_meta.html" with article=article %}
+    {% with other_langs=article.other_languages %}
+        {% for lang_article in other_langs %}
+            <link rel="alternate"
+                  hreflang="{{ lang_article.language }}"
+                  href="{{ lang_article.get_full_url }}" />
+        {% endfor %}
+    {% endwith %}
 {% endblock %}
-
-{% block content_blog %}{% spaceless %}
-<article id="post-{{ article.slug }} post-item post-detail">
-  
-  {% include article.content_template %}
-
-</article>
-{% endspaceless %}
-
-{% static_placeholder "blog_donation_banner" %}
-
-{% with next_read=article|get_next_read %}
-{% if next_read %}
-  <div class="container">
-    <div class="row justify-content-center py-5">
-      <div class="col-md-5">
-        {% if next_read.image_id %}
-          <a href="{{ next_read.get_absolute_url }}">{% include "fds_blog/includes/blog_picture.html" with picture=next_read.image columns="col-md-5" %}</a>
+{% block content_blog %}
+    {% spaceless %}
+        <article id="post-{{ article.slug }} post-item post-detail">{% include article.content_template %}</article>
+    {% endspaceless %}
+    {% static_placeholder "blog_donation_banner" %}
+    {% with next_read=article|get_next_read %}
+        {% if next_read %}
+            <div class="container">
+                <div class="row justify-content-center py-5">
+                    <div class="col-md-5">
+                        {% if next_read.image_id %}
+                            <a href="{{ next_read.get_absolute_url }}">
+                                {% include "fds_blog/includes/blog_picture.html" with picture=next_read.image columns="col-md-5" %}
+                            </a>
+                        {% endif %}
+                    </div>
+                    <div class="col-md-5 next-reads__text">
+                        <h3>
+                            <a href="{{ next_read.get_absolute_url }}">
+                                {% if next_read.kicker %}<span class="d-block fw-normal blog-header__meta">{{ next_read.kicker }}</span>{% endif %}
+                                {{ next_read.title }}
+                            </a>
+                        </h3>
+                        <p>{% render_model next_read "teaser" "" "" "safe" %}</p>
+                        <p>
+                            <div class="cl-effect-10">
+                                <a href="{{ next_read.get_absolute_url }}" data-hover="&rarr;">{% translate "Read article" %}</a>
+                            </div>
+                        </p>
+                    </div>
+                </div>
+            </div>
         {% endif %}
-      </div>
-      <div class="col-md-5 next-reads__text">
-        <h3>
-          <a href="{{ next_read.get_absolute_url }}">
-            {% if next_read.kicker %}
-              <span class="d-block fw-normal blog-header__meta">
-                {{ next_read.kicker }}
-              </span>
-            {% endif %}
-            {{ next_read.title }}
-          </a>
-        </h3>
-        <p>
-          {% render_model next_read "teaser" "" "" "safe" %}
-        </p>
-        <p>
-          <div class="cl-effect-10">
-            <a href="{{ next_read.get_absolute_url }}" data-hover="&rarr;">
-              {% translate "Read article" %}
-            </a>
-          </div>
-        </p>
-      </div>
-    </div>
-  </div>
-{% endif %}
-{% endwith %}
+    {% endwith %}
 {% endblock content_blog %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html b/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html
index be36bc5d2..718eb74ff 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/article_list.html
@@ -1,100 +1,106 @@
 {% extends "fds_blog/base.html" %}
-{% load i18n easy_thumbnails_tags cms_tags markup %}{% spaceless %}
-
-{% block canonical_url %}<link rel="canonical" href="{{ view.get_view_url }}"/>{% endblock canonical_url %}
-
-{% block title %}{% if author %}{{ author.get_full_name }} – {% elif archive_date %}{% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} – {% elif tagged_entries %}{{ tagged_entries|capfirst }} – {% elif category %}{{ category }} – {% endif %}{{ block.super }}{% endblock %}
-
-
-{% block content_blog %}
-<div class="container">
-  <section class="blog-list mt-3">
-
-    {% block blog_title %}
-    {% if author or archive_date or article_tag or category %}
-      <header class="blog-head">
-        <h2>
-          {% if archive_date %}{% trans "Archive" %} {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
-          {% elif article_tag %}{% trans "Tag" %} {{ article_tag.name }}
-          {% elif category %}{% trans "Category" %} {{ category }}{% endif %}
-        </h2>
-        {% if category and category.description %}<p>{{ category.description }}</p>{% endif %}
-      </header>
-
-      {% if author %}
-        <h4>{% trans "Articles by" %}:</h4>
-        <div class="bg-body-tertiary mb-3 p-3">
-          <div class="row justify-content-center align-items-center pb-4 pt-4">
-            <div class="col-6 col-sm-4 col-md-3 col-lg-2 d-block">
-              {% if author.profile_photo %}
-                <img class="img-circle" src="{{ author.profile_photo.url }}" alt="Bild des Autors" loading="lazy">
-              {% endif %}
-            </div>
-            <div class="col-12 col-sm-8 col-md-6 col-lg-5">
-              <h2 class="author-title">
-                  {{ author.get_full_name }}
-              </h2>
-              <div class="author-description">
-                {{ author.profile_text | markdown }}
-              </div>
-            </div>
-          </div>
-        </div>
-      {% endif %}
-
-    {% endif %}
+{% load i18n easy_thumbnails_tags cms_tags markup %}
+{% spaceless %}
+    {% block canonical_url %}
+        <link rel="canonical" href="{{ view.get_view_url }}" />
+    {% endblock canonical_url %}
+    {% block title %}
+        {% if author %}
+            {{ author.get_full_name }} –
+        {% elif archive_date %}
+            {% if month %}{{ archive_date|date:'F' }}{% endif %}
+            {{ year }} –
+        {% elif tagged_entries %}
+            {{ tagged_entries|capfirst }} –
+        {% elif category %}
+            {{ category }} –
+        {% endif %}
+        {{ block.super }}
     {% endblock %}
-
-    {% if featured %}
-      <div class="row">
-        <div class="col-lg-12">
-          <div class="blog-teaser-large">
-            <div class="blog-teaser-top">
-              {% if featured.image %}
-                <a href="{{ featured.get_absolute_url }}">
-                  {% include "fds_blog/includes/blog_picture.html" with picture=featured.image %}
-                </a>
-              {% endif %}
-              <div class="blog-teaser-text">
-                <h3>
-                  <a href="{{ featured.get_absolute_url }}">
-                    {% if featured.kicker %}
-                    <span class="d-block fw-normal blog-header__meta mb-2">
-                      {{ featured.kicker }}
-                    </span>
+    {% block content_blog %}
+        <div class="container">
+            <section class="blog-list mt-3">
+                {% block blog_title %}
+                    {% if author or archive_date or article_tag or category %}
+                        <header class="blog-head">
+                            <h2>
+                                {% if archive_date %}
+                                    {% trans "Archive" %}
+                                    {% if month %}{{ archive_date|date:'F' }}{% endif %}
+                                    {{ year }}
+                                {% elif article_tag %}
+                                    {% trans "Tag" %} {{ article_tag.name }}
+                                {% elif category %}
+                                    {% trans "Category" %} {{ category }}
+                                {% endif %}
+                            </h2>
+                            {% if category and category.description %}<p>{{ category.description }}</p>{% endif %}
+                        </header>
+                        {% if author %}
+                            <h4>{% trans "Articles by" %}:</h4>
+                            <div class="bg-body-tertiary mb-3 p-3">
+                                <div class="row justify-content-center align-items-center pb-4 pt-4">
+                                    <div class="col-6 col-sm-4 col-md-3 col-lg-2 d-block">
+                                        {% if author.profile_photo %}
+                                            <img class="img-circle"
+                                                 src="{{ author.profile_photo.url }}"
+                                                 alt="Bild des Autors"
+                                                 loading="lazy">
+                                        {% endif %}
+                                    </div>
+                                    <div class="col-12 col-sm-8 col-md-6 col-lg-5">
+                                        <h2 class="author-title">{{ author.get_full_name }}</h2>
+                                        <div class="author-description">{{ author.profile_text | markdown }}</div>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
                     {% endif %}
-                    {{ featured.title }}
-                  </a>
-                </h3>
-                <div class="blog-lead">
-                  {% render_model featured "teaser" "" "" "safe" %}
+                {% endblock %}
+                {% if featured %}
+                    <div class="row">
+                        <div class="col-lg-12">
+                            <div class="blog-teaser-large">
+                                <div class="blog-teaser-top">
+                                    {% if featured.image %}
+                                        <a href="{{ featured.get_absolute_url }}">
+                                            {% include "fds_blog/includes/blog_picture.html" with picture=featured.image %}
+                                        </a>
+                                    {% endif %}
+                                    <div class="blog-teaser-text">
+                                        <h3>
+                                            <a href="{{ featured.get_absolute_url }}">
+                                                {% if featured.kicker %}<span class="d-block fw-normal blog-header__meta mb-2">{{ featured.kicker }}</span>{% endif %}
+                                                {{ featured.title }}
+                                            </a>
+                                        </h3>
+                                        <div class="blog-lead">{% render_model featured "teaser" "" "" "safe" %}</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+                <div class="row">
+                    {% for article in article_list %}
+                        <div class="col-md-6 col-lg-4 mb-5">
+                            {% include "fds_blog/includes/blog_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+                        </div>
+                    {% empty %}
+                        <div class="col-md-4">
+                            <p class="blog-empty">{% trans "No article found." %}</p>
+                        </div>
+                    {% endfor %}
                 </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    {% endif %}
-
-    <div class="row">
-      {% for article in article_list %}
-        <div class="col-md-6 col-lg-4 mb-5">
-          {% include "fds_blog/includes/blog_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+                {% if author or archive_date or tagged_entries %}
+                    <p class="blog-back">
+                        <a href="{% url 'blog:article-latest' %}">{% trans "Back" %}</a>
+                    </p>
+                {% endif %}
+                {% if is_paginated %}
+                    {% include "pagination/pagination.html" with page_obj=page_obj %}
+                {% endif %}
+            </section>
         </div>
-      {% empty %}
-        <div class="col-md-4">
-          <p class="blog-empty">{% trans "No article found." %}</p>
-        </div>
-      {% endfor %}
-    </div>
-
-    {% if author or archive_date or tagged_entries %}
-      <p class="blog-back"><a href="{% url 'blog:article-latest' %}">{% trans "Back" %}</a></p>
-    {% endif %}
-    {% if is_paginated %}
-      {% include "pagination/pagination.html" with page_obj=page_obj %}
-    {% endif %}
-  </section>
-</div>
-{% endblock %}
+    {% endblock %}
 {% endspaceless %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/base.html b/fragdenstaat_de/fds_blog/templates/fds_blog/base.html
index b22133a8c..e27966c06 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/base.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/base.html
@@ -1,63 +1,71 @@
 {% extends CMS_TEMPLATE %}
-
 {% load i18n %}
 {% load cms_tags %}
-
 {% block navbar %}
-  {% include "fds_blog/header_blog.html" %}
+    {% include "fds_blog/header_blog.html" %}
 {% endblock %}
-
 {% block content %}
-  <div class="app app-blog">
-    <nav class="navbar navbar-expand-sm navbar-dark navbar-blog">
-      <div class="container">
-        <a class="navbar-brand" href="{% page_url 'blog' %}">{% trans "Freedom of Information investigations" %}</a>
-        <ul class="navbar-nav me-auto d-none d-sm-flex">
-          <li class="nav-item">
-            <a class="nav-link" href="{% url 'blog:article-latest-feed' %}" target="_blank" rel="noopener">
-              <span class="fa fa-rss" aria-hidden="true"></span>
-              <span class="visually-hidden">{% trans "RSS feed" %}</span>
-            </a>
-          </li>
-        </ul>
-        <div class="d-flex">
-          <ul class="navbar-nav ms-auto d-none d-sm-block">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="cat-navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                {% trans "Categories" %}
-              </a>
-              <div class="dropdown-menu" aria-labelledby="cat-navbarDropdown">
-                {% for cat in categories %}
-                  <a class="dropdown-item {% if cat == category %} active{% endif %}" href="{% url 'blog:article-category' category=cat.slug %}">
-                    {{ cat.title }}
-                  </a>
-                {% endfor %}
-              </div>
-            </li>
-          </ul>
-
-          <form class="ms-2 d-none d-md-inline" role="search" method="get" action="{% url 'blog:article-search' %}">
-            <div class="input-group d-flex d-md-none d-lg-flex">
-              {% if form %}
-                {{ form.q }}
-              {% else %}
-                <input class="form-control" type="text" name="q" placeholder="{% trans 'Search' %}" aria-label="{% trans 'Search' %}">
-              {% endif %}
-              <button class="btn btn-outline-light" type="submit">
-                <i class="fa fa-search" aria-hidden="true"></i>
-                <span class="visually-hidden">{% trans "Search" %}</span>
-              </button>
+    <div class="app app-blog">
+        <nav class="navbar navbar-expand-sm navbar-dark navbar-blog">
+            <div class="container">
+                <a class="navbar-brand" href="{% page_url 'blog' %}">{% trans "Freedom of Information investigations" %}</a>
+                <ul class="navbar-nav me-auto d-none d-sm-flex">
+                    <li class="nav-item">
+                        <a class="nav-link"
+                           href="{% url 'blog:article-latest-feed' %}"
+                           target="_blank"
+                           rel="noopener">
+                            <span class="fa fa-rss" aria-hidden="true"></span>
+                            <span class="visually-hidden">{% trans "RSS feed" %}</span>
+                        </a>
+                    </li>
+                </ul>
+                <div class="d-flex">
+                    <ul class="navbar-nav ms-auto d-none d-sm-block">
+                        <li class="nav-item dropdown">
+                            <a class="nav-link dropdown-toggle"
+                               href="#"
+                               id="cat-navbarDropdown"
+                               role="button"
+                               data-bs-toggle="dropdown"
+                               aria-haspopup="true"
+                               aria-expanded="false">{% trans "Categories" %}</a>
+                            <div class="dropdown-menu" aria-labelledby="cat-navbarDropdown">
+                                {% for cat in categories %}
+                                    <a class="dropdown-item {% if cat == category %}active{% endif %}"
+                                       href="{% url 'blog:article-category' category=cat.slug %}">{{ cat.title }}</a>
+                                {% endfor %}
+                            </div>
+                        </li>
+                    </ul>
+                    <form class="ms-2 d-none d-md-inline"
+                          role="search"
+                          method="get"
+                          action="{% url 'blog:article-search' %}">
+                        <div class="input-group d-flex d-md-none d-lg-flex">
+                            {% if form %}
+                                {{ form.q }}
+                            {% else %}
+                                <input class="form-control"
+                                       type="text"
+                                       name="q"
+                                       placeholder="{% trans 'Search' %}"
+                                       aria-label="{% trans 'Search' %}">
+                            {% endif %}
+                            <button class="btn btn-outline-light" type="submit">
+                                <i class="fa fa-search" aria-hidden="true"></i>
+                                <span class="visually-hidden">{% trans "Search" %}</span>
+                            </button>
+                        </div>
+                        <button class="btn btn-outline-light d-none d-md-block d-lg-none"
+                                type="submit">
+                            <i class="fa fa-search" aria-hidden="true"></i>
+                            <span class="visually-hidden">{% trans "Search" %}</span>
+                        </button>
+                    </form>
+                </div>
             </div>
-            <button class="btn btn-outline-light d-none d-md-block d-lg-none" type="submit">
-              <i class="fa fa-search" aria-hidden="true"></i>
-              <span class="visually-hidden">{% trans "Search" %}</span>
-            </button>
-          </form>
-        </div>
-      </div>
-    </nav>
-    
-    {% block content_blog %}{% endblock %}
-
-  </div>
+        </nav>
+        {% block content_blog %}{% endblock %}
+    </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html b/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html
index 4e6645b09..20baf788f 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/blog_preview.html
@@ -1,7 +1,7 @@
 <div class="row">
-  {% for article in articles %}
-    <div class="col-md-6 col-lg-4 mb-5">
-      {% include "fds_blog/includes/blog_item.html" with article=article image="true" %}
-    </div>
-  {% endfor %}
-</div>
\ No newline at end of file
+    {% for article in articles %}
+        <div class="col-md-6 col-lg-4 mb-5">
+            {% include "fds_blog/includes/blog_item.html" with article=article image="true" %}
+        </div>
+    {% endfor %}
+</div>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/content.html
index 77969e5f4..389eefdad 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/content.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/content.html
@@ -1,9 +1,7 @@
 {% load cms_tags %}
 {% block before_main %}{% endblock %}
 {% render_placeholder placeholder language lang %}
-
 {% for plugin in plugins %}
-  {% render_plugin plugin %}
+    {% render_plugin plugin %}
 {% endfor %}
-
 {% block after_main %}{% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html b/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html
index 7ba517b66..de0b91d9a 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/content/_article_no_image.html
@@ -1,3 +1,2 @@
 {% extends "fds_blog/_article_detail.html" %}
-
 {% block article_header_image %}{% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html b/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html
index de8c65858..0dbda3f5a 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/detailsbox.html
@@ -2,10 +2,9 @@
 {% load markup %}
 {% load static %}
 {% load blog_tags %}
-
 <details>
     <summary>
-        <strong>{{instance.title}}</strong>
+        <strong>{{ instance.title }}</strong>
     </summary>
-    {{instance.content|safe}}
+    {{ instance.content|safe }}
 </details>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html
index bf211eeef..897a3e518 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/full_content.html
@@ -1,57 +1,51 @@
 {% extends "fds_blog/content.html" %}
-
 {% load cms_tags %}
 {% load thumbnail markup i18n %}
-
 {% block before_main %}
-<header>
-  {% if object.teaser %}{{ object.teaser|safe }}{% endif %}
-
-  {% if object.image %}
-    <figure>
-      {# Use full domain URL because of use in feeds #}
-      <img src="{{ MEDIA_DOMAIN }}{% thumbnail object.image 768x500 crop subject_location=object.image.subject_location %}" alt="{{ object.image.alt }}" />
-      <figcaption>
-        {% if object.image.description %}
-          <p>{{ object.image.description }}</p>
+    <header>
+        {% if object.teaser %}{{ object.teaser|safe }}{% endif %}
+        {% if object.image %}
+            <figure>
+                {# Use full domain URL because of use in feeds #}
+                <img src="{{ MEDIA_DOMAIN }}{% thumbnail object.image 768x500 crop subject_location=object.image.subject_location %}"
+                     alt="{{ object.image.alt }}" />
+                <figcaption>
+                    {% if object.image.description %}<p>{{ object.image.description }}</p>{% endif %}
+                    {% if object.image.author %}
+                        {% trans "image credit: " as article_image_label %}
+                        {% if '](' in object.image.author %}
+                            {# likely contains markdown #}
+                            {{ article_image_label|add:object.image.author|markdown }}
+                        {% else %}
+                            <p>
+                                {{ article_image_label }}
+                                {{ object.image.author|safe }}
+                            </p>
+                        {% endif %}
+                    {% endif %}
+                </figcaption>
+            </figure>
         {% endif %}
-        {% if object.image.author %}
-          {% trans "image credit: " as article_image_label %}
-          {% if '](' in object.image.author %}
-            {# likely contains markdown #}
-            {{ article_image_label|add:object.image.author|markdown }}
-          {% else %}
-            <p>
-              {{ article_image_label }}
-              {{ object.image.author|safe }}
-            </p>
-          {% endif %}
-        {% endif %}
-      </figcaption>
-    </figure>
-  {% endif %}
-
-  {% if object.leadin %}{{ object.leadin|markdown }}{% endif %}
-
-</header>
+        {% if object.leadin %}{{ object.leadin|markdown }}{% endif %}
+    </header>
 {% endblock %}
-
 {% block after_main %}
-<footer>
-  {% with authors=object.get_authors %}
-    {% if authors %}
-      <i>
-        {% trans "by" %}
-        {% for author in authors %}
-          <span class="vcard">
-            {% if author.get_absolute_url %}
-            <a href="{{ author.get_absolute_url }}" rel="author">
+    <footer>
+        {% with authors=object.get_authors %}
+            {% if authors %}
+                <i>
+                    {% trans "by" %}
+                    {% for author in authors %}
+                        <span class="vcard">
+                            {% if author.get_absolute_url %}<a href="{{ author.get_absolute_url }}" rel="author">{% endif %}
+                                {{ author }}
+                                {% if author.get_absolute_url %}</a>{% endif %}
+                        </span>
+                        {% if not forloop.last %},{% endif %}
+                    {% endfor %}
+                </i>
             {% endif %}
-            {{ author }}{% if author.get_absolute_url %}</a>{% endif %}</span>{% if not forloop.last %},{% endif %}
-        {% endfor %}
-      </i>
-    {% endif %}
-  {% endwith %}
-</footer>
-{% static_placeholder "blog_feed_footer" %}
+        {% endwith %}
+    </footer>
+    {% static_placeholder "blog_feed_footer" %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html b/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html
index 89b98057a..aca726c87 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/header_blog.html
@@ -1,5 +1,5 @@
 {% extends "header.html" %}
-
 {% block nav_search_class %}d-block d-md-none{% endblock %}
-
-{% block nav_search_url %}{% url 'blog:article-search' %}{% endblock %}
+{% block nav_search_url %}
+    {% url 'blog:article-search' %}
+{% endblock %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html
index a90595188..2a1536e6c 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/_picture.html
@@ -1,20 +1,17 @@
 {% load fds_cms_tags %}
-
 <picture>
-  {% get_responsive_filer_image picture columns as respimg %}
-
-  {% for source in respimg.sources %}
-    <source
-      srcset="{{ source.srcset }}"
-      sizes="{{ respimg.sizes }}"
-      type="{{ source.mime_type }}"
-    />
-  {% endfor %}
-
-  <img class="img-fluid" loading="{{ loading|default:"lazy" }}"
-    src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}"
-    alt="{{ picture.default_alt_text|default:"" }}"
-    width="{{ picture.width|floatformat:"0u" }}"
-    height="{{ picture.height|floatformat:"0u" }}"
-  >
+    {% get_responsive_filer_image picture columns as respimg %}
+    {% for source in respimg.sources %}
+        <source srcset="{{ source.srcset }}"
+                sizes="{{ respimg.sizes }}"
+                type="{{ source.mime_type }}" />
+    {% endfor %}
+    <img class="img-fluid"
+         loading="{{ loading|default:"lazy" }}"
+         src="{{ respimg.src }}"
+         srcset="{{ respimg.srcset }}"
+         sizes="{{ respimg.sizes }}"
+         alt="{{ picture.default_alt_text|default:"" }}"
+         width="{{ picture.width|floatformat:"0u" }}"
+         height="{{ picture.height|floatformat:"0u" }}">
 </picture>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html
index 89b6a65bf..15e9e762d 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_feature_item.html
@@ -1,56 +1,33 @@
 {% load thumbnail %}
-
 <article class="w-100 mx-auto">
-  <div>
-    {% if article.image %}
-      <a href="{{ article.get_absolute_url }}">
-        {% with picture=article.image %}
-        <picture>
-          {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %}
-          <source
-            srcset="{{ thumb.url }}.avif"
-            type="image/avif"
-          />
-          <source
-            media="(min-width: 992px)"
-            srcset="{{ thumb.url }}"
-          />
-          {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %}
-          <source
-            media="(min-width: 768px)"
-            srcset="{{ thumb.url }}.avif"
-            type="image/avif"
-          />
-          <source
-            media="(min-width: 768px)"
-            srcset="{{ thumb.url }}"
-          />
-          {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %}
-          <source
-            srcset="{{ thumb.url }}.avif"
-            type="image/avif"
-          />
-          <img class="w-100 h-auto z-index-10" loading="lazy" width="320" height="185" src="{{ thumb.url }}"
-              {% if not attributes.alt %} alt="{{ picture.default_alt_text|default:'' }}"{% endif %}
-              {{ attributes_str }}>
-        </picture>
-        {% endwith %}
-      </a>
-    {% endif %}
-  </div>
-  <div class="text-bg-body border-gray shadow-gray z-index-20 position-relative mx-3 mt-n5 mt-lg-n6 p-3">
-    <h3 class="h4 mt-0 mb-1">
-      {% if article.kicker %}
-      <span class="d-block text-body-secondary fw-normal font-size-sm">
-        {{ article.kicker }}
-      </span>
-      {% endif %}
-      <a class="text-body" href="{{ article.get_absolute_url }}">
-        {{ article.title }}
-      </a>
-    </h3>
-    <div class="text-body-secondary fw-bold font-size-sm">
-      {{ article.start_publication|date:"DATE_FORMAT" }}
-    </div>
-  </div>
-</article>
+    <div>
+        {% if article.image %}
+            <a href="{{ article.get_absolute_url }}">
+                {% with picture=article.image %}
+                    <picture>
+                        {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %}
+                            <source srcset="{{ thumb.url }}.avif" type="image/avif" />
+                            <source media="(min-width: 992px)" srcset="{{ thumb.url }}" />
+                            {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %}
+                                <source media="(min-width: 768px)"
+                                        srcset="{{ thumb.url }}.avif"
+                                        type="image/avif" />
+                                <source media="(min-width: 768px)" srcset="{{ thumb.url }}" />
+                                {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %}
+                                    <source srcset="{{ thumb.url }}.avif" type="image/avif" />
+                                    <img class="w-100 h-auto z-index-10" loading="lazy" width="320" height="185" src="{{ thumb.url }}" {% if not attributes.alt %}alt="{{ picture.default_alt_text|default:'' }}"{% endif %} {{ attributes_str }}>
+                                </picture>
+                            {% endwith %}
+                        </a>
+                    {% endif %}
+                </div>
+                <div class="text-bg-body border-gray shadow-gray z-index-20 position-relative mx-3 mt-n5 mt-lg-n6 p-3">
+                    <h3 class="h4 mt-0 mb-1">
+                        {% if article.kicker %}
+                            <span class="d-block text-body-secondary fw-normal font-size-sm">{{ article.kicker }}</span>
+                        {% endif %}
+                        <a class="text-body" href="{{ article.get_absolute_url }}">{{ article.title }}</a>
+                    </h3>
+                    <div class="text-body-secondary fw-bold font-size-sm">{{ article.start_publication|date:"DATE_FORMAT" }}</div>
+                </div>
+            </article>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html
index 94060ba75..38e9cbcd2 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_item.html
@@ -1,31 +1,26 @@
 {% load i18n easy_thumbnails_tags cms_tags %}
-
 <article id="post-{{ article.slug }}" class="post-item">
-  {% if article.image_id %}
-     <a href="{{ article.get_absolute_url }}">{% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %}</a>
-  {% endif %}
-
-  <h4 class="blog-list-heading">
-    <a href="{{ article.get_absolute_url }}">
-      <span class="d-block fw-normal blog-list-heading__kicker">
-        {{ article.kicker }}
-      </span>
-      {{ article.title }}
-    </a>
-  </h4>
-
-  {% if article.teaser %}
-    <div class="blog-lead">
-      {% if not TRUNCWORDS_COUNT %}
-        {% render_model article "teaser" "" "" "safe" %}
-      {% else %}
-        {% render_model article "teaser" "" "" "truncatewords_html:TRUNCWORDS_COUNT|safe"  %}
-      {% endif %}
-      <div class="cl-effect-10">
-        <a href="{{ article.get_absolute_url }}" data-hover="&rarr;">
-          zum Artikel
+    {% if article.image_id %}
+        <a href="{{ article.get_absolute_url }}">
+            {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %}
         </a>
-      </div>
-    </div>
-  {% endif %}
+    {% endif %}
+    <h4 class="blog-list-heading">
+        <a href="{{ article.get_absolute_url }}">
+            <span class="d-block fw-normal blog-list-heading__kicker">{{ article.kicker }}</span>
+            {{ article.title }}
+        </a>
+    </h4>
+    {% if article.teaser %}
+        <div class="blog-lead">
+            {% if not TRUNCWORDS_COUNT %}
+                {% render_model article "teaser" "" "" "safe" %}
+            {% else %}
+                {% render_model article "teaser" "" "" "truncatewords_html:TRUNCWORDS_COUNT|safe" %}
+            {% endif %}
+            <div class="cl-effect-10">
+                <a href="{{ article.get_absolute_url }}" data-hover="&rarr;">zum Artikel</a>
+            </div>
+        </div>
+    {% endif %}
 </article>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html
index 02152302b..7b47889d3 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture.html
@@ -1,5 +1,4 @@
 {% load markup %}
-
 <figure class="blog-visual">
-  {% include "fds_blog/includes/_picture.html" with picture=picture columns=columns %}
+    {% include "fds_blog/includes/_picture.html" with picture=picture columns=columns %}
 </figure>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html
index bfaff72ad..1e7ac1d3a 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_detail.html
@@ -1,22 +1,15 @@
 {% load markup %}
-
 <figure class="blog-header__figure">
-
-  {% include "fds_blog/includes/_picture.html" with picture=picture columns="" loading=loading %}
-  
-  {% if picture.author or picture.description %}
-  <figcaption class="g-0 text-end">
-    {% if picture.description %}
-      <div class="picture-description">
-        {{ picture.description }}
-        {% if picture.author %} – {% endif %}
-      </div>
+    {% include "fds_blog/includes/_picture.html" with picture=picture columns="" loading=loading %}
+    {% if picture.author or picture.description %}
+        <figcaption class="g-0 text-end">
+            {% if picture.description %}
+                <div class="picture-description">
+                    {{ picture.description }}
+                    {% if picture.author %}–{% endif %}
+                </div>
+            {% endif %}
+            {% if picture.author %}<div class="picture-credits">{{ picture.author|markdown }}</div>{% endif %}
+        </figcaption>
     {% endif %}
-    {% if picture.author %}
-      <div class="picture-credits">
-        {{ picture.author|markdown }}
-      </div>
-    {% endif %}
-  </figcaption>
-{% endif %}
 </figure>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html
index 73eb32a1d..da552827a 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_picture_small.html
@@ -1,15 +1,9 @@
 {% load thumbnail %}
 {% load markup %}
-
 <figure class="blog-visual">
-  <picture>
-    {% thumbnail picture 540x0 crop=smart subject_location=picture.subject_location as thumb%}
-    <source
-      srcset="{{ thumb.url }}.avif"
-      type="image/avif"
-    />
-    <img class="img-fluid" loading="lazy" src="{{ thumb.url }}"
-      {% if not attributes.alt %} alt="{{ picture.default_alt_text|default:"" }}"{% endif %}
-      {{ attributes_str }}>
-  </picture>
-</figure>
+    <picture>
+        {% thumbnail picture 540x0 crop=smart subject_location=picture.subject_location as thumb %}
+            <source srcset="{{ thumb.url }}.avif" type="image/avif" />
+            <img class="img-fluid" loading="lazy" src="{{ thumb.url }}" {% if not attributes.alt %}alt="{{ picture.default_alt_text|default:"" }}"{% endif %} {{ attributes_str }}>
+        </picture>
+    </figure>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html
index aeca9ad1f..97905e407 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_short_item.html
@@ -1,18 +1,13 @@
 {% load i18n easy_thumbnails_tags cms_tags %}
-
 <article id="post-{{ article.slug }}" class="post-item mb-5">
-  <div class="blog-header__meta">
-    {{ article.start_publication|date:"DATE_FORMAT" }}
-  </div>
-  {% if article.image %}
-     <a href="{{ article.get_absolute_url }}">{% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %}</a>
-  {% endif %}
-  <h4 class="blog-list-heading">
-    <a href="{{ article.get_absolute_url }}">{{ article.title }}</a>
-  </h4>
-  {% if article.query_highlight %}
-    <div class="search-highlight">
-      {{ article.query_highlight }}
-    </div>
-  {% endif %}
+    <div class="blog-header__meta">{{ article.start_publication|date:"DATE_FORMAT" }}</div>
+    {% if article.image %}
+        <a href="{{ article.get_absolute_url }}">
+            {% include "fds_blog/includes/blog_picture_small.html" with picture=article.image %}
+        </a>
+    {% endif %}
+    <h4 class="blog-list-heading">
+        <a href="{{ article.get_absolute_url }}">{{ article.title }}</a>
+    </h4>
+    {% if article.query_highlight %}<div class="search-highlight">{{ article.query_highlight }}</div>{% endif %}
 </article>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html
index 09e6bb5ea..c1b7780bc 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/blog_simple_item.html
@@ -1,15 +1,9 @@
 <article class="d-flex flex-column w-100 p-3 text-bg-body border-gray">
-  <h3 class="h5 mt-0 mb-1">
-    {% if article.kicker %}
-    <span class="d-block text-body-secondary fw-normal font-size-sm">
-      {{ article.kicker }}
-    </span>
-    {% endif %}
-    <a class="text-body" href="{{ article.get_absolute_url }}">
-      {{ article.title }}
-    </a>
-  </h3>
-  <div class="text-body-secondary fw-bold font-size-sm mt-auto">
-    {{ article.start_publication|date:"DATE_FORMAT" }}
-  </div>
+    <h3 class="h5 mt-0 mb-1">
+        {% if article.kicker %}
+            <span class="d-block text-body-secondary fw-normal font-size-sm">{{ article.kicker }}</span>
+        {% endif %}
+        <a class="text-body" href="{{ article.get_absolute_url }}">{{ article.title }}</a>
+    </h3>
+    <div class="text-body-secondary fw-bold font-size-sm mt-auto">{{ article.start_publication|date:"DATE_FORMAT" }}</div>
 </article>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
index ced54c168..449b9a933 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/includes/social_meta.html
@@ -1,48 +1,36 @@
 {% load cms_tags %}
 {% load thumbnail %}
-
 {# Schema.org markup for Google+ #}
 <meta itemprop="name" content="{{ article.meta_title }}">
-{% if article.abstract %}
-    <meta itemprop="description" content="{{ article.abstract|striptags }}">
-{% endif %}
-
-
+{% if article.abstract %}<meta itemprop="description" content="{{ article.abstract|striptags }}">{% endif %}
 {# Twitter Card data #}
-
 <meta name="twitter:site" content="@fragdenstaat">
 <meta name="twitter:title" content="{{ article.meta_title }}">
-{% if article.teaser %}
-    <meta name="twitter:description" content="{{ article.teaser|striptags }}">
-{% endif %}
+{% if article.teaser %}<meta name="twitter:description" content="{{ article.teaser|striptags }}">{% endif %}
 <meta name="twitter:creator" content="@fragdenstaat">
-
 {% if article.image %}
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:image:src" content="{% thumbnail article.image 1120x600 crop subject_location=article.image.subject_location %}">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image:src"
+          content="{% thumbnail article.image 1120x600 crop subject_location=article.image.subject_location %}">
 {% else %}
-  <meta name="twitter:card" content="summary">
+    <meta name="twitter:card" content="summary">
 {% endif %}
-
-
-
 {# Open Graph data #}
 <meta property="og:title" content="{{ article.meta_title }}" />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="{{ SITE_URL }}{{ article.get_absolute_url }}" />
-
+<meta property="og:url"
+      content="{{ SITE_URL }}{{ article.get_absolute_url }}" />
 {% if article.image %}
-  <meta property="og:image" content="{% thumbnail article.image 1200x630 crop subject_location=article.image.subject_location %}" />
-{% endif %}
-
-{% if article.teaser %}
-  <meta property="og:description" content="{{ article.teaser|striptags }}" />
+    <meta property="og:image"
+          content="{% thumbnail article.image 1200x630 crop subject_location=article.image.subject_location %}" />
 {% endif %}
+{% if article.teaser %}<meta property="og:description" content="{{ article.teaser|striptags }}" />{% endif %}
 <meta property="og:site_name" content="{{ SITE_NAME }}" />
-
 {% if article.start_publication %}
-  <meta property="article:published_time" content="{{ article.start_publication.isoformat }}" />
+    <meta property="article:published_time"
+          content="{{ article.start_publication.isoformat }}" />
 {% endif %}
 {% if article.last_update %}
-  <meta property="article:modified_time" content="{{ article.last_update.isoformat }}" />
+    <meta property="article:modified_time"
+          content="{{ article.last_update.isoformat }}" />
 {% endif %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html b/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html
index e05850950..139b5d7c0 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/infotextbox.html
@@ -2,7 +2,4 @@
 {% load markup %}
 {% load static %}
 {% load blog_tags %}
-
-<div class="text-container infotextbox">
-    {{instance.content|safe}}
-</div>
+<div class="text-container infotextbox">{{ instance.content|safe }}</div>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html
index 7ea07150f..be7861db7 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/blog_content.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="blog-content">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html
index 11c3babef..2785b2d96 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/featured_articles.html
@@ -1,9 +1,8 @@
-{% load i18n %}{% spaceless %}
-{% for article in article_list %}
-  <div class="row">
-    <div class="col px-0">
-      {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %}
-    </div>
-  </div>
-{% endfor %}
+{% load i18n %}
+{% spaceless %}
+    {% for article in article_list %}
+        <div class="row">
+            <div class="col px-0">{% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %}</div>
+        </div>
+    {% endfor %}
 {% endspaceless %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html
index 592c17c36..8b7817586 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/latest_articles.html
@@ -1,7 +1,8 @@
-{% load i18n %}{% spaceless %}
-<div>
-    {% for article in article_list %}
-      {% include "fds_blog/includes/blog_short_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
-    {% endfor %}
-</div>
+{% load i18n %}
+{% spaceless %}
+    <div>
+        {% for article in article_list %}
+            {% include "fds_blog/includes/blog_short_item.html" with article=article image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+        {% endfor %}
+    </div>
 {% endspaceless %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html
index 62fa421d3..cb838332a 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/simple_articles.html
@@ -1,7 +1,8 @@
-{% load i18n %}{% spaceless %}
-  {% for article in article_list %}
-    <div class="d-flex {% if not forloop.last %}mb-3{% endif %}">
-      {% include "fds_blog/includes/blog_simple_item.html" with article=article image="true" %}
-    </div>
-  {% endfor %}
+{% load i18n %}
+{% spaceless %}
+    {% for article in article_list %}
+        <div class="d-flex {% if not forloop.last %}mb-3{% endif %}">
+            {% include "fds_blog/includes/blog_simple_item.html" with article=article image="true" %}
+        </div>
+    {% endfor %}
 {% endspaceless %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html
index 2c4341b1b..c2103605c 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/plugins/slider_articles.html
@@ -1,5 +1,6 @@
-{% load i18n %}{% spaceless %}
-  {% for article in article_list %}
-    {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %}
-  {% endfor %}
+{% load i18n %}
+{% spaceless %}
+    {% for article in article_list %}
+        {% include "fds_blog/includes/blog_feature_item.html" with article=article image="true" %}
+    {% endfor %}
 {% endspaceless %}
diff --git a/fragdenstaat_de/fds_blog/templates/fds_blog/search.html b/fragdenstaat_de/fds_blog/templates/fds_blog/search.html
index 964ff61ab..3fd009262 100644
--- a/fragdenstaat_de/fds_blog/templates/fds_blog/search.html
+++ b/fragdenstaat_de/fds_blog/templates/fds_blog/search.html
@@ -1,77 +1,63 @@
 {% extends "fds_blog/base.html" %}
-
 {% load i18n %}
-
-{% block title %}{% translate "Search articles" %}{% endblock %}
-
+{% block title %}
+    {% translate "Search articles" %}
+{% endblock %}
 {% block content_blog %}
-
-<div class="container mt-3">
-  <div class="row justify-content-center">
-    <div class="col-md-12">
-      <h2>
-        {% translate "Search articles" %}
-      </h2>
-      <form class="mb-3" role="search" method="get" action=".">
-        <div class="input-group mb-3">
-          {% if form %}
-            {{ form.q }}
-          {% else %}
-            <input class="form-control" type="text" name="q" placeholder="{% translate 'Search' %}" aria-label="{% translate 'Search' %}">
-          {% endif %}
-          <button class="btn btn-outline-primary" type="submit">
-            <i class="fa fa-search" aria-hidden="true"></i>
-            {% translate "Search" %}
-          </button>
-        </div>
-        {{ form.category }}
-      </form>
-
-      {% if object_list and form.q.value %}
-        <p>
-          {% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}
-        </p>
-        {% for object in object_list %}
-          <div class="row">
-            {% if object.image %}      
-              <div class="col-sm-4">
-                <a href="{{ object.get_absolute_url }}">
-                  {% include "fds_blog/includes/blog_picture_small.html" with picture=object.image columns="col-sm-4" %}
-                </a>
-              </div>
-            {% endif %}
-            <div class="col-sm-8">
-              <h5 class="mt-0 mb-1">
-                <span class="d-block text-body-secondary font-weight-bold font-size-sm">
-                  <time datetime="{{ object.start_publication|date:'c' }}">
-                    {{ object.start_publication|date:"SHORT_DATE_FORMAT" }}
-                  </time>
-                  {% if object.kicker %} &ndash; {% endif %}
-                  {{ object.kicker }}
-                </span>
-                <a href="{{ object.get_absolute_url }}">
-                  {{ object.title }}
-                </a>
-                
-              </h5>
-              {% if object.query_highlight %}
-                <p class="search-highlight">
-                  {{ object.query_highlight }}
-                </p>
-              {% endif %}
+    <div class="container mt-3">
+        <div class="row justify-content-center">
+            <div class="col-md-12">
+                <h2>{% translate "Search articles" %}</h2>
+                <form class="mb-3" role="search" method="get" action=".">
+                    <div class="input-group mb-3">
+                        {% if form %}
+                            {{ form.q }}
+                        {% else %}
+                            <input class="form-control"
+                                   type="text"
+                                   name="q"
+                                   placeholder="{% translate 'Search' %}"
+                                   aria-label="{% translate 'Search' %}">
+                        {% endif %}
+                        <button class="btn btn-outline-primary" type="submit">
+                            <i class="fa fa-search" aria-hidden="true"></i>
+                            {% translate "Search" %}
+                        </button>
+                    </div>
+                    {{ form.category }}
+                </form>
+                {% if object_list and form.q.value %}
+                    <p>{% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}</p>
+                    {% for object in object_list %}
+                        <div class="row">
+                            {% if object.image %}
+                                <div class="col-sm-4">
+                                    <a href="{{ object.get_absolute_url }}">
+                                        {% include "fds_blog/includes/blog_picture_small.html" with picture=object.image columns="col-sm-4" %}
+                                    </a>
+                                </div>
+                            {% endif %}
+                            <div class="col-sm-8">
+                                <h5 class="mt-0 mb-1">
+                                    <span class="d-block text-body-secondary font-weight-bold font-size-sm">
+                                        <time datetime="{{ object.start_publication|date:'c' }}">
+                                            {{ object.start_publication|date:"SHORT_DATE_FORMAT" }}
+                                        </time>
+                                        {% if object.kicker %}&ndash;{% endif %}
+                                        {{ object.kicker }}
+                                    </span>
+                                    <a href="{{ object.get_absolute_url }}">{{ object.title }}</a>
+                                </h5>
+                                {% if object.query_highlight %}<p class="search-highlight">{{ object.query_highlight }}</p>{% endif %}
+                            </div>
+                        </div>
+                    {% endfor %}
+                {% elif form.q.value %}
+                    <p>{% translate "No results found." %}</p>
+                {% else %}
+                    <p>{% translate "Please enter a search term." %}</p>
+                {% endif %}
             </div>
-          </div>
-        {% endfor %}
-      {% elif form.q.value %}
-      <p>
-        {% translate "No results found." %}
-      </p>
-      {% else %}
-      <p>
-        {% translate "Please enter a search term." %}
-      </p>
-      {% endif %}
+        </div>
     </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/base.html b/fragdenstaat_de/fds_cms/templates/cms/base.html
index 58f00a521..9afc6c541 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/base.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/base.html
@@ -1,66 +1,52 @@
 {% extends "cms/scaffold.html" %}
-
 {% load cms_tags %}
 {% load static %}
 {% load sekizai_tags %}
 {% load frontendbuild %}
-
-{% block body_extra_attributes %} data-staticurl="{{ STATIC_URL }}"{% if request.user.is_staff %} data-sentry="{{ SENTRY_JS_URL}}"{% endif %}{% endblock %}
-
+{% block body_extra_attributes %}
+    data-staticurl="{{ STATIC_URL }}"
+    {% if request.user.is_staff %}data-sentry="{{ SENTRY_JS_URL }}"{% endif %}
+{% endblock %}
 {% block body_tag %}
-  {% if request.user.is_authenticated and request.session.impostor %}
-    {% include "account/includes/impostor.html" %}
-  {% endif %}
-
-  {% block top_block %}
-    <div class="top-banner" style="display: none;">
-      {% static_placeholder "top_banner" %}
-    </div>
-  {% endblock %}
-
-  {% block navbar %}
-    {% include "header.html" %}
-  {% endblock %}
-
-  {% block body_wrapper %}
-  <main class="main">
-
-    {% block messages %}
-      {% include "snippets/messages.html" %}
-    {% endblock messages %}
-
-    {% block body %}
-      <div class="container">
-        {% block app_body %}
-          {% placeholder "content" %}
-        {% endblock %}
-      </div>
+    {% if request.user.is_authenticated and request.session.impostor %}
+        {% include "account/includes/impostor.html" %}
+    {% endif %}
+    {% block top_block %}
+        <div class="top-banner" style="display: none;">{% static_placeholder "top_banner" %}</div>
+    {% endblock %}
+    {% block navbar %}
+        {% include "header.html" %}
+    {% endblock %}
+    {% block body_wrapper %}
+        <main class="main">
+            {% block messages %}
+                {% include "snippets/messages.html" %}
+            {% endblock messages %}
+            {% block body %}
+                <div class="container">
+                    {% block app_body %}
+                        {% placeholder "content" %}
+                    {% endblock %}
+                </div>
+            {% endblock %}
+        </main>
+    {% endblock %}
+    {% block footer_container %}
+        <footer class="footer" id="footer">
+            <div class="container">{% static_placeholder "footer" %}</div>
+        </footer>
     {% endblock %}
-  </main>
-  {% endblock %}
-
-  {% block footer_container %}
-    <footer class="footer" id="footer">
-      <div class="container">
-        {% static_placeholder "footer" %}
-      </div>
-    </footer>
-  {% endblock %}
-
 {% endblock body_tag %}
-
 {% block scripts %}
-  {% renderfrontendhmr %}
-  {% include "_frontend.html" with entry_point="main.js" %}
-
-  {% if cms_toolbar.edit_mode_active %}
-    {% include "_frontend.html" with entry_point="fds_cms.js" %}
-  {% endif %}
-
-  {{ block.super }}
+    {% renderfrontendhmr %}
+    {% include "_frontend.html" with entry_point="main.js" %}
+    {% if cms_toolbar.edit_mode_active %}
+        {% include "_frontend.html" with entry_point="fds_cms.js" %}
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
-
 {% block below_scripts %}
-  {% block tracking_code %}{% include "snippets/tracking.html" %}{% endblock %}
+    {% block tracking_code %}
+        {% include "snippets/tracking.html" %}
+    {% endblock %}
 {% endblock %}
-
diff --git a/fragdenstaat_de/fds_cms/templates/cms/blog_base.html b/fragdenstaat_de/fds_cms/templates/cms/blog_base.html
index f36073f93..78982acaa 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/blog_base.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/blog_base.html
@@ -1,12 +1,13 @@
 {% extends "cms/page_reduced.html" %}
-
 {% block extra_head %}
-  {{ block.super }}
-  <link rel="alternate" type="application/rss+xml" title="{{ SITE_NAME }} Blog" href="{% url 'blog:article-latest-feed' %}" />
+    {{ block.super }}
+    <link rel="alternate"
+          type="application/rss+xml"
+          title="{{ SITE_NAME }} Blog"
+          href="{% url 'blog:article-latest-feed' %}" />
 {% endblock %}
-
 {% block body %}
-  {% block app_body %}
-    {% block content %}{% endblock %}
-  {% endblock %}
+    {% block app_body %}
+        {% block content %}{% endblock %}
+    {% endblock %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html b/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html
index 5544f2e5d..7fe861c25 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html
@@ -1,9 +1,9 @@
 {% for ance in ancestors %}
-<li {% if forloop.last %}class="breadcrumb-item active" aria-current="page"{% else %}class="breadcrumb-item"{% endif %}>
-  {% if not forloop.last %}
-    <a href="{{ ance.get_absolute_url }}">{{ ance.get_menu_title }}</a>
-	{% else %}
-    {{ ance.get_menu_title }}
-	{% endif %}
-</li>
-{% endfor %}
\ No newline at end of file
+    <li {% if forloop.last %}class="breadcrumb-item active" aria-current="page"{% else %}class="breadcrumb-item"{% endif %}>
+        {% if not forloop.last %}
+            <a href="{{ ance.get_absolute_url }}">{{ ance.get_menu_title }}</a>
+        {% else %}
+            {{ ance.get_menu_title }}
+        {% endif %}
+    </li>
+{% endfor %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/help_base.html b/fragdenstaat_de/fds_cms/templates/cms/help_base.html
index ea5eaf048..d6c03a010 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/help_base.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/help_base.html
@@ -1,72 +1,73 @@
 {% extends "cms/page.html" %}
-
 {% load i18n %}
 {% load cms_tags %}
 {% load menu_tags %}
-
 {% block body %}
-  {% page_url 'help' as help_url %}
-  <div class="app">
-    <nav class="navbar navbar-expand-sm navbar-dark navbar-help">
-      <div class="container">
-        <a class="navbar-brand" href="{{ help_url }}">
-          <span class="d-none d-lg-inline">{% translate 'Support area: FragDenStaat and Freedom of Information' %}</span>
-          <span class="d-none d-lg-none d-sm-inline">{% translate 'Support area: FragDenStaat and <abbr title="Freedom of Information">FOI</abbr>' %}</span>
-          <span class="d-sm-none">{% translate "Support area" %}</span>
-        </a>
-        <div class="d-flex">
-          <form class="ms-2 d-block d-md-inline" role="search" method="get" action="{% page_url 'help-search' %}">
-            <div class="input-group d-none d-md-flex">
-              {% if form %}
-                {{ form.q }}
-              {% else %}
-                <input class="form-control" type="text" name="q" placeholder="{% translate 'Search' %}" aria-label="{% translate 'Search' %}">
-              {% endif %}
-              <button class="btn btn-outline-light" type="submit">
-                <i class="fa fa-search" aria-hidden="true"></i>
-                <span class="visually-hidden">{% translate "Search" %}</span>
-            </button>
+    {% page_url 'help' as help_url %}
+    <div class="app">
+        <nav class="navbar navbar-expand-sm navbar-dark navbar-help">
+            <div class="container">
+                <a class="navbar-brand" href="{{ help_url }}">
+                    <span class="d-none d-lg-inline">{% translate 'Support area: FragDenStaat and Freedom of Information' %}</span>
+                    <span class="d-none d-lg-none d-sm-inline">{% translate 'Support area: FragDenStaat and <abbr title="Freedom of Information">FOI</abbr>' %}</span>
+                    <span class="d-sm-none">{% translate "Support area" %}</span>
+                </a>
+                <div class="d-flex">
+                    <form class="ms-2 d-block d-md-inline"
+                          role="search"
+                          method="get"
+                          action="{% page_url 'help-search' %}">
+                        <div class="input-group d-none d-md-flex">
+                            {% if form %}
+                                {{ form.q }}
+                            {% else %}
+                                <input class="form-control"
+                                       type="text"
+                                       name="q"
+                                       placeholder="{% translate 'Search' %}"
+                                       aria-label="{% translate 'Search' %}">
+                            {% endif %}
+                            <button class="btn btn-outline-light" type="submit">
+                                <i class="fa fa-search" aria-hidden="true"></i>
+                                <span class="visually-hidden">{% translate "Search" %}</span>
+                            </button>
+                        </div>
+                        <button class="btn btn-outline-light d-block d-md-none" type="submit">
+                            <i class="fa fa-search" aria-hidden="true"></i>
+                            <span class="visually-hidden">{% translate "Search" %}</span>
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </nav>
+        <nav aria-label="breadcrumb" class="bg-body-tertiary">
+            <div class="container">
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item">
+                        <a href="{{ help_url }}">{% translate "Support" %}</a>
+                    </li>
+                    {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
+                    {% block extra_breadcrumbs %}{% endblock %}
+                </ol>
             </div>
-            <button class="btn btn-outline-light d-block d-md-none" type="submit">
-              <i class="fa fa-search" aria-hidden="true"></i>
-              <span class="visually-hidden">{% translate "Search" %}</span>
-            </button>
-          </form>
-        </div>
-      </div>
-    </nav>
-    <nav aria-label="breadcrumb" class="bg-body-tertiary">
-      <div class="container">
-        <ol class="breadcrumb">
-          <li class="breadcrumb-item">
-            <a href="{{ help_url }}">{% translate "Support" %}</a>
-          </li>
-          {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
-          {% block extra_breadcrumbs %}{% endblock %}
-        </ol>
-      </div>
-    </nav>
-    <div class="container">
-      <div class="row">
-        <div class="col-md-8 order-md-last mt-3 mb-3">
-          {% block app_body %}
-            {% placeholder "content" %}
-          {% endblock %}
-        </div>
-        <nav class="col-md-4 order-md-first mb-3 mt-3">
-          <h5>
-            <a href="{{ help_url }}">
-              {% translate "Topics" %}
-            </a>
-          </h5>
-          <ul class="list-unstyled">
-            {% show_menu 1 100 0 1 %}
-          </ul>
         </nav>
-      </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-8 order-md-last mt-3 mb-3">
+                    {% block app_body %}
+                        {% placeholder "content" %}
+                    {% endblock %}
+                </div>
+                <nav class="col-md-4 order-md-first mb-3 mt-3">
+                    <h5>
+                        <a href="{{ help_url }}">{% translate "Topics" %}</a>
+                    </h5>
+                    <ul class="list-unstyled">
+                        {% show_menu 1 100 0 1 %}
+                    </ul>
+                </nav>
+            </div>
+        </div>
+        {% static_placeholder "help_footer" %}
     </div>
-
-    {% static_placeholder "help_footer" %}
-
-  </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page.html b/fragdenstaat_de/fds_cms/templates/cms/page.html
index a49705e01..ccdb7f90e 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/page.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/page.html
@@ -1,9 +1,7 @@
 {% extends "cms/base.html" %}
-
 {% load cms_tags %}
-
 {% block body %}
-  {% block app_body %}
-    {% placeholder "content" %}
-  {% endblock %}
+    {% block app_body %}
+        {% placeholder "content" %}
+    {% endblock %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html b/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html
index e6bc328ab..786285790 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/page_breadcrumb.html
@@ -1,18 +1,15 @@
 {% extends "cms/page.html" %}
-
 {% load cms_tags %}
 {% load menu_tags %}
-
 {% block body %}
-  <nav class="bg-body-tertiary" aria-label="breadcrumb">
-    <div class="container">
-      <ol class="breadcrumb">
-        {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
-      </ol>
-    </div>
-  </nav>
-
-  {% block app_body %}
-    {% placeholder "content" %}
-  {% endblock %}
+    <nav class="bg-body-tertiary" aria-label="breadcrumb">
+        <div class="container">
+            <ol class="breadcrumb">
+                {% show_breadcrumb 1 "cms/breadcrumbs.html" %}
+            </ol>
+        </div>
+    </nav>
+    {% block app_body %}
+        {% placeholder "content" %}
+    {% endblock %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html b/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html
index ee61ee96e..7ef73ec2f 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/page_headerless.html
@@ -1,5 +1,3 @@
 {% extends "cms/page.html" %}
-
 {% load cms_tags %}
-
 {% block navbar %}{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html b/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html
index 8d32b8d6b..f81c81b41 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/page_reduced.html
@@ -1,7 +1,5 @@
 {% extends "cms/page.html" %}
-
 {% load cms_tags %}
-
 {% block navbar %}
-  {% include "header_reduced.html" %}
-{% endblock %}
\ No newline at end of file
+    {% include "header_reduced.html" %}
+{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html
index 5fa03bf88..e1168a11a 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="{% block colclass %}col-md-{% block colcount %}1{% endblock %}{% endblock %} pt-4 pt-md-0">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html
index e83664112..1cc3865d5 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_10.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}10{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html
index 88ab76b9d..e4a8655d5 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_12.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}12{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html
index 0b96dffe9..9347d9969 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_2.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}2{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html
index 52ac27313..90cdbd433 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_3.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}3{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html
index 586f72dc3..be80292be 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_4.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}4{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html
index fb6a2e516..5eacee524 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_5.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}5{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html
index 7b2c6d79d..f7eca27e5 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_6.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}6{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html
index 1f6768f21..e087d4557 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_7.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}7{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html
index a91dd81a4..49363c802 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_8.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}8{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html
index f64769180..f63c3d014 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_9.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colcount %}9{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html
index 0a5cb1333..068509c72 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/col_teaser.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/col.html" %}
-
 {% block colclass %}col-xs-12 col-md-6 col-lg-4{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html
index b18652b14..88ba6ccef 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="container">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html
index e77051d66..3d1884863 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_design.html
@@ -1,13 +1,12 @@
 {% load cms_tags %}
-
 <div class="{% if object.has_backdrop %}position-relative{% else %}text-bg-{{ object.background }}{% endif %}{% if "body" in object.background %} text-body{% endif %} {% block extraclass %}{{ object.extra_classes }}{% endblock %}{% if object.padding %} p-3{% endif %}">
     {% if object.has_backdrop %}
-        <div class="text-bg-{{ object.background }} h-{{object.backdrop}} position-absolute top-0 bottom-0 start-0 end-0"></div>
+        <div class="text-bg-{{ object.background }} h-{{ object.backdrop }} position-absolute top-0 bottom-0 start-0 end-0">
+        </div>
     {% endif %}
-
     {% if object.container %}<div class="container">{% endif %}
-    {% for plugin in instance.child_plugin_instances %}
-        {% render_plugin plugin %}
-    {% endfor %}
-    {% if object.container %}</div>{% endif %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+        {% if object.container %}</div>{% endif %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html
index 4968d2b60..41437b84b 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_fluid.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="container-fluid">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html
index 4c8acd777..265002d73 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/container_grey.html
@@ -1,9 +1,8 @@
 {% load cms_tags %}
-
 <div class="container-wrapper bg-gray-200">
     <div class="container">
-    {% for plugin in instance.child_plugin_instances %}
-        {% render_plugin plugin %}
-    {% endfor %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html
index 3b4510468..a8cf44373 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/continue_link.html
@@ -1,5 +1,3 @@
 <p>
-  <a href="{{ next_url }}" class="btn btn-secondary">
-    {{ title }}
-  </a>
+    <a href="{{ next_url }}" class="btn btn-secondary">{{ title }}</a>
 </p>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html
index ea331ce33..0289bab26 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/dropdown_banner.html
@@ -1,12 +1,11 @@
 {% load cms_tags %}
-
 {% load i18n %}
-
-<div class="position-relative"{% if instance.animation %} data-slide{% endif %}>
-  <button type="button" class="close banner-close btn-close position-absolute top-0 end-0 me-3 mt-3{% if instance.dark %} btn-close-white{% endif %}" aria-label="{% trans 'Close' %}">
-  </button>
-  
-  {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-  {% endfor %}
+<div class="position-relative"
+     {% if instance.animation %}data-slide{% endif %}>
+    <button type="button"
+            class="close banner-close btn-close position-absolute top-0 end-0 me-3 mt-3{% if instance.dark %} btn-close-white{% endif %}"
+            aria-label="{% trans 'Close' %}"></button>
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html
index 2e7db7504..6935110e3 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/page_submenu.html
@@ -1,5 +1,4 @@
 {% load menu_tags %}
-
 <ul class="mb-3 mt-2 list-unstyled">
-  {% show_sub_menu 1 %}
+    {% show_sub_menu 1 %}
 </ul>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html
index accc3d5cb..189214eb8 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/_picture.html
@@ -1,39 +1,23 @@
 {% load thumbnail %}
-
 {% if object.image %}
-  {% if object.link %}<a href="{{ object.link }}">{% endif %}
-    {% with picture=object.image %}
-      {# TODO: duplicate of blog_feature_item  #}
-      <picture>
-        {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %}
-        <source
-          media="(min-width: 992px)"
-          srcset="{{ thumb.url }}.avif"
-          type="image/avif"
-        />
-        <source
-          media="(min-width: 992px)"
-          srcset="{{ thumb.url }}"
-        />
-        {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %}
-        <source
-          media="(min-width: 768px)"
-          srcset="{{ thumb.url }}.avif"
-          type="image/avif"
-        />
-        <source
-          media="(min-width: 768px)"
-          srcset="{{ thumb.url }}"
-        />
-        {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %}
-        <source
-          srcset="{{ thumb.url }}.avif"
-          type="image/avif"
-        />
-        <img class="w-100 h-auto {{ extra_classes }}" loading="lazy" width="320" height="185" src="{{ thumb.url }}"
-            {% if not attributes.alt %} alt="{{ picture.default_alt_text|default:"" }}"{% endif %}
-            {{ attributes_str }}>
-      </picture>
-    {% endwith %}
-  {% if object.link %}</a>{% endif %}
-{% endif %}
+    {% if object.link %}<a href="{{ object.link }}">{% endif %}
+        {% with picture=object.image %}
+            {# TODO: duplicate of blog_feature_item  #}
+            <picture>
+                {% thumbnail picture 640x370 crop subject_location=picture.subject_location as thumb %}
+                    <source media="(min-width: 992px)"
+                            srcset="{{ thumb.url }}.avif"
+                            type="image/avif" />
+                    <source media="(min-width: 992px)" srcset="{{ thumb.url }}" />
+                    {% thumbnail picture 480x277 crop subject_location=picture.subject_location as thumb %}
+                        <source media="(min-width: 768px)"
+                                srcset="{{ thumb.url }}.avif"
+                                type="image/avif" />
+                        <source media="(min-width: 768px)" srcset="{{ thumb.url }}" />
+                        {% thumbnail picture 320x185 crop subject_location=picture.subject_location as thumb %}
+                            <source srcset="{{ thumb.url }}.avif" type="image/avif" />
+                            <img class="w-100 h-auto {{ extra_classes }}" loading="lazy" width="320" height="185" src="{{ thumb.url }}" {% if not attributes.alt %}alt="{{ picture.default_alt_text|default:"" }}"{% endif %} {{ attributes_str }}>
+                        </picture>
+                    {% endwith %}
+                    {% if object.link %}</a>{% endif %}
+            {% endif %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html
index 55253a72d..f4f0e0b7e 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/campaign.html
@@ -2,42 +2,44 @@
 {% load fds_cms_tags %}
 {% load static %}
 {% load markup %}
-
 <div class="slider-card text-bg-body md:shadow-yellow border-yellow d-flex flex-column p-4 mx-auto">
-  {% if "campaign-card__done" in object.extra_classes %}
-    <img src="{% static 'img/campaign-check.svg' %}" alt="Kampagne abgeschlossen" class="slider-card__check-icon">
-  {% endif %}
-  <div class="bg-callout py-2 text-center">
-    {% if object.image %}
-      {# the column values are guesses, the glider js config determines actual size. #}
-      {% get_responsive_filer_image object.image "col-6 col-md-4" as respimg %}
-      <picture>
-        {% for source in respimg.sources %}
-          <source
-            srcset="{{ source.srcset }}"
-            sizes="{{ respimg.sizes }}"
-            type="{{ source.mime_type }}"
-          />
-        {% endfor %}
-              
-        <img class="img-sm-vertical" loading="lazy"
-          src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}"
-          alt="{{ object.image.default_alt_text|default:"" }}"
-          width="{{ object.image.width|floatformat:"0u" }}"
-          height="{{ object.image.height|floatformat:"0u" }}"
-        >
-      </picture>
+    {% if "campaign-card__done" in object.extra_classes %}
+        <img src="{% static 'img/campaign-check.svg' %}"
+             alt="Kampagne abgeschlossen"
+             class="slider-card__check-icon">
+    {% endif %}
+    <div class="bg-callout py-2 text-center">
+        {% if object.image %}
+            {# the column values are guesses, the glider js config determines actual size. #}
+            {% get_responsive_filer_image object.image "col-6 col-md-4" as respimg %}
+            <picture>
+                {% for source in respimg.sources %}
+                    <source srcset="{{ source.srcset }}"
+                            sizes="{{ respimg.sizes }}"
+                            type="{{ source.mime_type }}" />
+                {% endfor %}
+                <img class="img-sm-vertical"
+                     loading="lazy"
+                     src="{{ respimg.src }}"
+                     srcset="{{ respimg.srcset }}"
+                     sizes="{{ respimg.sizes }}"
+                     alt="{{ object.image.default_alt_text|default:"" }}"
+                     width="{{ object.image.width|floatformat:"0u" }}"
+                     height="{{ object.image.height|floatformat:"0u" }}">
+            </picture>
+        {% endif %}
+    </div>
+    <h3 class="h4 mt-3 mb-3">{{ object.title }}</h3>
+    <div class="flex-grow-1">{{ object.description | markdown }}</div>
+    {% if object.link %}
+        <div>
+            <a href="{{ object.link }}" class="btn btn-outline-primary w-100">
+                {% if object.link_label %}
+                    {{ object.link_label }}
+                {% else %}
+                    {% trans "Read more" %}
+                {% endif %}
+            </a>
+        </div>
     {% endif %}
-  </div>
-  <h3 class="h4 mt-3 mb-3">{{ object.title }}</h3>
-  <div class="flex-grow-1">
-    {{ object.description | markdown }}
-  </div>
-  {% if object.link %}
-  <div>
-    <a href="{{ object.link }}" class="btn btn-outline-primary w-100">
-      {% if object.link_label %}{{ object.link_label }}{% else %}{% trans "Read more" %}{% endif %}
-    </a>
-  </div>
-  {% endif %}    
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html
index c4ab31d9a..45e3fa7f3 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/default.html
@@ -1,17 +1,8 @@
 {% load markup %}
-
-
-<div class="text-bg-body border-gray shadow-sm pt-3 px-3 mb-3 h-100 {% if object.image %} z-index-20 position-relative mx-3 mt-n4 mb-4{% endif %}{% if object.extra_classes %} {{ object.extra_classes }}{% endif %}">
-
-  {% include "cms/plugins/primarylink/_picture.html" with extra_classes="mb-4" %}
-
-  {% if object.link %}<a href="{{ object.link }}" class="text-body">{% endif %}
-    <h4 class="h5 mt-0 {% if object.description %}mb-1{% else %}mb-3{% endif %}">
-      {{ object.title }}
-    </h4>
-  {% if object.link %}</a>{% endif %}
-
-  <div class="text-body-secondary">
-    {{ object.description | markdown }}
-  </div>
+<div class="text-bg-body border-gray shadow-sm pt-3 px-3 mb-3 h-100 {% if object.image %}z-index-20 position-relative mx-3 mt-n4 mb-4{% endif %}{% if object.extra_classes %} {{ object.extra_classes }}{% endif %}">
+    {% include "cms/plugins/primarylink/_picture.html" with extra_classes="mb-4" %}
+    {% if object.link %}<a href="{{ object.link }}" class="text-body">{% endif %}
+        <h4 class="h5 mt-0 {% if object.description %}mb-1{% else %}mb-3{% endif %}">{{ object.title }}</h4>
+        {% if object.link %}</a>{% endif %}
+    <div class="text-body-secondary">{{ object.description | markdown }}</div>
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html
index fd1b61dc9..47a7438b6 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/primarylink/featured.html
@@ -1,18 +1,10 @@
 {% load markup %}
-
 <div>
-
-  {% include "cms/plugins/primarylink/_picture.html" with extra_classes="z-index-10" %}
-  
-  <div class="text-bg-body border-gray shadow-sm pt-3 px-3 mb-3 {% if object.image %} z-index-20 position-relative mx-3 mt-n4 mb-4{% endif %}{% if object.extra_classes %} {{ object.extra_classes }}{% endif %}">
-    {% if object.link %}<a href="{{ object.link }}" class="text-body">{% endif %}
-      <h4 class="h5 mt-0 {% if object.description %}mb-1{% else %}mb-3{% endif %}">
-        {{ object.title }}
-      </h4>
-    {% if object.link %}</a>{% endif %}
-
-    <div class="text-body-secondary">
-      {{ object.description | markdown }}
+    {% include "cms/plugins/primarylink/_picture.html" with extra_classes="z-index-10" %}
+    <div class="text-bg-body border-gray shadow-sm pt-3 px-3 mb-3 {% if object.image %}z-index-20 position-relative mx-3 mt-n4 mb-4{% endif %}{% if object.extra_classes %} {{ object.extra_classes }}{% endif %}">
+        {% if object.link %}<a href="{{ object.link }}" class="text-body">{% endif %}
+            <h4 class="h5 mt-0 {% if object.description %}mb-1{% else %}mb-3{% endif %}">{{ object.title }}</h4>
+            {% if object.link %}</a>{% endif %}
+        <div class="text-body-secondary">{{ object.description | markdown }}</div>
     </div>
-  </div>
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html
index 7abd7b25e..ebabd1d75 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="row {% block row_class %}justify-content-center{% endblock %} {% block extra_row_class %}cms-row{% endblock %}">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html
index bd7fbf566..d13b147a1 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_around.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/row.html" %}
-
 {% block row_class %}justify-content-around{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html
index f793fba19..edd7ca2e5 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_between.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/row.html" %}
-
 {% block row_class %}justify-content-between{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html
index 3f602b655..2c7a02932 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_left.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/row.html" %}
-
 {% block row_class %}justify-content-start{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html
index ff96efe95..21e49166f 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_narrow.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/row.html" %}
-
 {% block extra_row_class %}{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html
index 318bcd13f..2f5d3ffb1 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/row_right.html
@@ -1,3 +1,2 @@
 {% extends "cms/plugins/row.html" %}
-
 {% block row_class %}justify-content-end{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html
index 241720018..548504719 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu.html
@@ -1,10 +1,8 @@
 {% load menu_tags %}
-
-
 <div class="submenu">
     <div class="container">
         <ul class="mb-3">
             {% show_menu request.current_page.node.depth|add:"-1" 100 0 1 "cms/plugins/submenu_child.html" %}
         </ul>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html
index 0f6857dea..f01def869 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/plugins/submenu_child.html
@@ -1,8 +1,6 @@
 {% for child in children %}
-<li>
-  <a class="{% if child.selected or child.ancestor %}active{% endif %}"
-    href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
-    {{ child.get_menu_title }}
-  </a>
-</li>
+    <li>
+        <a class="{% if child.selected or child.ancestor %}active{% endif %}"
+           href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
+    </li>
 {% endfor %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html
index e6b1fcb8c..2c2d2137f 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/pub_base.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/pub_base.html
@@ -1,69 +1,77 @@
 {% extends "cms/page.html" %}
-
 {% load i18n %}
 {% load cms_tags %}
 {% load menu_tags %}
 {% load fds_cms_tags %}
-
 {% block body %}
-
-{% page_url request.current_page|get_soft_root as base_url %}
-{% page_attribute "page_title" request.current_page|get_soft_root as base_title %}
-  
-<div class="app bg-body-tertiary">
-    <div class="sticky-top z-3">
-      <nav class="navbar text-bg-highlight">
-        <div class="container d-flex">
-          <a href="{{ base_url }}" title="{{ base_title }}" class="navbar-brand mb-0 d-md-none w-100 text-truncate">{{ base_title }}</a>
-          <a href="{{ base_url }}" class="navbar-brand mb-0 d-none d-md-block">{{ base_title }}</a>
-
-          <button class="navbar-toggler me-lg-2 ms-xs-0 ms-lg-auto" type="button" data-bs-toggle="collapse" data-bs-target="#chapters" aria-controls="chapters" aria-expanded="false" aria-label="{% translate 'Toggle chapter navigation' %}">
-            <i class="fa fa-list" aria-hidden="true"></i>
-            <span class="d-none d-sm-inline">{% translate "Chapters" %}</span>
-          </button>
-
-          <form role="search" method="get" action="{{ base_url }}suche/">
-            <div class="input-group d-none d-sm-flex">
-              <input class="form-control form-control-sm" type="text" size="20" name="q" placeholder="{% translate 'Search' %}" aria-label="{% translate 'Search' %}" {% if form %}value="{{ form.cleaned_data.q }}"{% endif %}>
-              <button class="btn btn-sm btn-outline-dark" type="submit">
-                <i class="fa fa-search" aria-hidden="true"></i>
-                <span class="visually-hidden">{% translate "Search" %}</span>
-              </button>
+    {% page_url request.current_page|get_soft_root as base_url %}
+    {% page_attribute "page_title" request.current_page|get_soft_root as base_title %}
+    <div class="app bg-body-tertiary">
+        <div class="sticky-top z-3">
+            <nav class="navbar text-bg-highlight">
+                <div class="container d-flex">
+                    <a href="{{ base_url }}"
+                       title="{{ base_title }}"
+                       class="navbar-brand mb-0 d-md-none w-100 text-truncate">{{ base_title }}</a>
+                    <a href="{{ base_url }}" class="navbar-brand mb-0 d-none d-md-block">{{ base_title }}</a>
+                    <button class="navbar-toggler me-lg-2 ms-xs-0 ms-lg-auto"
+                            type="button"
+                            data-bs-toggle="collapse"
+                            data-bs-target="#chapters"
+                            aria-controls="chapters"
+                            aria-expanded="false"
+                            aria-label="{% translate 'Toggle chapter navigation' %}">
+                        <i class="fa fa-list" aria-hidden="true"></i>
+                        <span class="d-none d-sm-inline">{% translate "Chapters" %}</span>
+                    </button>
+                    <form role="search" method="get" action="{{ base_url }}suche/">
+                        <div class="input-group d-none d-sm-flex">
+                            <input class="form-control form-control-sm"
+                                   type="text"
+                                   size="20"
+                                   name="q"
+                                   placeholder="{% translate 'Search' %}"
+                                   aria-label="{% translate 'Search' %}"
+                                   {% if form %}value="{{ form.cleaned_data.q }}"{% endif %}>
+                            <button class="btn btn-sm btn-outline-dark" type="submit">
+                                <i class="fa fa-search" aria-hidden="true"></i>
+                                <span class="visually-hidden">{% translate "Search" %}</span>
+                            </button>
+                        </div>
+                        <button class="btn btn-sm btn-outline-dark d-block d-sm-none" type="submit">
+                            <i class="fa fa-search" aria-hidden="true"></i>
+                            <span class="visually-hidden">{% translate "Search" %}</span>
+                        </button>
+                    </form>
+                </div>
+            </nav>
+            <div class="collapse text-bg-highlight" id="chapters">
+                <div class="container">
+                    <ol class="pb-2 overflow-auto" style="max-height: 50vh">
+                        {% show_menu 1 100 0 1 %}
+                    </ol>
+                </div>
             </div>
-            <button class="btn btn-sm btn-outline-dark d-block d-sm-none" type="submit">
-              <i class="fa fa-search" aria-hidden="true"></i>
-              <span class="visually-hidden">{% translate "Search" %}</span>
-            </button>
-          </form>
         </div>
-      </nav>
-      <div class="collapse text-bg-highlight" id="chapters">
         <div class="container">
-          <ol class="pb-2 overflow-auto" style="max-height: 50vh">
-            {% show_menu 1 100 0 1 %}
-          </ol>
-        </div>
-      </div>
-    </div>
-    <div class="container">
-      <div class="row justify-content-center">
-        {% if not request.current_page.soft_root and request.current_page.in_navigation %}
-          <div class="col">
-            <div id="toc" class="sticky-top z-2 toc bg-body-secondary my-3 mx-0 mx-md-3 p-3 small" style="top: 5rem"></div>
-          </div>
-        {% endif %}
-        <div class="bg-body col-md-10 col-lg-8 order-md-last mt-3 mb-3 ">
-          <div id="content" class="book-pub-content py-3 px-1 py-md-5 px-md-5">
-            {% block app_body %}
-              {% placeholder "content" %}
-            {% endblock %}
-          </div>
+            <div class="row justify-content-center">
+                {% if not request.current_page.soft_root and request.current_page.in_navigation %}
+                    <div class="col">
+                        <div id="toc"
+                             class="sticky-top z-2 toc bg-body-secondary my-3 mx-0 mx-md-3 p-3 small"
+                             style="top: 5rem"></div>
+                    </div>
+                {% endif %}
+                <div class="bg-body col-md-10 col-lg-8 order-md-last mt-3 mb-3 ">
+                    <div id="content" class="book-pub-content py-3 px-1 py-md-5 px-md-5">
+                        {% block app_body %}
+                            {% placeholder "content" %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
-
-  {% static_placeholder "book_pub_footer" %}
-
-  {% include "_frontend.html" with entry_point="bookpub.js" %}
+    {% static_placeholder "book_pub_footer" %}
+    {% include "_frontend.html" with entry_point="bookpub.js" %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/cms/scaffold.html b/fragdenstaat_de/fds_cms/templates/cms/scaffold.html
index 891bb0da7..d43433d96 100644
--- a/fragdenstaat_de/fds_cms/templates/cms/scaffold.html
+++ b/fragdenstaat_de/fds_cms/templates/cms/scaffold.html
@@ -1,38 +1,40 @@
-{% load i18n %}{% load static %}{% load cms_tags %}{% load sekizai_tags %}<!DOCTYPE html>
-<html lang="{{ LANGUAGE_CODE }}"{% if request.user.is_staff %} data-bs-theme="light"{% endif %}>
-  <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="language" content="{{ LANGUAGE_CODE }}" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <title>{% block title %}{% page_attribute "page_title" %} - {{ SITE_NAME }}{% endblock %}</title>
-
-  {% block header_font %}{% endblock %}
-
-  {% block css %}
-    {% block extra_css %}
-    {% endblock %}
-  {% endblock %}
-  {% render_block "css" %}
-
-  {% block meta %}
-    {# Translators: meta description #}
-    {% include "snippets/meta.html" %}
-    {% include "fds_cms/social_meta.html" with object=request.current_page %}
-  {% endblock %}
-
-  {% block extra_head %}
-  {% endblock %}
-</head>
-<body {% if request.user.is_authenticated %}data-user="{{ request.user.id }}" data-useremail="{{ request.user.email }}"{% endif %}{% block body_extra_attributes %}{% endblock %}>
-  {% cms_toolbar %}
-  {% block body_tag %}{% endblock %}
-
-  {% block extra_footer %}{% endblock %}
-
-  {% block scripts %}{% endblock %}
-  {% render_block "js" %}
-
-  {% block below_scripts %}{% endblock %}
-</body>
+{% load i18n %}
+{% load static %}
+{% load cms_tags %}
+{% load sekizai_tags %}
+<!DOCTYPE html>
+<html lang="{{ LANGUAGE_CODE }}"
+      {% if request.user.is_staff %}data-bs-theme="light"{% endif %}>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="language" content="{{ LANGUAGE_CODE }}" />
+        <meta name="viewport"
+              content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        <title>
+            {% block title %}
+                {% page_attribute "page_title" %} - {{ SITE_NAME }}
+            {% endblock %}
+        </title>
+        {% block header_font %}{% endblock %}
+        {% block css %}
+            {% block extra_css %}{% endblock %}
+        {% endblock %}
+        {% render_block "css" %}
+        {% block meta %}
+            {# Translators: meta description #}
+            {% include "snippets/meta.html" %}
+            {% include "fds_cms/social_meta.html" with object=request.current_page %}
+        {% endblock %}
+        {% block extra_head %}{% endblock %}
+    </head>
+    <body {% if request.user.is_authenticated %}data-user="{{ request.user.id }}" data-useremail="{{ request.user.email }}"{% endif %}
+          {% block body_extra_attributes %}{% endblock %}>
+        {% cms_toolbar %}
+        {% block body_tag %}{% endblock %}
+        {% block extra_footer %}{% endblock %}
+        {% block scripts %}{% endblock %}
+        {% render_block "js" %}
+        {% block below_scripts %}{% endblock %}
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html
index 2b16285dd..8d657b8a4 100644
--- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html
+++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_collection_embed.html
@@ -1,6 +1,4 @@
 {% load static %}
 {% load sekizai_tags %}
-
 {% include "filingcabinet/_documentcollection_viewer.html" with object=object config=config documentcollection_data=documentcollection_data %}
-
 {% include "_frontend.html" with entry_point="filingcabinet.js" %}
diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html
index 81cab17cb..696de7464 100644
--- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html
+++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_embed.html
@@ -1,3 +1,2 @@
 {% include "filingcabinet/_document_viewer.html" with object=object page_number=page_number defaults=defaults config=config beta=beta %}
-
 {% include "_frontend.html" with entry_point="filingcabinet.js" %}
diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html
index 12eb470db..2c73876c8 100644
--- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html
+++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/document_pages.html
@@ -1,18 +1,18 @@
 <div class="cms-document-pages -{{ object.size }}">
-  {% if object.title %}
-    <h4>{{ object.title }}</h4>
-  {% endif %}
-  <div class="cms-document-pages-container">
-    {% for page in pages %}
-      <div class="card">
-        {% if page.image_url %}
-          <picture>
-            <img class="img-fluid" src="{{ page.image_url }}" alt="Seite {{ page.number }}">
-          </picture>
-        {% else %}
-          <div class="spinner-grow" role="status"></div>
-        {% endif %}
-      </div>
-    {% endfor %}
-  </div>
+    {% if object.title %}<h4>{{ object.title }}</h4>{% endif %}
+    <div class="cms-document-pages-container">
+        {% for page in pages %}
+            <div class="card">
+                {% if page.image_url %}
+                    <picture>
+                        <img class="img-fluid"
+                             src="{{ page.image_url }}"
+                             alt="Seite {{ page.number }}">
+                    </picture>
+                {% else %}
+                    <div class="spinner-grow" role="status"></div>
+                {% endif %}
+            </div>
+        {% endfor %}
+    </div>
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html
index 67e6ced92..16d4aca5a 100644
--- a/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html
+++ b/fragdenstaat_de/fds_cms/templates/document/cms_plugins/page_annotation.html
@@ -1,34 +1,29 @@
 {% load thumbnail %}
-
 <div class="cms-page-annotation">
-    {% if object.title %}
-    <h4>
-        {{ object.title }}
-    </h4>
-    {% endif %}
-    {% if object.description or object.highlight %}
-        <figure>
-    {% endif %}
-
-    {% if object.image %}
-    <picture>
-    <source
-        media="(min-width: 1200px)"
-        srcset="{% thumbnail object.image 1140x0 %}">
-    <source
-        media="(min-width: 992px)"
-        srcset="{% thumbnail object.image 940x0 %}">
-    <img class="img-fluid" src="{% thumbnail object.image 768x0 crop=scale %}" alt="{{ object.title }}"{% if instance.zoom %} data-zoomwidth="{{ object.width }}" data-zoom="{{ object.image.url }}"{% endif %}>
-    </picture>
-    {% else %}
-      <div class="spinner-grow" role="status"></div>
-    {% endif %}
-
-    {% if object.description or object.highlight %}
-        <figcaption>
-            {{ object.description }}
-            {% if object.highlight %}{% if object.description %}<br/>{% endif %}<small class="text-body-secondary text-end">Hervorhebung von uns</small>{% endif %}
-        </figcaption>
-    </figure>
+    {% if object.title %}<h4>{{ object.title }}</h4>{% endif %}
+    {% if object.description or object.highlight %}<figure>{% endif %}
+        {% if object.image %}
+            <picture>
+                <source media="(min-width: 1200px)"
+                        srcset="{% thumbnail object.image 1140x0 %}">
+                <source media="(min-width: 992px)"
+                        srcset="{% thumbnail object.image 940x0 %}">
+                <img class="img-fluid"
+                     src="{% thumbnail object.image 768x0 crop=scale %}"
+                     alt="{{ object.title }}"
+                     {% if instance.zoom %}data-zoomwidth="{{ object.width }}" data-zoom="{{ object.image.url }}"{% endif %}>
+            </picture>
+        {% else %}
+            <div class="spinner-grow" role="status"></div>
+        {% endif %}
+        {% if object.description or object.highlight %}
+            <figcaption>
+                {{ object.description }}
+                {% if object.highlight %}
+                    {% if object.description %}<br />{% endif %}
+                    <small class="text-body-secondary text-end">Hervorhebung von uns</small>
+                {% endif %}
+            </figcaption>
+        </figure>
     {% endif %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html b/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html
index 1aff4fd4b..b622a1444 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/admin/static_placeholder.html
@@ -1,13 +1,10 @@
 {% extends "cms/base.html" %}
-
 {% load cms_tags %}
-
-
 {% block body %}
-  {% block app_body %}
-    <div class="container mb-3 mt-3">
-        <h2>Static Placeholder „{{ placeholder.code }}“</h2>
-        {% static_placeholder placeholder.code %}
-    </div>
-  {% endblock %}
-{% endblock %}
\ No newline at end of file
+    {% block app_body %}
+        <div class="container mb-3 mt-3">
+            <h2>Static Placeholder „{{ placeholder.code }}“</h2>
+            {% static_placeholder placeholder.code %}
+        </div>
+    {% endblock %}
+{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html b/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html
index a2d8942cb..c859b5e69 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/bordered_section.html
@@ -1,15 +1,11 @@
 {% load cms_tags %}
-
 <section class="bordered-section border-{{ instance.border }} {{ instance.attributes.class }}" {{ instance.attributes_str }}>
-  <{{ instance.heading }} class="bordered-section-headline text-{{ color }}">
-    <div class="d-inline-block px-4 text-bg-body">
-      {{ instance.title }}
+    <{{ instance.heading }} class="bordered-section-headline text-{{ color }}">
+    <div class="d-inline-block px-4 text-bg-body">{{ instance.title }}</div>
+    </{{ instance.heading }}>
+    <div class="{{ padding }}">
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
     </div>
-  </{{ instance.heading }}>
-
-  <div class="{{ padding }}">
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  </div>
 </section>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html
index b59fbac77..05122f8e0 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card.html
@@ -1,19 +1,20 @@
 {% load cms_tags %}
-
-{% if instance.link %}<a href="{{ instance.link }}" class="d-flex w-100 text-body text-decoration-none">{% endif %}
-  <div class="box-card {{ classes }}" {{ instance.attributes_str }}>
-    <div>
-      {% for plugin in children %}
-        {% render_plugin plugin %}
-      {% endfor %}
-    </div>
-
-    {% if links|length > 0 %}
-      <div class="box-card-links {{ padding }}">
-        {% for plugin in links %}
-          {% render_plugin plugin %}
-        {% endfor %}
-      </div>
+{% if instance.link %}
+    <a href="{{ instance.link }}"
+       class="d-flex w-100 text-body text-decoration-none">
     {% endif %}
-  </div>
-{% if instance.link %}</a>{% endif %}
+    <div class="box-card {{ classes }}" {{ instance.attributes_str }}>
+        <div>
+            {% for plugin in children %}
+                {% render_plugin plugin %}
+            {% endfor %}
+        </div>
+        {% if links|length > 0 %}
+            <div class="box-card-links {{ padding }}">
+                {% for plugin in links %}
+                    {% render_plugin plugin %}
+                {% endfor %}
+            </div>
+        {% endif %}
+    </div>
+    {% if instance.link %}</a>{% endif %}
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html
index f4794a623..33031f3af 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_header.html
@@ -1,22 +1,19 @@
 {% load cms_tags %}
 {% load thumbnail %}
-
 {% if instance.background_image %}
-<style>
+    <style>
 #card-header-{{ instance.pk }}::after {
   background-image: url('{% thumbnail instance.background_image 350x150 crop subject_location=instance.picture.subject_location %}');
 }
-</style>
+    </style>
 {% endif %}
-
 <div class="box-card-header tight-margin d-flex align-items-center{% if instance.background_image %} has-background{% endif %} {{ classes }}" {{ instance.attributes_str }} id="card-header-{{ instance.pk }}">
-  <h3 class="h5 m-0 no-hyphens">{{ instance.title }}</h3>
-  
-  {% if instance.icon %}
-    <div class="ms-auto">
-      <div class="box-card-icon position-static text-bg-body">
-        <i class="fa fa-{{ instance.icon }}"></i>
-      </div>
-    </div>
-  {% endif %}
+    <h3 class="h5 m-0 no-hyphens">{{ instance.title }}</h3>
+    {% if instance.icon %}
+        <div class="ms-auto">
+            <div class="box-card-icon position-static text-bg-body">
+                <i class="fa fa-{{ instance.icon }}"></i>
+            </div>
+        </div>
+    {% endif %}
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html
index dfdcd1f0f..d8f7b272b 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_icon.html
@@ -1,3 +1,3 @@
 <div class="box-card-icon {{ classes }} overlap-right" {{ instance.attributes_str }}>
-  <i class="fa fa-{{ instance.icon }}"></i>
-</div>
\ No newline at end of file
+    <i class="fa fa-{{ instance.icon }}"></i>
+</div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html
index 750da2a17..9018de38f 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_image.html
@@ -1,26 +1,24 @@
 {% load fds_cms_tags %}
-
-{% if instance.link %}<a href="{{ instance.link }}"{% else %}<div{% endif %} class="d-block box-card-image overlap-{{ instance.overlap }}{% if instance.overlap == 'left' %} col-md-4 col-lg-3{% endif %} text-center">
-  {% with picture=instance.image %}
-    <picture>
-      {% if picture.mime_type != "image/svg+xml" %}
-        {% get_responsive_filer_image picture "col-md-4 col-lg-3" as respimg %}
-        {% for source in respimg.sources %}
-          <source
-            srcset="{{ source.srcset }}"
-            sizes="{{ respimg.sizes }}"
-            type="{{ source.mime_type }}"
-          />
-        {% endfor %}
-
-        <img class="img-{{ instance.size }} z-index-10 {{ instance.attributes.class }}" loading="lazy" width="{{ picture.width|floatformat:"0u" }}" height="{{ picture.height|floatformat:"0u" }}" src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}"
-        {% if not attributes.alt %} alt="{{ picture.default_alt_text|default:"" }}"{% endif %}
-        {{ instance.attributes_str }}>
-      {% else %}
-        <img class="img-{{ instance.size }} z-index-10 {{ instance.attributes.class }}" loading="lazy" width="{{ picture.width|floatformat:"0u" }}" height="{{ picture.height|floatformat:"0u" }}" src="{{ picture.url }}"
-        {% if not attributes.alt %} alt="{{ picture.default_alt_text|default:"" }}"{% endif %}
-        {{ instance.attributes_str }}>
-      {% endif %}
-    </picture>
-  {% endwith %}
-{% if instance.link %}</a>{% else %}</div>{% endif %}
+{% if instance.link %}
+    <a href="{{ instance.link }}"{% else %}
+        <div {% endif %}
+             class="d-block box-card-image overlap-{{ instance.overlap }}{% if instance.overlap == 'left' %} col-md-4 col-lg-3{% endif %} text-center">
+            {% with picture=instance.image %}
+                <picture>
+                    {% if picture.mime_type != "image/svg+xml" %}
+                        {% get_responsive_filer_image picture "col-md-4 col-lg-3" as respimg %}
+                        {% for source in respimg.sources %}
+                            <source srcset="{{ source.srcset }}"
+                                    sizes="{{ respimg.sizes }}"
+                                    type="{{ source.mime_type }}" />
+                        {% endfor %}
+                        <img class="img-{{ instance.size }} z-index-10 {{ instance.attributes.class }}" loading="lazy" width="{{ picture.width|floatformat:"0u" }}" height="{{ picture.height|floatformat:"0u" }}" src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}" {% if not attributes.alt %}alt="{{ picture.default_alt_text|default:"" }}"{% endif %} {{ instance.attributes_str }}>
+                    {% else %}
+                        <img class="img-{{ instance.size }} z-index-10 {{ instance.attributes.class }}" loading="lazy" width="{{ picture.width|floatformat:"0u" }}" height="{{ picture.height|floatformat:"0u" }}" src="{{ picture.url }}" {% if not attributes.alt %}alt="{{ picture.default_alt_text|default:"" }}"{% endif %} {{ instance.attributes_str }}>
+                    {% endif %}
+                </picture>
+            {% endwith %}
+            {% if instance.link %}
+            </a>{% else %}
+        </div>
+    {% endif %}
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html
index b3d34b23a..de0e1cb18 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_inner.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 <div class="flex-grow-1 tight-margin {{ classes }}" {{ instance.attributes_str }}>
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}  
-</div>
\ No newline at end of file
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
+</div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html
index 32324c1a3..d31775f64 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/card/card_link.html
@@ -1,5 +1,8 @@
 <a href="{{ instance.link }}" class="action-link me-3 {{ instance.attributes.class }}" {{ instance.attributes_str }}>
-  {% if instance.icon %}<i class="fa fa-{{ instance.icon }}"></i>
-  {% elif instance.arrow %}→ {% endif %}
-  {{ instance.title }}
-</a>
\ No newline at end of file
+    {% if instance.icon %}
+        <i class="fa fa-{{ instance.icon }}"></i>
+    {% elif instance.arrow %}
+        →
+    {% endif %}
+    {{ instance.title }}
+</a>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html b/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html
index cf40c88b3..ebc33569c 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/collapsible.html
@@ -1,10 +1,10 @@
 {% load cms_tags %}
-
-<details class="collapsible {% if object.extra_classes %} {{ object.extra_classes }}{% endif %}" {% if not object.collapsed %}open{% endif %}>
-  <summary class="collapsible__title">{{ object.title }}</summary>
-  <div>
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}  
-  </div>
+<details class="collapsible {% if object.extra_classes %}{{ object.extra_classes }}{% endif %}"
+         {% if not object.collapsed %}open{% endif %}>
+    <summary class="collapsible__title">{{ object.title }}</summary>
+    <div>
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </div>
 </details>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html b/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html
index 7d44fdaeb..7a0309bed 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/feedback.html
@@ -1,12 +1,9 @@
 {% load form_helper %}
 {% load i18n %}
-
 <form action="{% url 'fds_cms_contact:contact' %}" method="post">
-  {% csrf_token %}
-  {% render_form form %}
-  <p class="text-end">
-    <button type="submit" class="btn btn-primary">
-      {% trans "Submit" %}
-    </button>
-  </p>
-</form>
\ No newline at end of file
+    {% csrf_token %}
+    {% render_form form %}
+    <p class="text-end">
+        <button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
+    </p>
+</form>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html b/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html
index a0f81e025..78af7a326 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/modal.html
@@ -1,11 +1,12 @@
 {% load cms_tags %}
-
 <{{ instance.tag_type }} id="{{ instance.identifier }}" tabindex="-1" role="dialog" aria-hidden="true" {{ instance.attributes_str }}>
-  <div {{ instance.dialog_attributes_str }}>
+<div {{ instance.dialog_attributes_str }}>
     <div class="modal-content">
-      {% for plugin in instance.child_plugin_instances %}
-          {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
-      {% endfor %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% with forloop as parentloop %}
+                {% render_plugin plugin %}
+            {% endwith %}
+        {% endfor %}
     </div>
-  </div>
+</div>
 </{{ instance.tag_type }}>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html b/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html
index 64fbbb8ac..0cffdf295 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/reveal.html
@@ -1,13 +1,17 @@
 {% load cms_tags %}
-
-<div class="reveal-cutoff" data-cutoff="{{ instance.cutoff }}{{ instance.unit }}" style="--reveal-color: var({{ instance.css_color_variable }})">
-  <div class="reveal-inner {{ instance.attributes.class }}" id="reveal-{{ instance.pk }}" {{ instance.attributes_str }}>
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  </div>
-
-  <div class="reveal-show">
-    <a href="#!" class="action-link" role="button" aria-controls="reveal-{{ instance.pk }}" aria-expanded="false">{{ instance.text }}</a>
-  </div>
-</div>
\ No newline at end of file
+<div class="reveal-cutoff"
+     data-cutoff="{{ instance.cutoff }}{{ instance.unit }}"
+     style="--reveal-color: var({{ instance.css_color_variable }})">
+    <div class="reveal-inner {{ instance.attributes.class }}" id="reveal-{{ instance.pk }}" {{ instance.attributes_str }}>
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </div>
+    <div class="reveal-show">
+        <a href="#!"
+           class="action-link"
+           role="button"
+           aria-controls="reveal-{{ instance.pk }}"
+           aria-expanded="false">{{ instance.text }}</a>
+    </div>
+</div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/search.html b/fragdenstaat_de/fds_cms/templates/fds_cms/search.html
index abbb227db..a2b760c92 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/search.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/search.html
@@ -1,64 +1,41 @@
 {% extends CMS_TEMPLATE %}
-
 {% load i18n %}
 {% load cms_tags %}
 {% load fds_cms_tags %}
-
 {% block extra_breadcrumbs %}
-<li class="breadcrumb-item">
-  {% comment %}Translators: Search as noun{% endcomment %}
-  <a href="">{% translate "Search" %}</a>
-</li>
+    <li class="breadcrumb-item">
+        {% comment %}Translators: Search as noun{% endcomment %}
+        <a href="">{% translate "Search" %}</a>
+    </li>
 {% endblock %}
-
 {% block app_body %}
-
-{% page_attribute "page_title" request.current_page|get_soft_root as base_title %}
-
-<h2>
-  {% blocktranslate with title=base_title %}Search in {{ title }}{% endblocktranslate %}
-</h2>
-
-<form class="mb-3" role="search" method="get" action=".">
-  <div class="input-group">
-    {{ form.q }}
-    <button class="btn btn-outline-primary" type="submit">
-      <i class="fa fa-search" aria-hidden="true"></i>
-      {% translate "Search" %}
-    </button>
-  </div>
-</form>
-
-{% if object_list and form.cleaned_data.q %}
-<p>
-  {% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}
-</p>
-<ol class="list-unstyled">
-  {% for object in object_list %}
-    <li>
-      <h5 class="mt-0 mb-1">
-        <a href="{{ object.page.get_absolute_url }}">
-          {{ object.title }}
-        </a>
-      </h5>
-      {% if object.meta_description %}
-        <small>{{ object.meta_description }}</small>
-      {% endif %}
-      {% if object.query_highlight %}
-      <p class="search-highlight">
-        {{ object.query_highlight }}
-      </p>
-      {% endif %}
-    </li>
-  {% endfor %}
-</ol>
-{% elif form.q.value %}
-<p>
-  {% translate "No results found." %}
-</p>
-{% else %}
-<p>
-  {% translate "Please enter a search term." %}
-</p>
-{% endif %}
+    {% page_attribute "page_title" request.current_page|get_soft_root as base_title %}
+    <h2>{% blocktranslate with title=base_title %}Search in {{ title }}{% endblocktranslate %}</h2>
+    <form class="mb-3" role="search" method="get" action=".">
+        <div class="input-group">
+            {{ form.q }}
+            <button class="btn btn-outline-primary" type="submit">
+                <i class="fa fa-search" aria-hidden="true"></i>
+                {% translate "Search" %}
+            </button>
+        </div>
+    </form>
+    {% if object_list and form.cleaned_data.q %}
+        <p>{% blocktranslate with q=form.q.value %}Results for “{{ q }}”{% endblocktranslate %}</p>
+        <ol class="list-unstyled">
+            {% for object in object_list %}
+                <li>
+                    <h5 class="mt-0 mb-1">
+                        <a href="{{ object.page.get_absolute_url }}">{{ object.title }}</a>
+                    </h5>
+                    {% if object.meta_description %}<small>{{ object.meta_description }}</small>{% endif %}
+                    {% if object.query_highlight %}<p class="search-highlight">{{ object.query_highlight }}</p>{% endif %}
+                </li>
+            {% endfor %}
+        </ol>
+    {% elif form.q.value %}
+        <p>{% translate "No results found." %}</p>
+    {% else %}
+        <p>{% translate "Please enter a search term." %}</p>
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html b/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html
index 422db6418..4594c1787 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/share_buttons.html
@@ -1,11 +1,16 @@
-<div class="btn-group btn-group-lg" role="group" aria-label="Social Media Sharing">
-  <a class="btn btn-info sharing__link -twitter" rel="noopener" target="_blank" href="https://twitter.com/share?text={{ text|urlencode }}&amp;url={{ url|urlencode }}&amp;via=fragdenstaat">
-    Twitter
-  </a>
-  <a class="btn btn-primary sharing__link -facebook" rel="noopener" target="_blank" href="https://www.facebook.com/sharer.php?u={{ url|urlencode }}">
-    Facebook
-  </a>
-  <a class="btn btn-secondary sharing__link -email" href="mailto:?subject={{ text|urlencode }}&amp;body={{ url|urlencode }}">
-    E-Mail
-  </a>
+<div class="btn-group btn-group-lg"
+     role="group"
+     aria-label="Social Media Sharing">
+    <a class="btn btn-info sharing__link -twitter"
+       rel="noopener"
+       target="_blank"
+       href="https://twitter.com/share?text={{ text|urlencode }}&amp;url={{ url|urlencode }}&amp;via=fragdenstaat">
+        Twitter
+    </a>
+    <a class="btn btn-primary sharing__link -facebook"
+       rel="noopener"
+       target="_blank"
+       href="https://www.facebook.com/sharer.php?u={{ url|urlencode }}">Facebook</a>
+    <a class="btn btn-secondary sharing__link -email"
+       href="mailto:?subject={{ text|urlencode }}&amp;body={{ url|urlencode }}">E-Mail</a>
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html b/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html
index ffe37962c..791d6f039 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/slider.html
@@ -1,44 +1,49 @@
 {% load cms_tags %}
 {% load i18n %}
-
 <div class="row{% if object.extra_classes %} {{ object.extra_classes }}{% endif %}">
-  <div class="glide d-flex flex-column justify-content-center col px-0" data-options="{{ object.options }}">
-
-    <div class="glide__track" data-glide-el="track">
-      <ul class="glide__slides m-0 d-flex">
-        {% for plugin in instance.child_plugin_instances %}
-          <li class="glide__slide py-sm-3">
-            {% if instance.wrapper_classes %}
-              <div class="{{ instance.wrapper_classes }}">
-                {% render_plugin plugin %}
-              </div>
-            {% else %}
-              {% render_plugin plugin %}
-            {% endif %}
-          </li>
-        {% endfor %}
-      </ul>
+    <div class="glide d-flex flex-column justify-content-center col px-0"
+         data-options="{{ object.options }}">
+        <div class="glide__track" data-glide-el="track">
+            <ul class="glide__slides m-0 d-flex">
+                {% for plugin in instance.child_plugin_instances %}
+                    <li class="glide__slide py-sm-3">
+                        {% if instance.wrapper_classes %}
+                            <div class="{{ instance.wrapper_classes }}">{% render_plugin plugin %}</div>
+                        {% else %}
+                            {% render_plugin plugin %}
+                        {% endif %}
+                    </li>
+                {% endfor %}
+            </ul>
+        </div>
+        <div class="glide__arrows d-none d-md-block" data-glide-el="controls">
+            <button class="glide__arrow glide__arrow--left" data-glide-dir="<">
+                <span class="visually-hidden">{% trans "Previous" %}</span>
+                <svg xmlns="http://www.w3.org/2000/svg"
+                     width="18"
+                     height="18"
+                     viewBox="0 0 24 24">
+                    <path d="M0 12l10.975 11 2.848-2.828-6.176-6.176H24v-3.992H7.646l6.176-6.176L10.975 1 0 12z"></path>
+                </svg>
+            </button>
+            <button class="glide__arrow glide__arrow--right" data-glide-dir=">">
+                <span class="visually-hidden">{% trans "Next" %}</span>
+                <svg xmlns="http://www.w3.org/2000/svg"
+                     width="18"
+                     height="18"
+                     viewBox="0 0 24 24">
+                    <path d="M13.025 1l-2.847 2.828 6.176 6.176h-16.354v3.992h16.354l-6.176 6.176 2.847 2.828 10.975-11z"></path>
+                </svg>
+            </button>
+        </div>
+        <div class="glide__bullets"
+             data-glide-el="controls[nav]"
+             aria-hidden="true">
+            {% for plugin in instance.child_plugin_instances %}
+                <button class="glide__bullet"
+                        data-glide-dir="={{ forloop.counter0 }}"
+                        tabindex="-1"></button>
+            {% endfor %}
+        </div>
     </div>
-    
-    <div class="glide__arrows d-none d-md-block" data-glide-el="controls">
-      <button class="glide__arrow glide__arrow--left" data-glide-dir="<">
-        <span class="visually-hidden">{% trans "Previous" %}</span>
-        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24">
-          <path d="M0 12l10.975 11 2.848-2.828-6.176-6.176H24v-3.992H7.646l6.176-6.176L10.975 1 0 12z"></path>
-        </svg>
-      </button>
-      <button class="glide__arrow glide__arrow--right" data-glide-dir=">">
-        <span class="visually-hidden">{% trans "Next" %}</span>
-        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24">
-          <path d="M13.025 1l-2.847 2.828 6.176 6.176h-16.354v3.992h16.354l-6.176 6.176 2.847 2.828 10.975-11z"></path>
-        </svg>
-      </button>
-    </div>
-
-    <div class="glide__bullets" data-glide-el="controls[nav]" aria-hidden="true">
-      {% for plugin in instance.child_plugin_instances %}
-        <button class="glide__bullet" data-glide-dir="={{ forloop.counter0 }}" tabindex="-1"></button>
-      {% endfor %}
-    </div>
-  </div>
 </div>
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
index c4d2081c6..a03683eac 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/social_meta.html
@@ -1,61 +1,48 @@
 {% load cms_tags %}
 {% load i18n %}
 {% load thumbnail %}
-
 {% if object.fdspageextension and not object.fdspageextension.search_index %}
-  <meta name="robots" content="noindex"/>
+    <meta name="robots" content="noindex" />
 {% endif %}
-
 {# Schema.org markup #}
 {% if not description %}
-  {% page_attribute 'meta_description' as description %}
+    {% page_attribute 'meta_description' as description %}
 {% endif %}
 {% if not title %}
-  {% page_attribute 'page_title' as title %}
+    {% page_attribute 'page_title' as title %}
 {% endif %}
-
 <meta itemprop="name" content="{{ title }}">
-{% if description and description != "None" %}
-  <meta itemprop="description" content="{{ description }}">
-{% endif %}
-<meta name="description" content="{% if description %}{{ description }}{% else %}{% blocktrans with site=SITE_NAME %}{{ site }} helps you to make freedom of information requests to public bodies{% endblocktrans %}{% endif %}"/>
-
+{% if description and description != "None" %}<meta itemprop="description" content="{{ description }}">{% endif %}
+<meta name="description"
+      content="{% if description %}{{ description }}{% else %}{% blocktrans with site=SITE_NAME %}{{ site }} helps you to make freedom of information requests to public bodies{% endblocktrans %}{% endif %}" />
 {# Twitter Card data #}
-
 <meta name="twitter:site" content="@fragdenstaat">
 <meta name="twitter:title" content="{{ title }}">
-{% if description and description != "None" %}
-  <meta name="twitter:description" content="{{ description }}">
-{% endif %}
+{% if description and description != "None" %}<meta name="twitter:description" content="{{ description }}">{% endif %}
 <meta name="twitter:creator" content="@fragdenstaat">
-
 {% if image_url %}
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:image:src" content="{{ image_url }}">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image:src" content="{{ image_url }}">
 {% elif object.fdspageextension.image %}
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:image:src" content="{% thumbnail object.fdspageextension.image 1120x600 crop subject_location=object.fdspageextension.image.subject_location %}">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image:src"
+          content="{% thumbnail object.fdspageextension.image 1120x600 crop subject_location=object.fdspageextension.image.subject_location %}">
 {% else %}
-  <meta name="twitter:card" content="summary">
-  <meta name="twitter:image:src" content="{{ SITE_LOGO }}">
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:image:src" content="{{ SITE_LOGO }}">
 {% endif %}
-
-
-
 {# Open Graph data #}
 <meta property="og:title" content="{{ title }}" />
 <meta property="og:type" content="article" />
-<meta property="og:url" content="{{ SITE_URL }}{{ object.get_absolute_url }}" />
-
+<meta property="og:url"
+      content="{{ SITE_URL }}{{ object.get_absolute_url }}" />
 {% if image_url %}
-  <meta property="og:image" content="{{ image_url }}" />
+    <meta property="og:image" content="{{ image_url }}" />
 {% elif object.fdspageextension.image %}
-  <meta property="og:image" content="{% thumbnail object.fdspageextension.image 1200x630 crop subject_location=object.fdspageextension.image.subject_location %}" />
+    <meta property="og:image"
+          content="{% thumbnail object.fdspageextension.image 1200x630 crop subject_location=object.fdspageextension.image.subject_location %}" />
 {% else %}
-  <meta property="og:image" content="{{ SITE_LOGO }}">
-{% endif %}
-{% if description and description != "None" %}
-  <meta property="og:description" content="{{ description }}" />
+    <meta property="og:image" content="{{ SITE_LOGO }}">
 {% endif %}
-
+{% if description and description != "None" %}<meta property="og:description" content="{{ description }}" />{% endif %}
 <meta property="og:site_name" content="{{ SITE_NAME }}" />
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html b/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html
index 4cf475622..5ef622cf1 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/svg_embed.html
@@ -1 +1 @@
-{{ svg | safe }}
\ No newline at end of file
+{{ svg | safe }}
diff --git a/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html b/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html
index c1be64e62..0136ac5b3 100644
--- a/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html
+++ b/fragdenstaat_de/fds_cms/templates/fds_cms/vega_chart.html
@@ -1,10 +1,8 @@
 {% load static %}
 {% load sekizai_tags %}
-
 <div class="vega-chart">
-  {% if instance.title %}<h5>{{ instance.title }}</h5>{% endif %}
-  {% if instance.description %}<p>{{ instance.description|linebreaksbr }}</p>{% endif %}
-  <div data-vegachart data-vegachartdata="{{ instance.vega_json }}"></div>
+    {% if instance.title %}<h5>{{ instance.title }}</h5>{% endif %}
+    {% if instance.description %}<p>{{ instance.description|linebreaksbr }}</p>{% endif %}
+    <div data-vegachart data-vegachartdata="{{ instance.vega_json }}"></div>
 </div>
-
 {% include "_frontend.html" with entry_point="vegacharts.js" %}
diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html
index 3a2362a55..4b2b33d67 100644
--- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html
+++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list.html
@@ -1,9 +1,9 @@
 <ul class="list-unstyled">
-  {% for object in object_list %}
-    <li class="d-flex">
-      {% block pre_item %}{% endblock %}
-      {% include "foirequest/snippets/request_item.html" %}
-      {% block post_item %}{% endblock %}
-    </li>
-  {% endfor %}
+    {% for object in object_list %}
+        <li class="d-flex">
+            {% block pre_item %}{% endblock %}
+            {% include "foirequest/snippets/request_item.html" %}
+            {% block post_item %}{% endblock %}
+        </li>
+    {% endfor %}
 </ul>
diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html
index 839b7deca..87ab9c782 100644
--- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html
+++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/list_follow.html
@@ -1,22 +1,15 @@
 {% extends "foirequest/cms_plugins/list.html" %}
-
 {% load follow_tags %}
-
 {% block pre_item %}
-<div class="row w-100">
-<div class="col-md-8">
-{% endblock %}
-
-{% block post_item %}
-  </div>
-  
-  {% if object.user != request.user %}
-    <div class="col-md-4">
-      <div class="ajax-parent mb-5">
-        {% follow_form "request" object %}
-      </div>
+    <div class="row w-100">
+        <div class="col-md-8">
+        {% endblock %}
+        {% block post_item %}
+        </div>
+        {% if object.user != request.user %}
+            <div class="col-md-4">
+                <div class="ajax-parent mb-5">{% follow_form "request" object %}</div>
+            </div>
+        {% endif %}
     </div>
-  {% endif %}
-
-  </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html
index c28112120..3958f82c1 100644
--- a/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html
+++ b/fragdenstaat_de/fds_cms/templates/foirequest/cms_plugins/one_click.html
@@ -1 +1 @@
-{% include "foirequest/snippets/make_same_request.html" with hide_intro=True %}
\ No newline at end of file
+{% include "foirequest/snippets/make_same_request.html" with hide_intro=True %}
diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html
index 793641c2d..849e9f2f2 100644
--- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html
+++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donation/change_list.html
@@ -1,49 +1,52 @@
 {% extends "admin/change_list.html" %}
-
 {% load i18n %}
-
 {% block object-tools-items %}
-  <li>
-    <a href="{% url 'admin:fds_donation-donation-export_csv' %}?{{ request.META.QUERY_STRING }}">
-      {% trans "Export CSV" %}
-    </a>
-  </li>
-  {{ block.super }}
+    <li>
+        <a href="{% url 'admin:fds_donation-donation-export_csv' %}?{{ request.META.QUERY_STRING }}">
+            {% trans "Export CSV" %}
+        </a>
+    </li>
+    {{ block.super }}
 {% endblock %}
-
-
 {% block result_list %}
-<p>
-  Summe: {{ cl.amount_sum }}&nbsp;EUR
-  <br/>Durchschnitt: {{ cl.amount_avg }}&nbsp;EUR
-  <br/>Median: {{ cl.amount_median }}&nbsp;EUR
-  <br/>Erhalten: {{ cl.amount_received_sum }}&nbsp;EUR
-  <br/>Anzahl Spender: {{ cl.donor_count }}
-  <br/>Wiederkehrend Monatssumme der Spendenden: {{ cl.recurring_donor_amount }}&nbsp;EUR
-</p>
-
-{{ block.super }}
+    <p>
+        Summe: {{ cl.amount_sum }}&nbsp;EUR
+        <br />
+        Durchschnitt: {{ cl.amount_avg }}&nbsp;EUR
+        <br />
+        Median: {{ cl.amount_median }}&nbsp;EUR
+        <br />
+        Erhalten: {{ cl.amount_received_sum }}&nbsp;EUR
+        <br />
+        Anzahl Spender: {{ cl.donor_count }}
+        <br />
+        Wiederkehrend Monatssumme der Spendenden: {{ cl.recurring_donor_amount }}&nbsp;EUR
+    </p>
+    {{ block.super }}
 {% endblock %}
-
 {% block content %}
-  {{ block.super }}
-  <div>
-    <h4>Überweisungen (XLS/XLSX)</h4>
-    <form enctype="multipart/form-data" method="post" action="{% url 'admin:fds_donation-donation-import_banktransfers' %}">{% csrf_token %}
-      <select name="project">
-        {% for project, name in cl.DONATION_PROJECTS %}
-          <option value="{{ project }}">{{ name }}</option>
-        {% endfor %}
-      </select>
-      <input type="file" name="file"/>
-      <input type="submit" value="Überweisungen importieren"/>
-    </form>
-  </div>
-  <div>
-    <h4>Paypal (CSV)</h4>
-    <form enctype="multipart/form-data" method="post" action="{% url 'admin:fds_donation-donation-import_paypal' %}">{% csrf_token %}
-      <input type="file" name="file"/>
-      <input type="submit" value="Paypal importieren"/>
-    </form>
-  </div>
+    {{ block.super }}
+    <div>
+        <h4>Überweisungen (XLS/XLSX)</h4>
+        <form enctype="multipart/form-data"
+              method="post"
+              action="{% url 'admin:fds_donation-donation-import_banktransfers' %}">
+            {% csrf_token %}
+            <select name="project">
+                {% for project, name in cl.DONATION_PROJECTS %}<option value="{{ project }}">{{ name }}</option>{% endfor %}
+            </select>
+            <input type="file" name="file" />
+            <input type="submit" value="Überweisungen importieren" />
+        </form>
+    </div>
+    <div>
+        <h4>Paypal (CSV)</h4>
+        <form enctype="multipart/form-data"
+              method="post"
+              action="{% url 'admin:fds_donation-donation-import_paypal' %}">
+            {% csrf_token %}
+            <input type="file" name="file" />
+            <input type="submit" value="Paypal importieren" />
+        </form>
+    </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html
index f6675b6cb..20da22553 100644
--- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html
+++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_form.html
@@ -1,12 +1,10 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
 {% block object-tools-items %}
-{% if original.pk %}
-  <li>
-    <a href="{% url 'admin:fds_donation_donation_changelist' %}?donor={{ original.pk }}">
-      {% trans "Donations" %}
-    </a>
-  </li>
-{% endif %}
-{{ block.super }}
+    {% if original.pk %}
+        <li>
+            <a href="{% url 'admin:fds_donation_donation_changelist' %}?donor={{ original.pk }}">{% trans "Donations" %}</a>
+        </li>
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html
index f950239ed..35a83d2ba 100644
--- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html
+++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/change_list.html
@@ -1,15 +1,18 @@
 {% extends "admin/change_list.html" %}
-
 {% load i18n %}
-
 {% block result_list %}
-<p>
-  Summe: {{ cl.amount_total_sum }}&nbsp;EUR
-  <br/>Durchschnitt: {{ cl.amount_total_avg }}&nbsp;EUR
-  <br/>Median: {{ cl.amount_total_median }}&nbsp;EUR
-  <br/>Summe letztes Jahr: {{ cl.amount_last_year_sum }}&nbsp;EUR
-  <br/>Durchschnitt letztes Jahr: {{ cl.amount_last_year_avg }}&nbsp;EUR
-  <br/>Wiederkehrend Monatssumme: {{ cl.total_amount_recurring }}&nbsp;EUR
-</p>
-{{ block.super }}
+    <p>
+        Summe: {{ cl.amount_total_sum }}&nbsp;EUR
+        <br />
+        Durchschnitt: {{ cl.amount_total_avg }}&nbsp;EUR
+        <br />
+        Median: {{ cl.amount_total_median }}&nbsp;EUR
+        <br />
+        Summe letztes Jahr: {{ cl.amount_last_year_sum }}&nbsp;EUR
+        <br />
+        Durchschnitt letztes Jahr: {{ cl.amount_last_year_avg }}&nbsp;EUR
+        <br />
+        Wiederkehrend Monatssumme: {{ cl.total_amount_recurring }}&nbsp;EUR
+    </p>
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html
index 585054b39..ccb9daefb 100644
--- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html
+++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/export_jzwb.html
@@ -1,34 +1,26 @@
 {% extends "helper/admin_base_action.html" %}
-
 {% load i18n l10n %}
-
 {% block action_title %}{{ headline }}{% endblock %}
-
 {% block breadcrumbs_action_label %}{{ headline }}{% endblock %}
-
 {% block action_content %}
-  <form action="" method="post">
-    {% csrf_token %}
-    <div>
-      <p>
-        {{ headline }}
-      </p>
-
-      {{ form.as_div }}
-
-
-      {% if select_across %}
-        <input type="hidden" name="select_across" value="1"/>
-        {# set invalid selected, so confirmation action path is chosen in admin #}
-        <input type="hidden" name="{{ action_checkbox_name }}" value="_" />
-      {% else %}
-        {% for obj in queryset %}
-            <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
-        {% endfor %}
-      {% endif %}
-
-      <input type="hidden" name="action" value="{{ actionname }}" />
-      <input type="submit" value="{% trans 'Execute' %}" />
-    </div>
-  </form>
+    <form action="" method="post">
+        {% csrf_token %}
+        <div>
+            <p>{{ headline }}</p>
+            {{ form.as_div }}
+            {% if select_across %}
+                <input type="hidden" name="select_across" value="1" />
+                {# set invalid selected, so confirmation action path is chosen in admin #}
+                <input type="hidden" name="{{ action_checkbox_name }}" value="_" />
+            {% else %}
+                {% for obj in queryset %}
+                    <input type="hidden"
+                           name="{{ action_checkbox_name }}"
+                           value="{{ obj.pk|unlocalize }}" />
+                {% endfor %}
+            {% endif %}
+            <input type="hidden" name="action" value="{{ actionname }}" />
+            <input type="submit" value="{% trans 'Execute' %}" />
+        </div>
+    </form>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html
index 5218801cf..0d1421e0b 100644
--- a/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html
+++ b/fragdenstaat_de/fds_donation/templates/admin/fds_donation/donor/merge_donors.html
@@ -1,70 +1,64 @@
 {% extends "helper/admin_base_action.html" %}
-
 {% load i18n l10n static %}
 {% load form_helper %}
-
-{% block action_title %}{% trans 'Merge Donors' %}{% endblock %}
-
+{% block action_title %}
+    {% trans 'Merge Donors' %}
+{% endblock %}
 {% block breadcrumbs_action_label %}
-  {% trans 'Merge Donors' %}
+    {% trans 'Merge Donors' %}
 {% endblock %}
-
 {% block action_content %}
-<form action="" method="post">{% csrf_token %}
-  <div>
-
-    <table>
-      <thead>
-        <tr>
-          <th>Field</th>
-          <th>Value</th>
-          {% for donor in queryset %}
-            <th>Donor {{ donor.id }}</th>
-          {% endfor %}
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Primary</td>
-          <td>-</td>
-          {% for donor in queryset %}
-            <td>
-              <label>
-                <input type="radio" name="primary" value="{{ donor.id }}">
-                Donor {{ donor.id }}
-              </label>
-            </td>
-          {% endfor %}
-        </tr>
-        {% for field in form %}
-          <tr>
-            <td>{{ field.label }}</td>
-            <td data-value="{{ field.value }}" data-field="{{ field.name }}">
-              {{ field }}
-            </td>
-            {% for donor in queryset %}
-              {% with val=donor|get_field_by_key:field.name %}
-                <td>
-                  <span data-donor="{{ donor.id }}" data-value="{% if val is None %}{% else %}{{ val }}{% endif %}" data-field="{{ field.name }}">
-                    {{ val }}
-                  </span>
-                </td>
-              {% endwith %}
-            {% endfor %}
-          </tr>
+    <form action="" method="post">
+        {% csrf_token %}
+        <div>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Field</th>
+                        <th>Value</th>
+                        {% for donor in queryset %}<th>Donor {{ donor.id }}</th>{% endfor %}
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Primary</td>
+                        <td>-</td>
+                        {% for donor in queryset %}
+                            <td>
+                                <label>
+                                    <input type="radio" name="primary" value="{{ donor.id }}">
+                                    Donor {{ donor.id }}
+                                </label>
+                            </td>
+                        {% endfor %}
+                    </tr>
+                    {% for field in form %}
+                        <tr>
+                            <td>{{ field.label }}</td>
+                            <td data-value="{{ field.value }}" data-field="{{ field.name }}">{{ field }}</td>
+                            {% for donor in queryset %}
+                                {% with val=donor|get_field_by_key:field.name %}
+                                    <td>
+                                        <span data-donor="{{ donor.id }}"
+                                              data-value="{% if val is None %}{% else %}{{ val }}{% endif %}"
+                                              data-field="{{ field.name }}">{{ val }}</span>
+                                    </td>
+                                {% endwith %}
+                            {% endfor %}
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+            <input type="hidden" name="action" value="merge_donors" />
+            <p>
+                <input type="submit" value="{% blocktrans %}Merge donors{% endblocktrans %}" />
+            </p>
+        </div>
+        {% for obj in queryset %}
+            <input type="hidden"
+                   name="{{ action_checkbox_name }}"
+                   value="{{ obj.pk|unlocalize }}" />
         {% endfor %}
-      </tbody>
-
-    </table>
-
-    <input type="hidden" name="action" value="merge_donors" />
-    <p>
-      <input type="submit" value="{% blocktrans %}Merge donors{% endblocktrans %}" />
-    </p>
-  </div>
-  {% for obj in queryset %}
-    <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
-  {% endfor %}
-</form>
-<script src="{% static 'js/merge_donors.js' %}"></script>
+    </form>
+    <script src="{% static 'js/merge_donors.js' %}"></script>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/base.html b/fragdenstaat_de/fds_donation/templates/fds_donation/base.html
index 10a0fa818..cf8cdb4b3 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/base.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/base.html
@@ -1,10 +1,8 @@
 {% extends "base.html" %}
-
 {% block extra_head %}
-  {{ block.super }}
-  <meta name="robots" content="noindex"/>
+    {{ block.super }}
+    <meta name="robots" content="noindex" />
 {% endblock %}
-
 {% block navbar %}
-  {% include "header_reduced.html" %}
+    {% include "header_reduced.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html
index 5e2ce6733..b33b294e0 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donation_progress_bar.html
@@ -1,20 +1,34 @@
 {% load i18n %}
 {% load humanize %}
-
 {% with amount_str=amount|intcomma donation_goal_str=donation_goal|intcomma reached_goal_str=reached_goal|intcomma %}
-<div>
-    <div class="progress" style="height: 25px; {% if amount > donation_goal %}background-color: #ffa5a5 {% endif %}">
-        {% if reached_goal %}
-            <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {{ reached_goal_perc }}%;" aria-valuenow="{{ reached_goal_perc }}" aria-valuemin="0" aria-valuemax="100">{{ reached_goal_str }}</div>
-        {% endif %}
-        <div class="progress-bar" role="progressbar" title="{% translate 'Donation progress' %}" style="width: {{ percentage }}%;" aria-valuenow="{{ percentage }}" aria-valuemin="0" aria-valuemax="100">{% if amount > donation_goal and not reached_goal %}{{ donation_goal_str }}{% endif %}</div>
-    </div>
-    <div class="text-end">
-        <small {% if not white_text %}class="text-body-secondary"{% else %}class="text-white"{% endif %}>
-          {% blocktrans %}
+    <div>
+        <div class="progress"
+             style="height: 25px;
+                    {% if amount > donation_goal %}background-color: #ffa5a5{% endif %}">
+            {% if reached_goal %}
+                <div class="progress-bar progress-bar-striped"
+                     role="progressbar"
+                     style="width: {{ reached_goal_perc }}%"
+                     aria-valuenow="{{ reached_goal_perc }}"
+                     aria-valuemin="0"
+                     aria-valuemax="100">{{ reached_goal_str }}</div>
+            {% endif %}
+            <div class="progress-bar"
+                 role="progressbar"
+                 title="{% translate 'Donation progress' %}"
+                 style="width: {{ percentage }}%"
+                 aria-valuenow="{{ percentage }}"
+                 aria-valuemin="0"
+                 aria-valuemax="100">
+                {% if amount > donation_goal and not reached_goal %}{{ donation_goal_str }}{% endif %}
+            </div>
+        </div>
+        <div class="text-end">
+            <small {% if not white_text %}class="text-body-secondary"{% else %}class="text-white"{% endif %}>
+                {% blocktrans %}
           {{ amount_str }}&nbsp;€ of {{ donation_goal_str }}&nbsp;€
           {% endblocktrans %}
-        </small>
+            </small>
+        </div>
     </div>
-</div>
 {% endwith %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html
index 0588d2818..87e712a43 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donationgiftform.html
@@ -1,12 +1,10 @@
 {% load form_helper %}
-
-<form action="{% url 'fds_donation:make_order' category=category %}" method="post">
-  {% csrf_token %}
-  {% render_form form %}
-  <input type="hidden" name="next" value="{{ next_url }}"/>
-  <p class="text-end">
-    <button type="submit" class="btn btn-primary">
-      Abschicken
-    </button>
-  </p>
+<form action="{% url 'fds_donation:make_order' category=category %}"
+      method="post">
+    {% csrf_token %}
+    {% render_form form %}
+    <input type="hidden" name="next" value="{{ next_url }}" />
+    <p class="text-end">
+        <button type="submit" class="btn btn-primary">Abschicken</button>
+    </p>
 </form>
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html
index 0238bb393..9181f7522 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/cms_plugins/donor_logic.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 {% if should_render %}
-{% for plugin in instance.child_plugin_instances %}
-  {% render_plugin plugin %}
-{% endfor %}
-{% endif %}
\ No newline at end of file
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
+{% endif %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html
index 525c51082..ef644dfae 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_complete.html
@@ -1,49 +1,46 @@
 {% extends "fds_donation/base.html" %}
-
 {% load i18n %}
 {% load static %}
-
 {% block app_body %}
-  <h2 class="text-center">{% translate "Thank you for your donation!" %}</h2>
-  <div class="row mt-5 justify-content-center">
-    <div class="col-6 col-md-2">
-        <img src="{% static 'img/onboarding/confirm-email.svg' %}" alt="{% translate 'You got mail' %}">
+    <h2 class="text-center">{% translate "Thank you for your donation!" %}</h2>
+    <div class="row mt-5 justify-content-center">
+        <div class="col-6 col-md-2">
+            <img src="{% static 'img/onboarding/confirm-email.svg' %}"
+                 alt="{% translate 'You got mail' %}">
+        </div>
     </div>
-  </div>
-  <div class="row mt-5 justify-content-center">
-    <div class="col-md-8 text-center">
-      <h3>
-        {% translate "Please confirm your email address!" %}
-      </h3>
+    <div class="row mt-5 justify-content-center">
+        <div class="col-md-8 text-center">
+            <h3>{% translate "Please confirm your email address!" %}</h3>
+        </div>
     </div>
-  </div>
-  <div class="row mb-5 justify-content-center">
-    <div class="col-md-8">
-      {% if email %}
-        <ol class="lead">
-          <li>
-            {% blocktranslate %}Check your emails for your account{% endblocktranslate %}<br/>
-            <strong class="highlight">{{ email }}</strong>
-          </li>
-          <li>
-            {% blocktranslate %}
+    <div class="row mb-5 justify-content-center">
+        <div class="col-md-8">
+            {% if email %}
+                <ol class="lead">
+                    <li>
+                        {% blocktranslate %}Check your emails for your account{% endblocktranslate %}
+                        <br />
+                        <strong class="highlight">{{ email }}</strong>
+                    </li>
+                    <li>
+                        {% blocktranslate %}
               Click the <strong class="highlight">confirmation link</strong> in the email from {{ SITE_NAME }}.
             {% endblocktranslate %}
-          </li>
-        </ol>
-      {% else %}
-        <p class="lead">
-          {% translate "Please go to your email account and <strong>click the confirmation link.</strong>" %}
-        </p>
-      {% endif %}
-      {% if receipt %}
-        <p class="lead">
-          {% blocktranslate %}
+                    </li>
+                </ol>
+            {% else %}
+                <p class="lead">
+                    {% translate "Please go to your email account and <strong>click the confirmation link.</strong>" %}
+                </p>
+            {% endif %}
+            {% if receipt %}
+                <p class="lead">
+                    {% blocktranslate %}
           The <strong>donation receipts</strong> that we send at the beginning of next year can only be sent to <strong>confirmed email addresses!</strong>
           {% endblocktranslate %}
-        </p>
-      {% endif %}
-
+                </p>
+            {% endif %}
+        </div>
     </div>
-  </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html
index aff4e51f8..cb1f5e42a 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_failed.html
@@ -1,21 +1,15 @@
 {% extends "fds_donation/base.html" %}
-
 {% load i18n %}
 {% load cms_tags %}
-
 {% block app_body %}
-  {% page_url "donate" as donate_url %}
-
-  <h2 class="text-center">{% translate "Donation failed!" %}</h2>
-
-  <p class="lead">
-    {% blocktranslate %}
+    {% page_url "donate" as donate_url %}
+    <h2 class="text-center">{% translate "Donation failed!" %}</h2>
+    <p class="lead">
+        {% blocktranslate %}
     Your donation with your chosen payment provider has not completed successfully.
     {% endblocktranslate %}
-  </p>
-  <p>
-    <a href="{{ donate_url }}" class="btn btn-lg btn-primary">
-      {% translate "Try again" %}
-    </a>
-  </p>
+    </p>
+    <p>
+        <a href="{{ donate_url }}" class="btn btn-lg btn-primary">{% translate "Try again" %}</a>
+    </p>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html
index 73ccc6bf1..2c9450df7 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donation_form.html
@@ -1,55 +1,41 @@
 {% extends "fds_donation/base.html" %}
-
 {% load form_helper %}
-
 {% block title %}Ihre Spende aktualisieren{% endblock %}
-
 {% block app_body %}
-<div class="row justify-content-center"><div class="col-8">
-
-<h3>
-  Legen Sie eine neue Spende an
-</h3>
-
-{% if subscriptions %}
-  <div class="alert alert-warning">
-    <p>Bitte beachten Sie, dass momentan folgende Dauerspenden für Sie aktiv sind:</p>
-    <ul>
-    {% for subscription in subscriptions %}
-      <li>
-        {{ subscription.plan }} (<a href="{{ subscription.get_absolute_url }}">Details / Kündigung</a>)
-      </li>
-    {% endfor %}
-    </ul>
-    <p>Wenn Sie Ihre Dauerspende anpassen wollen, können Sie diese auf der Detailseite kündigen und hier neu anlegen.</p>
-  </div>
-{% endif %}
-
-<form action="{{ form.action }}" method="POST" class="donation-form">
-  {% csrf_token %}
-  {{ form.form_settings }}
-  {{ form.reference }}
-  {{ form.keyword }}
-
-  {% for field in form %}
-    {% if field.is_hidden %}
-      {{ field }}
-    {% else %}
-      <div class="row">
-        <div class="col-12">
-          {% render_field field stacked=True %}
+    <div class="row justify-content-center">
+        <div class="col-8">
+            <h3>Legen Sie eine neue Spende an</h3>
+            {% if subscriptions %}
+                <div class="alert alert-warning">
+                    <p>Bitte beachten Sie, dass momentan folgende Dauerspenden für Sie aktiv sind:</p>
+                    <ul>
+                        {% for subscription in subscriptions %}
+                            <li>
+                                {{ subscription.plan }} (<a href="{{ subscription.get_absolute_url }}">Details / Kündigung</a>)
+                            </li>
+                        {% endfor %}
+                    </ul>
+                    <p>Wenn Sie Ihre Dauerspende anpassen wollen, können Sie diese auf der Detailseite kündigen und hier neu anlegen.</p>
+                </div>
+            {% endif %}
+            <form action="{{ form.action }}" method="POST" class="donation-form">
+                {% csrf_token %}
+                {{ form.form_settings }}
+                {{ form.reference }}
+                {{ form.keyword }}
+                {% for field in form %}
+                    {% if field.is_hidden %}
+                        {{ field }}
+                    {% else %}
+                        <div class="row">
+                            <div class="col-12">{% render_field field stacked=True %}</div>
+                        </div>
+                    {% endif %}
+                {% endfor %}
+                <button type="submit" class="btn btn-primary">Spenden</button>
+                <a href="{{ object.get_absolute_url }}"
+                   class="btn btn-secondary text-end">Abbrechen</a>
+            </form>
         </div>
-      </div>
-    {% endif %}
-  {% endfor %}
-
-  <button type="submit" class="btn btn-primary">
-    Spenden
-  </button>
-
-  <a href="{{ object.get_absolute_url }}" class="btn btn-secondary text-end">
-    Abbrechen
-  </a>
-</form>
-</div></div>
+    </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html
index 221a49fd4..dd3cd93ce 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_detail.html
@@ -1,82 +1,61 @@
 {% extends "base.html" %}
-
 {% load i18n %}
-
 {% block title %}Ihre Spende{% endblock %}
-
-{% block extra_head %}
-  <meta name="robots" content="noindex"/>
-{% endblock %}
-
+{% block extra_head %}<meta name="robots" content="noindex" />{% endblock %}
 {% block app_body %}
-<h1>
-  Vielen Dank für Ihre Spende!
-</h1>
-
-{% if last_donation and last_donation.payment.variant == 'banktransfer' %}
-<div class="mt-5 mb-5">
-  {% include "fds_donation/includes/banktransfer.html" with payment=last_donation.payment order=last_donation.payment.order %}
-</div>
-{% endif %}
-
-<p class="text-end">
-  <a href="{{ object.get_absolute_change_url }}" class="btn btn-secondary mb-2">
-    Spenderdaten aktualisieren
-  </a>
-  <a href="{{ object.get_absolute_donate_url }}" class="btn btn-secondary mb-2">
-    Neue Spende anlegen
-  </a>
-</p>
-
-<p>
-  Hier finden Sie eine Übersicht Ihrer Spenden.
-</p>
-
-{% if subscriptions %}
-  {% for subscription in subscriptions %}
-    <p>
-      Dauerspende {{ subscription.plan }} (<a href="{{ subscription.get_absolute_url }}">Details</a>)
+    <h1>Vielen Dank für Ihre Spende!</h1>
+    {% if last_donation and last_donation.payment.variant == 'banktransfer' %}
+        <div class="mt-5 mb-5">
+            {% include "fds_donation/includes/banktransfer.html" with payment=last_donation.payment order=last_donation.payment.order %}
+        </div>
+    {% endif %}
+    <p class="text-end">
+        <a href="{{ object.get_absolute_change_url }}"
+           class="btn btn-secondary mb-2">Spenderdaten aktualisieren</a>
+        <a href="{{ object.get_absolute_donate_url }}"
+           class="btn btn-secondary mb-2">Neue Spende anlegen</a>
     </p>
-  {% endfor %}
-{% endif %}
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Datum</th>
-      <th>Betrag</th>
-      <th>Verwendungszweck</th>
-      <th>Details</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for donation in donations %}
-    <tr>
-      <td>{{ donation.timestamp|date:"DATE_FORMAT" }}</td>
-      <td>{{ donation.amount }}&nbsp;Euro</td>
-      <td>{{ donation.purpose }}</td>
-      <td>
-        {% if donation.payment %}
-          {% if donation.payment.is_deferred %}
-            {% translate "Confirmation pending" %}
-          {% else %}
-            {{ donation.payment.get_status_display }}
-            <a href="{{ donation.order.get_absolute_url }}">Details</a>
-          {% endif %}
-        {% else %}
-          {% if donation.received_timestamp %}
-            Bestätigt
-          {% endif %}
-        {% endif %}
-      </td>
-    </li>
-  {% endfor %}
-  </tbody>
-</table>
-
-{% if donor.user %}
-  <hr class="mt-5"/>
-  {% include "account/includes/set_password_now.html" %}
-{% endif %}
-
+    <p>Hier finden Sie eine Übersicht Ihrer Spenden.</p>
+    {% if subscriptions %}
+        {% for subscription in subscriptions %}
+            <p>
+                Dauerspende {{ subscription.plan }} (<a href="{{ subscription.get_absolute_url }}">Details</a>)
+            </p>
+        {% endfor %}
+    {% endif %}
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Datum</th>
+                <th>Betrag</th>
+                <th>Verwendungszweck</th>
+                <th>Details</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for donation in donations %}
+                <tr>
+                    <td>{{ donation.timestamp|date:"DATE_FORMAT" }}</td>
+                    <td>{{ donation.amount }}&nbsp;Euro</td>
+                    <td>{{ donation.purpose }}</td>
+                    <td>
+                        {% if donation.payment %}
+                            {% if donation.payment.is_deferred %}
+                                {% translate "Confirmation pending" %}
+                            {% else %}
+                                {{ donation.payment.get_status_display }}
+                                <a href="{{ donation.order.get_absolute_url }}">Details</a>
+                            {% endif %}
+                        {% else %}
+                            {% if donation.received_timestamp %}Bestätigt{% endif %}
+                        {% endif %}
+                    </td>
+                </li>
+            {% endfor %}
+        </tbody>
+    </table>
+    {% if donor.user %}
+        <hr class="mt-5" />
+        {% include "account/includes/set_password_now.html" %}
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html
index 16fa00047..962f7ffd1 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/donor_form.html
@@ -1,29 +1,17 @@
 {% extends "fds_donation/base.html" %}
-
 {% load form_helper %}
-
 {% block app_body %}
-<div class="row justify-content-center"><div class="col-8">
-
-  <h3>
-  Aktualisieren Sie hier Ihre Spenderdaten.
-</h3>
-
-<p>
-  Auf Basis dieser Informationen lassen wir Ihnen Ihre Spendenbescheinigung zukommen.
-</p>
-
-<form method="post" action="">
-  {% csrf_token %}
-  {% render_form form %}
-
-  <button type="submit" class="btn btn-primary">
-    Spenderdaten aktualisieren
-  </button>
-
-  <a href="{{ object.get_absolute_url }}" class="btn btn-secondary text-end">
-    Abbrechen
-  </a>
-</form>
-</div></div>
-{% endblock %}
\ No newline at end of file
+    <div class="row justify-content-center">
+        <div class="col-8">
+            <h3>Aktualisieren Sie hier Ihre Spenderdaten.</h3>
+            <p>Auf Basis dieser Informationen lassen wir Ihnen Ihre Spendenbescheinigung zukommen.</p>
+            <form method="post" action="">
+                {% csrf_token %}
+                {% render_form form %}
+                <button type="submit" class="btn btn-primary">Spenderdaten aktualisieren</button>
+                <a href="{{ object.get_absolute_url }}"
+                   class="btn btn-secondary text-end">Abbrechen</a>
+            </form>
+        </div>
+    </div>
+{% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html
index 1d5f6134e..b535b73af 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/_donation_form.html
@@ -1,248 +1,188 @@
 {% load i18n %}
 {% load form_helper %}
-
-<form action="{{ form.action }}" method="POST" class="donation-form {% if object.extra_classes %}{{ object.extra_classes }}{% else %}text-bg-body text-body px-3 pt-3 pb-1{% endif %}">
-  {% csrf_token %}
-  {{ form.form_settings }}
-  {{ form.reference }}
-  {{ form.keyword }}
-  <fieldset>
-    <legend class="bg-primary text-white px-2 py-0 fw-bold">
-      {% if form.settings.title %}
-        {{ form.settings.title }}
-      {% else %}
-        {% trans "Your donation frees information" %}
-      {% endif %}
-    </legend>
-    {% if form.chosen_gift %}
-      {% if form.chosen_gift.is_hidden %}
-        {{ form.chosen_gift }}
-      {% else %}
-        <div class="row">
-          <div class="col-12">
-            {% render_field form.chosen_gift %}
-          </div>
-        </div>
-      {% endif %}
-    {% endif %}
-    <div class="row">
-      <div class="col-12">
-        {% render_field form.amount stacked=True %}
-      </div>
-    </div>
-    {% if form.interval.is_hidden %}
-      {{ form.interval }}
-    {% else %}
-      <div class="row">
-        <div class="col-12" data-group="interval">
-          {% render_field form.interval inline=True %}
-        </div>
-      </div>
-    {% endif %}
-    {% if form.purpose.is_hidden %}
-      {{ form.purpose }}
-    {% else %}
-    <div class="row">
-      <div class="col-12">
-        {% render_field form.purpose stacked=True %}
-      </div>
-    </div>
-    {% endif %}
-
-    {% if form.settings.collapsed %}
-      <button type="button" class="btn btn-primary btn-lg mb-3" data-bs-toggle="collapse" data-bs-target="#donation-form-detail" aria-expanded="false" aria-controls="donation-form-detail">
-        <span class="hideparent">
-          {% trans "Continue" %}
-        </span>
-      </button>
-    {% endif %}
-
-  </fieldset>
-
-  {% if form.settings.collapsed %}
-  <div class="collapse" id="donation-form-detail">
-  {% endif%}
-
-  <fieldset>
-    <legend class="bg-primary text-white px-2 py-0 fw-bold">
-      {% trans "Your details" %}
-    </legend>
-    <div class="row">
-      <div class="col-12 col-md-3">
-        {% render_field form.salutation stacked=True %}
-      </div>
-      <div class="col-12 col-md-9">
-        <div class="row">
-          <div class="col-sm-6">
-            {% render_field form.first_name stacked=True %}
-          </div>
-          <div class="col-sm-6">
-            {% render_field form.last_name stacked=True %}
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mt-3">
-      <div class="col-12">
-        {% render_field form.email stacked=True %}
-        <small class="mt-5">
-          <a href="#company-field" data-bs-toggle="collapse">
-            {% trans "&rarr; Do you want to donate as a company?" %}
-          </a>
-        </small>
-      </div>
-    </div>
-    <div class="row mt-3 collapse" id="company-field">
-      <div class="col-12">
-        {% render_field form.company_name stacked=True %}
-      </div>
-    </div>
-    <div class="row mt-3">
-      <div class="col-12">
-        {% render_field form.receipt inline=True %}
-      </div>
-    </div>
-    <div class="collapse" id="address-fields">
-      <div class="row">
-        <div class="col-12">
-          {% render_field form.address stacked=True %}
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-4">
-          {% render_field form.postcode stacked=True %}
-        </div>
-        <div class="col-8">
-          {% render_field form.city stacked=True %}
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-12">
-          {% render_field form.country stacked=True %}
-        </div>
-      </div>
-    </div>
-  </fieldset>
-
-  {% if form.chosen_gift %}
+<form action="{{ form.action }}"
+      method="POST"
+      class="donation-form {% if object.extra_classes %}{{ object.extra_classes }}{% else %}text-bg-body text-body px-3 pt-3 pb-1{% endif %}">
+    {% csrf_token %}
+    {{ form.form_settings }}
+    {{ form.reference }}
+    {{ form.keyword }}
     <fieldset>
-      <legend class="bg-primary text-white px-2 py-0 fw-bold">
-        {% trans "Shipping details" %}
-      </legend>
-      <div class="row">
-        <div class="col-12">
-          <button type="button" class="btn btn-light mb-2 ms-auto" data-fillfields="shipping">
-            {% trans "Use receipt address" %}
-          </button>
+        <legend class="bg-primary text-white px-2 py-0 fw-bold">
+            {% if form.settings.title %}
+                {{ form.settings.title }}
+            {% else %}
+                {% trans "Your donation frees information" %}
+            {% endif %}
+        </legend>
+        {% if form.chosen_gift %}
+            {% if form.chosen_gift.is_hidden %}
+                {{ form.chosen_gift }}
+            {% else %}
+                <div class="row">
+                    <div class="col-12">{% render_field form.chosen_gift %}</div>
+                </div>
+            {% endif %}
+        {% endif %}
+        <div class="row">
+            <div class="col-12">{% render_field form.amount stacked=True %}</div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-12 col-md-9">
-          <div class="row">
-            <div class="col-sm-6">
-              {% render_field form.shipping_first_name stacked=True %}
+        {% if form.interval.is_hidden %}
+            {{ form.interval }}
+        {% else %}
+            <div class="row">
+                <div class="col-12" data-group="interval">{% render_field form.interval inline=True %}</div>
             </div>
-            <div class="col-sm-6">
-              {% render_field form.shipping_last_name stacked=True %}
+        {% endif %}
+        {% if form.purpose.is_hidden %}
+            {{ form.purpose }}
+        {% else %}
+            <div class="row">
+                <div class="col-12">{% render_field form.purpose stacked=True %}</div>
             </div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <div class="row">
-          <div class="col-12">
-            {% render_field form.shipping_address stacked=True %}
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-4">
-            {% render_field form.shipping_postcode stacked=True %}
-          </div>
-          <div class="col-8">
-            {% render_field form.shipping_city stacked=True %}
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-12">
-            {% render_field form.shipping_country stacked=True %}
-          </div>
-        </div>
-      </div>
+        {% endif %}
+        {% if form.settings.collapsed %}
+            <button type="button"
+                    class="btn btn-primary btn-lg mb-3"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#donation-form-detail"
+                    aria-expanded="false"
+                    aria-controls="donation-form-detail">
+                <span class="hideparent">{% trans "Continue" %}</span>
+            </button>
+        {% endif %}
     </fieldset>
-  {% endif %}
-
-  <fieldset>
-    <legend class="bg-primary text-white px-2 py-0 fw-bold">
-      {% trans "Payment method" %}
-    </legend>
-    <div class="row">
-      <div class="col-12">
-        <div class="d-none onion-show alert alert-danger">
-          {% trans "Donations via credit card, SEPA or Paypal do not work via our .onion-site." %}
-        </div>
-        <div class="mb-3">
-          {% render_field form.payment_method stacked=True %}
-        </div>
-        <p class="text-body-secondary">
-          <i class="fa fa-lock"></i>
-          {% trans "Your payment details will be transmitted securely in the next step." %}</p>
-      </div>
-    </div>
-  </fieldset>
-  <fieldset>
-    <legend class="bg-primary text-white px-2 py-0 fw-bold">
-      {% trans "Stay up to date" %}
-    </legend>
-    <div class="row">
-      <div class="col-md-6 mt-2">
-        <div class="card border-primary">
-          <div class="card-header"><h4>{{ form.contact.label }}</h4></div>
-          <div class="card-body">
-            <p>
-              {% trans "Receive our newsletter about freedom of information in German." %}
-            </p>
-            {% render_field form.contact stacked=True show_label=False %}
-          </div>
-        </div>
-      </div>
-      <div class="col-md-6 mt-2">
-        <div class="card">
-          {% if request.user.is_authenticated %}
-            <div class="card-header">
-              <h4>{% trans "FragDenStaat Account" %}</h4>
+    {% if form.settings.collapsed %}<div class="collapse" id="donation-form-detail">{% endif %}
+        <fieldset>
+            <legend class="bg-primary text-white px-2 py-0 fw-bold">{% trans "Your details" %}</legend>
+            <div class="row">
+                <div class="col-12 col-md-3">{% render_field form.salutation stacked=True %}</div>
+                <div class="col-12 col-md-9">
+                    <div class="row">
+                        <div class="col-sm-6">{% render_field form.first_name stacked=True %}</div>
+                        <div class="col-sm-6">{% render_field form.last_name stacked=True %}</div>
+                    </div>
+                </div>
+            </div>
+            <div class="row mt-3">
+                <div class="col-12">
+                    {% render_field form.email stacked=True %}
+                    <small class="mt-5">
+                        <a href="#company-field" data-bs-toggle="collapse">{% trans "&rarr; Do you want to donate as a company?" %}</a>
+                    </small>
+                </div>
+            </div>
+            <div class="row mt-3 collapse" id="company-field">
+                <div class="col-12">{% render_field form.company_name stacked=True %}</div>
+            </div>
+            <div class="row mt-3">
+                <div class="col-12">{% render_field form.receipt inline=True %}</div>
+            </div>
+            <div class="collapse" id="address-fields">
+                <div class="row">
+                    <div class="col-12">{% render_field form.address stacked=True %}</div>
+                </div>
+                <div class="row">
+                    <div class="col-4">{% render_field form.postcode stacked=True %}</div>
+                    <div class="col-8">{% render_field form.city stacked=True %}</div>
+                </div>
+                <div class="row">
+                    <div class="col-12">{% render_field form.country stacked=True %}</div>
+                </div>
             </div>
-            <div class="card-body">
-              {% trans "You can manage your donation in your FragDenStaat account." %}
+        </fieldset>
+        {% if form.chosen_gift %}
+            <fieldset>
+                <legend class="bg-primary text-white px-2 py-0 fw-bold">{% trans "Shipping details" %}</legend>
+                <div class="row">
+                    <div class="col-12">
+                        <button type="button"
+                                class="btn btn-light mb-2 ms-auto"
+                                data-fillfields="shipping">{% trans "Use receipt address" %}</button>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12 col-md-9">
+                        <div class="row">
+                            <div class="col-sm-6">{% render_field form.shipping_first_name stacked=True %}</div>
+                            <div class="col-sm-6">{% render_field form.shipping_last_name stacked=True %}</div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <div class="row">
+                        <div class="col-12">{% render_field form.shipping_address stacked=True %}</div>
+                    </div>
+                    <div class="row">
+                        <div class="col-4">{% render_field form.shipping_postcode stacked=True %}</div>
+                        <div class="col-8">{% render_field form.shipping_city stacked=True %}</div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">{% render_field form.shipping_country stacked=True %}</div>
+                    </div>
+                </div>
+            </fieldset>
+        {% endif %}
+        <fieldset>
+            <legend class="bg-primary text-white px-2 py-0 fw-bold">{% trans "Payment method" %}</legend>
+            <div class="row">
+                <div class="col-12">
+                    <div class="d-none onion-show alert alert-danger">
+                        {% trans "Donations via credit card, SEPA or Paypal do not work via our .onion-site." %}
+                    </div>
+                    <div class="mb-3">{% render_field form.payment_method stacked=True %}</div>
+                    <p class="text-body-secondary">
+                        <i class="fa fa-lock"></i>
+                        {% trans "Your payment details will be transmitted securely in the next step." %}
+                    </p>
+                </div>
             </div>
-          {% else %}
-            <div class="card-header">
-              <h4>{% trans "Get an account" %}</h4>
+        </fieldset>
+        <fieldset>
+            <legend class="bg-primary text-white px-2 py-0 fw-bold">{% trans "Stay up to date" %}</legend>
+            <div class="row">
+                <div class="col-md-6 mt-2">
+                    <div class="card border-primary">
+                        <div class="card-header">
+                            <h4>{{ form.contact.label }}</h4>
+                        </div>
+                        <div class="card-body">
+                            <p>{% trans "Receive our newsletter about freedom of information in German." %}</p>
+                            {% render_field form.contact stacked=True show_label=False %}
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6 mt-2">
+                    <div class="card">
+                        {% if request.user.is_authenticated %}
+                            <div class="card-header">
+                                <h4>{% trans "FragDenStaat Account" %}</h4>
+                            </div>
+                            <div class="card-body">{% trans "You can manage your donation in your FragDenStaat account." %}</div>
+                        {% else %}
+                            <div class="card-header">
+                                <h4>{% trans "Get an account" %}</h4>
+                            </div>
+                            <div class="card-body">
+                                <div class="mb-3">
+                                    <label>{{ form.account.label }}</label>
+                                    {% render_field form.account stacked=True show_label=False %}
+                                </div>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
             </div>
-            <div class="card-body">
-              <div class="mb-3">
-                <label>{{ form.account.label }}</label>
-                {% render_field form.account stacked=True show_label=False %}
-              </div>
+        </fieldset>
+        <div class="row mt-3">
+            <div class="col-12 col-md-6 text-end ms-auto d-grid gap-2">
+                {% if form.test %}
+                    {% render_field form.test %}
+                {% endif %}
+                <button id="donate-now"
+                        type="submit"
+                        class="btn btn-lg btn-primary btn-threed mb-3">{% trans "Donate now" %}</button>
             </div>
-          {% endif %}
         </div>
-      </div>
-    </div>
-  </fieldset>
-
-  <div class="row mt-3">
-    <div class="col-12 col-md-6 text-end ms-auto d-grid gap-2">
-      {% if form.test %}
-        {% render_field form.test %}
-      {% endif %}
-      <button id="donate-now" type="submit" class="btn btn-lg btn-primary btn-threed mb-3">
-        {% trans "Donate now" %}
-      </button>
-    </div>
-  </div>
-
-  {% if form.settings.collapsed %}
-    </div>
-  {% endif %}
-
+        {% if form.settings.collapsed %}</div>{% endif %}
 </form>
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html
index 551c679f7..2abcc49d6 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/donation.html
@@ -1,14 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
-
-{% block title %}{% trans "Donation" %}{% endblock title %}</title>
-
+{% block title %}
+    {% trans "Donation" %}
+{% endblock title %}
+</title>
 {% block top_block %}{% endblock %}
-
 {% block navbar %}
-  {% include "header_minimal.html" %}
+    {% include "header_minimal.html" %}
 {% endblock %}
-
 {% block app_body %}
-  {% include "fds_donation/forms/_donation_form.html" %}
+    {% include "fds_donation/forms/_donation_form.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html
index acb21a29a..307dc4cd1 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/forms/widgets/amount_input.html
@@ -1,20 +1,24 @@
 {% load i18n %}
-
 <div class="amount-group {% if 'is-invalid' in widget.attrs.class %}is-invalid{% endif %}">
-  {% if presets %}
-    <div class="btn-toolbar">
-    {% for preset in presets %}
-      <div class="btn-group me-2 mt-2">
-        <button type="button" class="btn {% if preset|stringformat:'d' == widget.value %}btn-primary{% else %}btn-outline-primary{% endif %}" data-value="{{ preset }}" data-target="{{ widget.attrs.id }}">{{ preset }} {{ currency }}</button>
-      </div>
-    {% endfor %}
-      <div class="btn-group me-2 mt-2">
-        <button type="button" class="btn btn-outline-secondary" data-focus="{{ widget.attrs.id }}">{% trans "Other amount" %}</button>
-      </div>
+    {% if presets %}
+        <div class="btn-toolbar">
+            {% for preset in presets %}
+                <div class="btn-group me-2 mt-2">
+                    <button type="button"
+                            class="btn {% if preset|stringformat:'d' == widget.value %}btn-primary{% else %}btn-outline-primary{% endif %}"
+                            data-value="{{ preset }}"
+                            data-target="{{ widget.attrs.id }}">{{ preset }} {{ currency }}</button>
+                </div>
+            {% endfor %}
+            <div class="btn-group me-2 mt-2">
+                <button type="button"
+                        class="btn btn-outline-secondary"
+                        data-focus="{{ widget.attrs.id }}">{% trans "Other amount" %}</button>
+            </div>
+        </div>
+    {% endif %}
+    <div class="input-group mt-2" style="max-width: 200px">
+        {% include "django/forms/widgets/text.html" %}
+        <span class="input-group-text">{{ currency }}</span>
     </div>
-  {% endif %}
-  <div class="input-group mt-2" style="max-width: 200px">
-    {% include "django/forms/widgets/text.html" %}
-    <span class="input-group-text">{{ currency }}</span>
-  </div>
 </div>
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html
index 2546868bc..94ae49a92 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer.html
@@ -1,29 +1,35 @@
 {% if not payment.is_confirmed %}
-  <div class="alert alert-info">
-    Der Status von Spenden per Überweisung aktualisiert sich erst zu Beginn des Folgemonats, da erst dann die Kontoauszüge abgeglichen werden.
-  </div>
-  <div class="card border-danger">
-    <div class="card-header">
-      {% if order.is_recurring %}
-      <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
-    {% else %}
-      <h3>Bitte überweisen Sie {{ order.total_gross }}&nbsp;EUR an</h3>
-    {% endif %}
+    <div class="alert alert-info">
+        Der Status von Spenden per Überweisung aktualisiert sich erst zu Beginn des Folgemonats, da erst dann die Kontoauszüge abgeglichen werden.
     </div>
-    <div class="card-body">
-      <p>
-        <strong>Kontoinhaber:</strong>&nbsp;Open Knowledge Foundation Deutschland e.V.<br>
-        <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00<br>
-        <strong>BIC:</strong>&nbsp;GENODEM1GLS<br>
-        <strong>Betrag:&nbsp;</strong>{{ order.total_gross }}&nbsp;EUR<br/>
-        {% if order.is_recurring %}
-          <strong>Turnus:&nbsp;</strong> {{ order.subscription.plan.get_interval_description }}<br/>
-        {% endif %}
-        <strong>Verwendungszweck:&nbsp;</strong>{{ order.remote_reference }}<br>
-        <strong>BLZ:</strong>&nbsp;430 609 67 (GLS Bank)
-      </p>
-      {% comment %} <p>
-        Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:<br/>
+    <div class="card border-danger">
+        <div class="card-header">
+            {% if order.is_recurring %}
+                <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
+            {% else %}
+                <h3>Bitte überweisen Sie {{ order.total_gross }}&nbsp;EUR an</h3>
+            {% endif %}
+        </div>
+        <div class="card-body">
+            <p>
+                <strong>Kontoinhaber:</strong>&nbsp;Open Knowledge Foundation Deutschland e.V.
+                <br>
+                <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00
+                <br>
+                <strong>BIC:</strong>&nbsp;GENODEM1GLS
+                <br>
+                <strong>Betrag:&nbsp;</strong>{{ order.total_gross }}&nbsp;EUR
+                <br />
+                {% if order.is_recurring %}
+                    <strong>Turnus:&nbsp;</strong> {{ order.subscription.plan.get_interval_description }}
+                    <br />
+                {% endif %}
+                <strong>Verwendungszweck:&nbsp;</strong>{{ order.remote_reference }}
+                <br>
+                <strong>BLZ:</strong>&nbsp;430 609 67 (GLS Bank)
+            </p>
+            {% comment %} <p>
+        Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:<br />
         {% if order.is_recurring %}
           <a class="btn btn-secondary" href="bank://periodicsinglepaymentsepa?name={{ 'Open Knowledge Foundation Deutschland e.V.'|urlencode }}&amp;iban=DE36430609671173893200&amp;bic=GENODEM1GLS&amp;amount={{ order.subscription.plan.amount }}&amp;reason={{ order.remote_reference }}&amp;periodictimeunit=M&amp;periodictimeunitrotation={{ order.subscription.plan.interval }}">
         {% else %}
@@ -31,10 +37,8 @@ <h3>Bitte überweisen Sie {{ order.total_gross }}&nbsp;EUR an</h3>
         {% endif %}
           Direktlink für Banking-App
         </a>
-      </p> {% endcomment %}
-      <p>
-        Vielen Dank!
-      </p>
+            </p> {% endcomment %}
+            <p>Vielen Dank!</p>
+        </div>
     </div>
-  </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html
index 03eda8e06..b310bfb06 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/includes/banktransfer_email.html
@@ -1,18 +1,24 @@
 {% if not payment.is_confirmed %}
-  {% if order.is_recurring %}
-    <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
-  {% else %}
-    <h3>Bitte überweisen Sie {{ order.total_gross }}&nbsp;EUR an</h3>
-  {% endif %}
-  <p>
-    <strong>Kontoinhaber:&nbsp;</strong>Open Knowledge Foundation Deutschland e.V.<br>
-    <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00<br>
-    <strong>BIC:&nbsp;</strong>GENODEM1GLS<br>
-    <strong>Betrag:&nbsp;</strong>{{ order.total_gross }}&nbsp;EUR<br>
     {% if order.is_recurring %}
-      <strong>Turnus:&nbsp;</strong> {{ order.subscription.plan.get_interval_description }}<br>
+        <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
+    {% else %}
+        <h3>Bitte überweisen Sie {{ order.total_gross }}&nbsp;EUR an</h3>
     {% endif %}
-    <strong>Verwendungszweck:&nbsp;</strong>{{ order.remote_reference }}<br>
-    <strong>BLZ:&nbsp;</strong>430 609 67 (GLS Bank)
-  </p>
-{% endif %}
\ No newline at end of file
+    <p>
+        <strong>Kontoinhaber:&nbsp;</strong>Open Knowledge Foundation Deutschland e.V.
+        <br>
+        <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00
+        <br>
+        <strong>BIC:&nbsp;</strong>GENODEM1GLS
+        <br>
+        <strong>Betrag:&nbsp;</strong>{{ order.total_gross }}&nbsp;EUR
+        <br>
+        {% if order.is_recurring %}
+            <strong>Turnus:&nbsp;</strong> {{ order.subscription.plan.get_interval_description }}
+            <br>
+        {% endif %}
+        <strong>Verwendungszweck:&nbsp;</strong>{{ order.remote_reference }}
+        <br>
+        <strong>BLZ:&nbsp;</strong>430 609 67 (GLS Bank)
+    </p>
+{% endif %}
diff --git a/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html b/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html
index 076395775..54c31eb14 100644
--- a/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html
+++ b/fragdenstaat_de/fds_donation/templates/fds_donation/pdf/zwb.html
@@ -1,8 +1,9 @@
-{% load i18n %}<!doctype html>
+{% load i18n %}
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <style>
+    <head>
+        <meta charset="utf-8">
+        <style>
         @charset "UTF-8";
         @page {
           margin: 1.5cm;
@@ -118,151 +119,119 @@
           hyphens: auto;
         }
       
-    </style>
-    <title>Zuwendungsbestätigung für {{ object.get_full_name }} {{ year }}</title>
-    <meta name="author" content="{{ SITE_NAME }}">
-  </head>
-
-  <body>
-      <section>
-        <div class="box">
-          <small>Aussteller (Bezeichnung und Anschrift der steuerbegünstigten Einrichtung):</small>
-          
-          <img class="logo" alt="OKF Logo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAYAAAA5ZDbSAAAACXBIWXMAAAJQAAACUAHIS4ZAAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAE+JJREFUeJztnXucXVV1x78zmcwwkBePAAmBBJBXHqJEECPvEgShgPiJlUcBpaKmVUqVIg8hgJUgKlAQCRQCaAW1lQKxKgGB8pQCSqARSHgkhYRH0pBJQshj5vaP392fs/Y+596599xzJ/fOnN/nsz9zZ69z9tlnv9baa629DuTIkSNHjhw5cuTIkSNHDoNBm7oCTYKpwAHAUmDNJq5LjjpgDlAAuoFrN3FdqkLrpq5AE6ATOLT4uxV4ZRPWJUcd8Gk0e13aLaNyxwFXAO0ZlTfgsBkwATgIOAFoS1nOtUSdm9XsHQw8XizzGeBDGZU7oPAx/Jk3OmU5C00ZV2dTNX6IX7eZGZU7oDAOvxEnJVxzBXAdcCEaECH2Cso4IoN6HQ30mDKfIl+mU2EofuccmnDNIkM/K4H+DUNfjZb9WrAjsMyUuQLYucYyy6I/S9GrgA/M/9sE9FZge/P/mwllHGV+PxCUVy3agDuArU3eGcBrNZQ54PEm0Wz5SkDbDn+GTwnoQ1CHOvqXa6zLlcHzrqmxvAGBFmAiWl7PT6A/R9SgFwa0j+I3+NiAfkIvdIDTgJ0qqOdR+Hz3aaCjgvsGPM7G52eh6vUBQ78qoB1jaD3EG/wmQ5+X8OzdgA3AOuAGtCIkYQzwrimrC9i9/Gtlh2bnwf9lfo9As9Jiufm9dUCz26ZlqKMcWvD5768Tnn0h4qvtaCYn6fUd37X8/yvAywnX5khAK/7sODegX29o/xnQZhjaHwNauHwfFNB3RbPX0X9Qon4zg3Ku6/2VcoT4d6IGvC+gXWZoTwU0uwSHM/QCQ3sPaZ4sbjX0tSQrUY5Exgl33XNIr52jDFqJ86/p+I1t96p/b2ihmvHXhnZjQHvM0O4MaOHs/WFCPbdHpkV3zSpgj7JvNsDRDpwKzEf8cgtD2wN/GTzE0E4x+SuDMv9kaDNM/lbARkM7NbhvNuVnbyu+cFcATq7gHQc09sNvsL8N6P9raJeZ/COD+6xK8B2Tf6bJP8nkd+NLx+HsDSVzgO8Ez7yhslfM8SBRo72Kbx26zdAeN/n74jf2qGJ+O/6+9Ghzz09N/h+COtxiaGuBHQL6ofizfx45360Y4Ww80dBONfkbgGHF/G3QjDq7eM3QYn4H8HdF2q1E5rpW4G1T1sXmGWPRVsrRQsvSdsT57p7pXrX5kdZo/iy+VNpSzN8B+A3wTbTFSbu/70D71HuQcWE/Q7uZ0rO3FZiLPwD/OmUdmh4noFmWpFrsDZY/FoCPZ1ivEJsRDZRw9oZ65EuCet1Ux3o1NI4H1hM1RKgfDrEFvhQ7CGmB7qW+nRtiNNpKrSM+ew/B57svAJtn9NwO4IsZldUnOAjxJjvaLypx7b7AS8VrPmfyN6XQMhb4K/P/tsASondZDYzP6FlTgP8heau2SRHqcUMciBTutpNDl5UOfFPf00T8tlHQijRn9j1Oy6DcYYgFWC3YckobM/ocXydS/40qcc0nkeLBNs4VwTXOxPYLYMu61LQ2tAHfI9puzc6gzGPx9/QuPUyyubLPsQv+Evw28JkS134M+D/8F7kyuGbf+lQzUxyNOsBq13akOhlhO+B24h37HrJ1N4zVb398PyeXZgPDE66fjJYfe+0PaLzluBrsjDwxVwL7VHD9NHyLmEv3ooHScBgGzCJe4UXAYQnXh538GnHbbbNgPPAW0bu8RemldWfiPNzd01BCVSkchS9hFhC/moW/nAF8BI3ixWiZb1YMQwKhe9+fETc1tqFlN9xN9KBluqkG90jgV8RH6SvotJ7FJKTMb3aMRFav64nzzg8ju3RSexzeh3XMHNOI89oNaHvUH52+Q6l/M2SStNow1wbXEF/RmhI7AfcTH73PkCyA1YpOIlebi4G7kUvPUCTAzEKsYST1beADgT8Tf+8/0Ry7hKrQgmyvq4le9K4My+9Ae++jkUqxgD+w7sI/jjIVeWSsBX5eLCPLQ/HH45slC+gA+TmkPwzXMDiC0hLkLsAjyOi+bUbP+yoS6u5Gneoa9AvI7aZQfObhhjYeeLH4+xfF+xajIytZ6JPbidSNTmHRL1x3OpC4342Ww08mXNNGNvbSI9GAcRadHtRxLxf//ynyZiygpdLajieb36cj74sCMojsTDb70P2R/HEmyfv7ptzzf4k4z3kaNW6WS9P3UYc+jhzd1hSfdSvw4+LvJUQusu8C5xV/r0LblQIaiPsRCUE3Ial+DTLs1yoIJvH4YajTn6dvLWOZ4AIiHhim14F/qLH8Echb4x9NuRcD/0w0A+2pB9fZ3eb3i8Dvir+fwp+9E4kEozVk65mxDxLwrBxya4blV4Tr0Yy7Bm1x0ij7RyKp9Q3inRz6L1eDYcCTqAN2IPJg3IDMis7efDuRRca6wT5a/Psk0eGym4lm7434Pl5fQNLu/WhgpcXHkY9X0qB/nz5WcIRi/UYkLMxCHT6yirKcy+s8U145c2Jv+BtTzny0tDqjxULgP4iW4NfNb3ePs2K9Z/Kc9mk9vrP8bUjSdvffR3qeuSdxibobufpMow+l6pEJFUlKr6BZciY6Td8bWlBj3Uj6RjoNrSbfNvV4CS35trNc/a2nRanUQzTrnyDi4/OLz3OzfA0amLVI1261WYFWx02ilh2KJMrZ+PEpeksLi/ecTn1UjkegzngDSc7fCp79e/O/9V2uJr1P1JlXEw2QFUi1+jnkOXlkync4FDnj1RopIFNsj5aQa9DssJ4G5dJStLc8C21HarVpXkY0M3vQSjDDPG8Z6Ts2TH82z1qKjpreY+ivkr2KdTBqp+mINfwo4/IrxjZIQ3MV6vBKlsEC2qJ8L+UzD0Ss40h8oe01pJ2qhKWkSa8X39N6nywgOd5HtRgN/CUapHOJVg+X3sngGZlgCNIOzUAVLbU9KpB81KM3tKO97Fq0Pz0A3/uhB3/LkVXaQCSkuf9nIgXI+aQ/pX80vnN9uVTXAC1p0Yk64VykxbLS6gkpypuKP0N70P71BipvqFrT0+ik4p34FqFTUrzPPr08ayUSxr5L/GhMQ2IwcgE9l3ikm0qxJ1JQOAnXLmP1Wp7tMv1SkNcN/Baxjmox2LyH237eTnayiodG14NujvjsH5ChYD5qhC+TfOg69MxsQbPgMOIenjcjwSwJJ6PYGiGWoZ3Cv6CO2g/4N7RPrgYnI6PGs9Q5PHGlHdyK1GldaAnpQluHleb/8G8WOAwtVxZrkA15FNqOuRFfoPToH4z0498ncpyfhE4hJOERfI+TRcVnLgb2Rh6h7iDb4Ql1bBhUqj0ZSvWHqdwAcJ1+D2rgarAEeVkegGZuG1LchzEzQhyAtjZdSE35MFK/LkSxOqzNdzcUkMxiXPD/WEqbPifQwB1cKax9NW1KE0j7IOCzaJYcjPaIs9CSHW4resx9Zwe0GYZ2azFvYvH/qVW8wwok4F2GtjhpTxtMQ4Lb80gjuBipW9127P6U5cZQ6QzuBn6JlO3DkcJ/eDFVqroLQyhUgm+ihqwV56OBsRQJNKdVef9q1BEL0LZwf8Q+OtBgCyMO9IbhaEUqhcyCpFXawW/iHwALy3CdHQ4A+/fRFPXLyldrMOK5S5GgZjEXXxZ5Dnk/WgxBvHfvhLKrFbDAj8mVhMxUmVlYMDYij4XlvV2YAkcRDZCdUCd9BDX0HqQb6aFgORh1oEOST9Z6tFV6G61mTohcgdSW1eI5ZL9eV0zvI0XK6mL5S1KUmYhGd/w6BylHxlLbbF6P+B3Ej3ceQu/26XY0uEYgV6Dlxb8vUloSL4d5JIdHzBz16mA348YRSaAvIP5XDUYTXy5Bo3wt/swrh8vR8gy1hVbYsZj+wuTdQlwKbxik7eAtUeOPQjZNm1x+iF9RfQc/jJbQRUijBFqiJwOfKHPffyOlRxfi/S6m5aeIqxdfJ64gCRUdy1G4wwWog/dAeuI20sWdPAN5ibyMlv6XkUJnY4qyMsNXkVotVBdWmp5J+dyPom3OH3spv6fE/aBBMh1/azWxzPWPlHjGKnTe6Di0euxB6TPQ5WDDL7q0AUnqc5HEfxbaHu5CDerLamZwJ+nCEyxFM/C5FPcORV4WVpgqoBnag2azkzhbiEcKGIRWlMPwo7uDjAelVJXjzO9VxTQadeqJxbQSqSm/VOnLGCRFGWojWgVDrEas6rVqH1RNBy8qke8kSZuWIknwpWLl0mIV8tQ4AjnJ/RL5W08nWZsVRpsth0r55lD0PpcU/z8VLc/DUacXqnimwwPIULI7lfled5L8yYFeUY2xYRziX44fLkKdWG++sQuaaeOBf8I/Y7wEzaphCfdlgdX4gtzDyFV3MxSM5UE0i2tBO+L3E9A7ulk8kWjVWUh2H+SqC0YhC1D43YRKYUMIFlDHzsQPjFaP5HjuqyavB/gJlYXyrxUj0amQLD7nUxe0IWW/8+NaTDoTpfu8zTI0g47FDyb6OtnahT8g8qbsBi5Fe/IV5ppvpXgPkFfL2SSbI5sSD+M3XjkdbCl0oiMnI5Be2fmBbSTSMbvZlVUn/wY/lNOdiF9ejZbMNPG6tiVyDOxG0nr4GYKmg/NZXo+sJPunLKcNnRx0Df4O4oPudGA3fgzoNGkjWmXcYDkH/0T+M6iT0xoDbPBy94y+WOrrijFIcZBFrCv3ocgnkAT6BFFjXUW0z7VRXytJXUQz63dEznYfIK2VDTEchnqqBlORXdz5daUxwPRrtBOd3b2XqNEvR4Z81ykuXP9aotAR1tvT8VfntOcc+dzvM4hss+8gqfZcJDVn4Q89Ap15OjaDshoKQ1BD/Z7a/MEuIuqs25AB3f0/kyju1BwivvyMucZpxR4gOrZyLdFgeBJ9N9jN6vmoU2o5/V+p3rwpsTlSvVk31zQutA4jgIeQILQVkTP8AmTMd8+wYX5n4w+KArLozDH3fs1ccyoy5BeQoLhVDfXdG7GBmUS+XP0C7ajRknji82XuqwQdyD/rKlPmp4iCiy0g2l5tQAKTE8bc7w+Qdcndf0CxXgUkQQ9BMaprXZZtsPA30IG9LGOB9Dla0bJZ6vDaXLLbHhyDdLQ/R9o2t+c+j0g4mkd0mn8d/mfb9yGKfnsdUQyPRSR7cFSLD5N8nutZfLNjU6AFdazbuoTpUdI5i/eGzdEB6ouJZuwoxDsLyNHOzeb3kX3a1emzRI547yLL04lkG5d6PBErSBrsSTbvhsPh+IKMTU+QHKdyBxTGKCvHg0605F6Klm+nEPk6UbiHLjQQ3ay9qFi3+xDfzfLUYChIHkXEAmzaAHw+w+dmjqSgK24Z+nSJew4m4s2hwT0LtCOefB6aQSci6f2hIv0SpG5Mo1mrBKej7VroatSKBpKN49lFAwX8TsIQfAnZhStKMlS3oIa1x057kBKgv2AK0V77JZJjY22BtoxdaHVpeHwDCSZnUnrJHYrMa+FMv53+9QEpF+jFpWWUFqhG02An/kuhnfL8ay8ioceltSioikVWXyzZlBiGr2kroBWrGoeEpsLJxA9pLyIejPNgJMk243K9H3IhchhE/PvBBXSIvd9E2O1AsT3Cl5xD3PgwkSgc0gc0uFQZ4ECku34X+U9bnET8HNVjNLhQVQnG4Ft7nDA1k7jwNYbITOfS1/qsprVhd3xP06SPfU0hrs1bRHXxxhoKh+B/u8ApEZJcT7YmzpsvNfQOGt9megWqd+jVabEDvm15dh/Uqy5oIx4p70mSvQc7ifsg/wRfQfBttMTNoDF4Vyva49p4my7IW2/YDBk6HiPDE4SbApOIhKpZJHfMIOIO4HPwt1i74vOvW+pX5YowiWgWriVdpLoW+olF6UTKR6FxMZxdeop42F2rv92Ar/z/BH0/oz9EpMAokG20+n6FGfidu4B45PdpwTVWnbkNsgq9g0I8pDk+0hvGon3ry/iS8ZVBvdKGNey3CPXWS4jHxBiKH9FuEb5HhA0+upGIvw9G26vdqf48z45ES+dgfBdZO7iG4uuR5xP/NtKAxTH48SS7SLYL74kvWR8X0F8wtHtN/t5B2Y5HdiAJdybSg1uB7yGiYG0nmfybTFlv4BvoT8cfpLUGOO8X6MQf+esob/BuR5Hj7wzyp+A37vGG9kWTv4ZIYBsR3GNDJNk41t8x+QcH91hzZwv+Hr+L+rCJpsMEpNDoIf1B7JuJGvYt/OXxWkN7wuRvjd9Z1jf7DpNvhaYW5CniaDcH9ZiM76kR0gcsdiL9h5SH4H9c+vKAbkP323C82+J3sNWBX2jyw8Pc3zW0lcQtXnawddOEH9doNJyJr/a0J+5a8UP3WyvVaPwOtp99/YzJ34jfiXsF94WRhrbFF8aepoG+9duMsB+1eDCgjad0J+4Y0KwP1O4BzVqEwD/BeE9CnaxEX0ACWI4UmITfkKES5RRDW4evCtw5uHeCoQ3C15adHJRrO3A98Yi5bfh+Vm9Rn28xpkIzLSd2yV2JgrpY2O3WC/jBxkIfZHtovRuf904Irr0DSeRzUOeHEfs2onAQDtsh/XmOKtCO/xn0pLiXDxr6TQFtDHJPdSkMtP2v5t67E8quxDBwlyljA+WDvOQIMBlfmAmVIy0BfXqV5Z9v7l2Yso674B9wm5uynAGLTsRnb0ig7UrpfW4lOM7c20367wnbj2olaeBypMQwdBh8JnJgr9ZxbzdKS+DVoBP/Qx6v0CQek/0doSRdS7jDz+MPlgtqrl2OTGAj6ZVzvakEVuBbQ+lo8Tn6EDZMw729XNsbJuBbzX5WY3mp0Uz74HrjBWR3/i3yE6sF7kutDlNpYg/KHMnYErnKziL996JyNDj6dVyOHDly5MiRI0eOHDly5MiRI0eOPsX/A3G6RIO6B25QAAAAAElFTkSuQmCC"/>
-
-          <p class="lead">
-            Open Knowledge Foundation Deutschland e. V.; <br/>
-            Singerstraße 109; 10179 Berlin
-          </p>
-        </div>
-
-        <h3>Bestätigung über Geldzuwendungen/Mitgliedsbeitrag</h3>
-        <p>
-          im Sinne des § 10b des Einkommensteuergesetzes an eine der in § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes bezeichneten Körperschaften, Personenvereinigungen oder Vermögensmassen
-        </p>
-
-        <div class="box">
-          <small>Name und Anschrift des Zuwendenden:</small>
-          <p class="lead center">
-            {{ Spendenname }}; {{ Strasse }}; {{ PLZ }} {{ Ort }}
-          </p>
-        </div>
-
-        <div class="flex-container">
-          <div class="box flex-grow">
-            <small> Betrag der Zuwendung - in Ziffern - </small>
-            <p class="lead center">
-              {{ Jahressumme }} €
+        </style>
+        <title>Zuwendungsbestätigung für {{ object.get_full_name }} {{ year }}</title>
+        <meta name="author" content="{{ SITE_NAME }}">
+    </head>
+    <body>
+        <section>
+            <div class="box">
+                <small>Aussteller (Bezeichnung und Anschrift der steuerbegünstigten Einrichtung):</small>
+                <img class="logo"
+                     alt="OKF Logo"
+                     src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAYAAAA5ZDbSAAAACXBIWXMAAAJQAAACUAHIS4ZAAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAE+JJREFUeJztnXucXVV1x78zmcwwkBePAAmBBJBXHqJEECPvEgShgPiJlUcBpaKmVUqVIg8hgJUgKlAQCRQCaAW1lQKxKgGB8pQCSqARSHgkhYRH0pBJQshj5vaP392fs/Y+596599xzJ/fOnN/nsz9zZ69z9tlnv9baa629DuTIkSNHjhw5cuTIkSNHDoNBm7oCTYKpwAHAUmDNJq5LjjpgDlAAuoFrN3FdqkLrpq5AE6ATOLT4uxV4ZRPWJUcd8Gk0e13aLaNyxwFXAO0ZlTfgsBkwATgIOAFoS1nOtUSdm9XsHQw8XizzGeBDGZU7oPAx/Jk3OmU5C00ZV2dTNX6IX7eZGZU7oDAOvxEnJVxzBXAdcCEaECH2Cso4IoN6HQ30mDKfIl+mU2EofuccmnDNIkM/K4H+DUNfjZb9WrAjsMyUuQLYucYyy6I/S9GrgA/M/9sE9FZge/P/mwllHGV+PxCUVy3agDuArU3eGcBrNZQ54PEm0Wz5SkDbDn+GTwnoQ1CHOvqXa6zLlcHzrqmxvAGBFmAiWl7PT6A/R9SgFwa0j+I3+NiAfkIvdIDTgJ0qqOdR+Hz3aaCjgvsGPM7G52eh6vUBQ78qoB1jaD3EG/wmQ5+X8OzdgA3AOuAGtCIkYQzwrimrC9i9/Gtlh2bnwf9lfo9As9Jiufm9dUCz26ZlqKMcWvD5768Tnn0h4qvtaCYn6fUd37X8/yvAywnX5khAK/7sODegX29o/xnQZhjaHwNauHwfFNB3RbPX0X9Qon4zg3Ku6/2VcoT4d6IGvC+gXWZoTwU0uwSHM/QCQ3sPaZ4sbjX0tSQrUY5Exgl33XNIr52jDFqJ86/p+I1t96p/b2ihmvHXhnZjQHvM0O4MaOHs/WFCPbdHpkV3zSpgj7JvNsDRDpwKzEf8cgtD2wN/GTzE0E4x+SuDMv9kaDNM/lbARkM7NbhvNuVnbyu+cFcATq7gHQc09sNvsL8N6P9raJeZ/COD+6xK8B2Tf6bJP8nkd+NLx+HsDSVzgO8Ez7yhslfM8SBRo72Kbx26zdAeN/n74jf2qGJ+O/6+9Ghzz09N/h+COtxiaGuBHQL6ofizfx45360Y4Ww80dBONfkbgGHF/G3QjDq7eM3QYn4H8HdF2q1E5rpW4G1T1sXmGWPRVsrRQsvSdsT57p7pXrX5kdZo/iy+VNpSzN8B+A3wTbTFSbu/70D71HuQcWE/Q7uZ0rO3FZiLPwD/OmUdmh4noFmWpFrsDZY/FoCPZ1ivEJsRDZRw9oZ65EuCet1Ux3o1NI4H1hM1RKgfDrEFvhQ7CGmB7qW+nRtiNNpKrSM+ew/B57svAJtn9NwO4IsZldUnOAjxJjvaLypx7b7AS8VrPmfyN6XQMhb4K/P/tsASondZDYzP6FlTgP8heau2SRHqcUMciBTutpNDl5UOfFPf00T8tlHQijRn9j1Oy6DcYYgFWC3YckobM/ocXydS/40qcc0nkeLBNs4VwTXOxPYLYMu61LQ2tAHfI9puzc6gzGPx9/QuPUyyubLPsQv+Evw28JkS134M+D/8F7kyuGbf+lQzUxyNOsBq13akOhlhO+B24h37HrJ1N4zVb398PyeXZgPDE66fjJYfe+0PaLzluBrsjDwxVwL7VHD9NHyLmEv3ooHScBgGzCJe4UXAYQnXh538GnHbbbNgPPAW0bu8RemldWfiPNzd01BCVSkchS9hFhC/moW/nAF8BI3ixWiZb1YMQwKhe9+fETc1tqFlN9xN9KBluqkG90jgV8RH6SvotJ7FJKTMb3aMRFav64nzzg8ju3RSexzeh3XMHNOI89oNaHvUH52+Q6l/M2SStNow1wbXEF/RmhI7AfcTH73PkCyA1YpOIlebi4G7kUvPUCTAzEKsYST1beADgT8Tf+8/0Ry7hKrQgmyvq4le9K4My+9Ae++jkUqxgD+w7sI/jjIVeWSsBX5eLCPLQ/HH45slC+gA+TmkPwzXMDiC0hLkLsAjyOi+bUbP+yoS6u5Gneoa9AvI7aZQfObhhjYeeLH4+xfF+xajIytZ6JPbidSNTmHRL1x3OpC4342Ww08mXNNGNvbSI9GAcRadHtRxLxf//ynyZiygpdLajieb36cj74sCMojsTDb70P2R/HEmyfv7ptzzf4k4z3kaNW6WS9P3UYc+jhzd1hSfdSvw4+LvJUQusu8C5xV/r0LblQIaiPsRCUE3Ial+DTLs1yoIJvH4YajTn6dvLWOZ4AIiHhim14F/qLH8Echb4x9NuRcD/0w0A+2pB9fZ3eb3i8Dvir+fwp+9E4kEozVk65mxDxLwrBxya4blV4Tr0Yy7Bm1x0ij7RyKp9Q3inRz6L1eDYcCTqAN2IPJg3IDMis7efDuRRca6wT5a/Psk0eGym4lm7434Pl5fQNLu/WhgpcXHkY9X0qB/nz5WcIRi/UYkLMxCHT6yirKcy+s8U145c2Jv+BtTzny0tDqjxULgP4iW4NfNb3ePs2K9Z/Kc9mk9vrP8bUjSdvffR3qeuSdxibobufpMow+l6pEJFUlKr6BZciY6Td8bWlBj3Uj6RjoNrSbfNvV4CS35trNc/a2nRanUQzTrnyDi4/OLz3OzfA0amLVI1261WYFWx02ilh2KJMrZ+PEpeksLi/ecTn1UjkegzngDSc7fCp79e/O/9V2uJr1P1JlXEw2QFUi1+jnkOXlkync4FDnj1RopIFNsj5aQa9DssJ4G5dJStLc8C21HarVpXkY0M3vQSjDDPG8Z6Ts2TH82z1qKjpreY+ivkr2KdTBqp+mINfwo4/IrxjZIQ3MV6vBKlsEC2qJ8L+UzD0Ss40h8oe01pJ2qhKWkSa8X39N6nywgOd5HtRgN/CUapHOJVg+X3sngGZlgCNIOzUAVLbU9KpB81KM3tKO97Fq0Pz0A3/uhB3/LkVXaQCSkuf9nIgXI+aQ/pX80vnN9uVTXAC1p0Yk64VykxbLS6gkpypuKP0N70P71BipvqFrT0+ik4p34FqFTUrzPPr08ayUSxr5L/GhMQ2IwcgE9l3ikm0qxJ1JQOAnXLmP1Wp7tMv1SkNcN/Baxjmox2LyH237eTnayiodG14NujvjsH5ChYD5qhC+TfOg69MxsQbPgMOIenjcjwSwJJ6PYGiGWoZ3Cv6CO2g/4N7RPrgYnI6PGs9Q5PHGlHdyK1GldaAnpQluHleb/8G8WOAwtVxZrkA15FNqOuRFfoPToH4z0498ncpyfhE4hJOERfI+TRcVnLgb2Rh6h7iDb4Ql1bBhUqj0ZSvWHqdwAcJ1+D2rgarAEeVkegGZuG1LchzEzQhyAtjZdSE35MFK/LkSxOqzNdzcUkMxiXPD/WEqbPifQwB1cKax9NW1KE0j7IOCzaJYcjPaIs9CSHW4resx9Zwe0GYZ2azFvYvH/qVW8wwok4F2GtjhpTxtMQ4Lb80gjuBipW9127P6U5cZQ6QzuBn6JlO3DkcJ/eDFVqroLQyhUgm+ihqwV56OBsRQJNKdVef9q1BEL0LZwf8Q+OtBgCyMO9IbhaEUqhcyCpFXawW/iHwALy3CdHQ4A+/fRFPXLyldrMOK5S5GgZjEXXxZ5Dnk/WgxBvHfvhLKrFbDAj8mVhMxUmVlYMDYij4XlvV2YAkcRDZCdUCd9BDX0HqQb6aFgORh1oEOST9Z6tFV6G61mTohcgdSW1eI5ZL9eV0zvI0XK6mL5S1KUmYhGd/w6BylHxlLbbF6P+B3Ej3ceQu/26XY0uEYgV6Dlxb8vUloSL4d5JIdHzBz16mA348YRSaAvIP5XDUYTXy5Bo3wt/swrh8vR8gy1hVbYsZj+wuTdQlwKbxik7eAtUeOPQjZNm1x+iF9RfQc/jJbQRUijBFqiJwOfKHPffyOlRxfi/S6m5aeIqxdfJ64gCRUdy1G4wwWog/dAeuI20sWdPAN5ibyMlv6XkUJnY4qyMsNXkVotVBdWmp5J+dyPom3OH3spv6fE/aBBMh1/azWxzPWPlHjGKnTe6Di0euxB6TPQ5WDDL7q0AUnqc5HEfxbaHu5CDerLamZwJ+nCEyxFM/C5FPcORV4WVpgqoBnag2azkzhbiEcKGIRWlMPwo7uDjAelVJXjzO9VxTQadeqJxbQSqSm/VOnLGCRFGWojWgVDrEas6rVqH1RNBy8qke8kSZuWIknwpWLl0mIV8tQ4AjnJ/RL5W08nWZsVRpsth0r55lD0PpcU/z8VLc/DUacXqnimwwPIULI7lfled5L8yYFeUY2xYRziX44fLkKdWG++sQuaaeOBf8I/Y7wEzaphCfdlgdX4gtzDyFV3MxSM5UE0i2tBO+L3E9A7ulk8kWjVWUh2H+SqC0YhC1D43YRKYUMIFlDHzsQPjFaP5HjuqyavB/gJlYXyrxUj0amQLD7nUxe0IWW/8+NaTDoTpfu8zTI0g47FDyb6OtnahT8g8qbsBi5Fe/IV5ppvpXgPkFfL2SSbI5sSD+M3XjkdbCl0oiMnI5Be2fmBbSTSMbvZlVUn/wY/lNOdiF9ejZbMNPG6tiVyDOxG0nr4GYKmg/NZXo+sJPunLKcNnRx0Df4O4oPudGA3fgzoNGkjWmXcYDkH/0T+M6iT0xoDbPBy94y+WOrrijFIcZBFrCv3ocgnkAT6BFFjXUW0z7VRXytJXUQz63dEznYfIK2VDTEchnqqBlORXdz5daUxwPRrtBOd3b2XqNEvR4Z81ykuXP9aotAR1tvT8VfntOcc+dzvM4hss+8gqfZcJDVn4Q89Ap15OjaDshoKQ1BD/Z7a/MEuIuqs25AB3f0/kyju1BwivvyMucZpxR4gOrZyLdFgeBJ9N9jN6vmoU2o5/V+p3rwpsTlSvVk31zQutA4jgIeQILQVkTP8AmTMd8+wYX5n4w+KArLozDH3fs1ccyoy5BeQoLhVDfXdG7GBmUS+XP0C7ajRknji82XuqwQdyD/rKlPmp4iCiy0g2l5tQAKTE8bc7w+Qdcndf0CxXgUkQQ9BMaprXZZtsPA30IG9LGOB9Dla0bJZ6vDaXLLbHhyDdLQ/R9o2t+c+j0g4mkd0mn8d/mfb9yGKfnsdUQyPRSR7cFSLD5N8nutZfLNjU6AFdazbuoTpUdI5i/eGzdEB6ouJZuwoxDsLyNHOzeb3kX3a1emzRI547yLL04lkG5d6PBErSBrsSTbvhsPh+IKMTU+QHKdyBxTGKCvHg0605F6Klm+nEPk6UbiHLjQQ3ay9qFi3+xDfzfLUYChIHkXEAmzaAHw+w+dmjqSgK24Z+nSJew4m4s2hwT0LtCOefB6aQSci6f2hIv0SpG5Mo1mrBKej7VroatSKBpKN49lFAwX8TsIQfAnZhStKMlS3oIa1x057kBKgv2AK0V77JZJjY22BtoxdaHVpeHwDCSZnUnrJHYrMa+FMv53+9QEpF+jFpWWUFqhG02An/kuhnfL8ay8ioceltSioikVWXyzZlBiGr2kroBWrGoeEpsLJxA9pLyIejPNgJMk243K9H3IhchhE/PvBBXSIvd9E2O1AsT3Cl5xD3PgwkSgc0gc0uFQZ4ECku34X+U9bnET8HNVjNLhQVQnG4Ft7nDA1k7jwNYbITOfS1/qsprVhd3xP06SPfU0hrs1bRHXxxhoKh+B/u8ApEZJcT7YmzpsvNfQOGt9megWqd+jVabEDvm15dh/Uqy5oIx4p70mSvQc7ifsg/wRfQfBttMTNoDF4Vyva49p4my7IW2/YDBk6HiPDE4SbApOIhKpZJHfMIOIO4HPwt1i74vOvW+pX5YowiWgWriVdpLoW+olF6UTKR6FxMZxdeop42F2rv92Ar/z/BH0/oz9EpMAokG20+n6FGfidu4B45PdpwTVWnbkNsgq9g0I8pDk+0hvGon3ry/iS8ZVBvdKGNey3CPXWS4jHxBiKH9FuEb5HhA0+upGIvw9G26vdqf48z45ES+dgfBdZO7iG4uuR5xP/NtKAxTH48SS7SLYL74kvWR8X0F8wtHtN/t5B2Y5HdiAJdybSg1uB7yGiYG0nmfybTFlv4BvoT8cfpLUGOO8X6MQf+esob/BuR5Hj7wzyp+A37vGG9kWTv4ZIYBsR3GNDJNk41t8x+QcH91hzZwv+Hr+L+rCJpsMEpNDoIf1B7JuJGvYt/OXxWkN7wuRvjd9Z1jf7DpNvhaYW5CniaDcH9ZiM76kR0gcsdiL9h5SH4H9c+vKAbkP323C82+J3sNWBX2jyw8Pc3zW0lcQtXnawddOEH9doNJyJr/a0J+5a8UP3WyvVaPwOtp99/YzJ34jfiXsF94WRhrbFF8aepoG+9duMsB+1eDCgjad0J+4Y0KwP1O4BzVqEwD/BeE9CnaxEX0ACWI4UmITfkKES5RRDW4evCtw5uHeCoQ3C15adHJRrO3A98Yi5bfh+Vm9Rn28xpkIzLSd2yV2JgrpY2O3WC/jBxkIfZHtovRuf904Irr0DSeRzUOeHEfs2onAQDtsh/XmOKtCO/xn0pLiXDxr6TQFtDHJPdSkMtP2v5t67E8quxDBwlyljA+WDvOQIMBlfmAmVIy0BfXqV5Z9v7l2Yso674B9wm5uynAGLTsRnb0ig7UrpfW4lOM7c20367wnbj2olaeBypMQwdBh8JnJgr9ZxbzdKS+DVoBP/Qx6v0CQek/0doSRdS7jDz+MPlgtqrl2OTGAj6ZVzvakEVuBbQ+lo8Tn6EDZMw729XNsbJuBbzX5WY3mp0Uz74HrjBWR3/i3yE6sF7kutDlNpYg/KHMnYErnKziL996JyNDj6dVyOHDly5MiRI0eOHDly5MiRI0eOPsX/A3G6RIO6B25QAAAAAElFTkSuQmCC" />
+                <p class="lead">
+                    Open Knowledge Foundation Deutschland e. V.;
+                    <br />
+                    Singerstraße 109; 10179 Berlin
+                </p>
+            </div>
+            <h3>Bestätigung über Geldzuwendungen/Mitgliedsbeitrag</h3>
+            <p>
+                im Sinne des § 10b des Einkommensteuergesetzes an eine der in § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes bezeichneten Körperschaften, Personenvereinigungen oder Vermögensmassen
             </p>
-          </div>
-
-          <div class="box flex-big">
-            <small> -&nbsp;in Buchstaben&nbsp;- </small>
-            <p class="lead center breakwords">
-              {{ JahressummeInWorten }}
+            <div class="box">
+                <small>Name und Anschrift des Zuwendenden:</small>
+                <p class="lead center">{{ Spendenname }}; {{ Strasse }}; {{ PLZ }} {{ Ort }}</p>
+            </div>
+            <div class="flex-container">
+                <div class="box flex-grow">
+                    <small>Betrag der Zuwendung - in Ziffern -</small>
+                    <p class="lead center">{{ Jahressumme }} €</p>
+                </div>
+                <div class="box flex-big">
+                    <small>-&nbsp;in Buchstaben&nbsp;-</small>
+                    <p class="lead center breakwords">{{ JahressummeInWorten }}</p>
+                </div>
+                <div class="box flex-item">
+                    <small>Tag der Zuwendung:</small>
+                    <p class="lead center">01.01. - 31.12.{{ year }}</p>
+                </div>
+            </div>
+            <p>
+                Es handelt sich um den Verzicht auf Erstattung von Aufwendungen <span class="checkbox">Ja ☐</span> <span class="checkbox">Nein ☒</span>
             </p>
-          </div>
-
-          <div class="box flex-item">
-            <small> Tag der Zuwendung: </small>
-            <p class="lead center">
-              01.01. - 31.12.{{ year }}
+            <p class="checkbox-indent">
+                ☒  Wir sind wegen Förderung von Wissenschaft und Forschung sowie Förderung der Volks- und Berufsbildung nach der Anlage zum Körperschaftsteuerbescheid des Finanzamtes Berlin für Körperschaften I StNr. 27/674/52428 vom 13.09.2022 für den letzten Veranlagungszeitraum 2021 nach § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes von der Körperschaftsteuer und nach § 3 Nr. 6 des Gewerbesteuergesetzes von der Gewerbesteuer befreit.
             </p>
-          </div>
-        </div>
-
-        <p>Es handelt sich um den Verzicht auf Erstattung von Aufwendungen <span class="checkbox">Ja ☐</span> <span class="checkbox">Nein ☒</span></p>
-
-        <p class="checkbox-indent">
-          ☒  Wir sind wegen Förderung von Wissenschaft und Forschung sowie Förderung der Volks- und Berufsbildung nach der Anlage zum Körperschaftsteuerbescheid des Finanzamtes Berlin für Körperschaften I StNr. 27/674/52428 vom 13.09.2022 für den letzten Veranlagungszeitraum 2021 nach § 5 Abs. 1 Nr. 9 des Körperschaftsteuergesetzes von der Körperschaftsteuer und nach § 3 Nr. 6 des Gewerbesteuergesetzes von der Gewerbesteuer befreit. 
-        </p>
-        <p class="checkbox-indent">
-          ☒  Die Einhaltung der satzungsgemäßen Voraussetzungen nach den §§ 51, 59, 60 und 61 AO wurde vom Finanzamt Berlin für Körperschaften I StNr. 27/674/52428 mit Bescheid vom 14.08.2014 nach § 60a AO gesondert festgestellt. Wir fördern nach unserer Satzung die Wissenschaft und Forschung sowie die Volks- und Berufsbildung, das demokratische Staatswesen im Geltungsbereich der Abgabenordnung, und das bürgerschaftliche Engagement zugunsten gemeinnütziger Zwecke.
-        </p>
-
-        <div class="box">
-          <p>
-            Es wird bestätigt, dass die Zuwendung nur zur Förderung (Angabe des begünstigten Zwecks / der begünstigten Zwecke)
-          </p>
-
-          <p class="lead center">
-            der Wissenschaft und Forschung, der Volks- und Berufsbildung, des demokratischen Staatswesens im Geltungsbereich der Abgabenordnung sowie des bürgerschaftlichen Engagements zugunsten gemeinnütziger Zwecke
-          </p>
-          
-          <p>
-            verwendet wird.<br/>
-            
-            <strong>Nur für steuerbegünstigte Einrichtungen, bei denen die Mitgliedsbeiträge steuerlich nicht abziehbar sind:</strong><br/>
-            
-            ☐  Es wird bestätigt, dass es sich nicht um einen Mitgliedsbeitrag handelt, dessen Abzug nach § 10b Abs. 1 des Einkommensteuergesetzes ausgeschlossen ist. 
-          </p>
-
-        </div>
-
-        <aside>Berlin, {{ current_date }}{% if signature_string %}<img class="signature" alt="Signature" src="data:image/png;base64,{{ signature_string }}"/>{% endif %}</aside>
-        <hr/>
-
-        <small> (Ort, Datum und Unterschrift des Zuwendungsempfängers) </small>
-
-        <p class="fineprint mt-3">
-          <strong>Hinweis:</strong><br/>
-          Der Zuwendungsempfänger hat die Nutzung des maschinellen Verfahrens zur Erstellung der Zuwendungsbestätigung dem Finanzamt Leipzig I mit Schreiben vom 04.09.2020 angezeigt.
-        <br/><br/>
-          Wer vorsätzlich oder grob fahrlässig eine unrichtige Zuwendungsbestätigung erstellt oder veranlasst, dass Zuwendungen nicht zu den in der Zuwendungsbestätigung angegebenen steuerbegünstigten Zwecken verwendet werden, haftet für die entgangene Steuer (§ 10b Abs. 4 EStG, § 9 Abs. 3 KStG, § 9 Nr. 5 GewStG).
-        </p>
-        <p class="fineprint">
-          Diese Bestätigung wird nicht als Nachweis für die steuerliche Berücksichtigung der Zuwendung anerkannt, wenn das Datum des Freistellungsbescheides länger als 5 Jahre bzw. <strong>das Datum der Feststellung der Einhaltung der satzungsmäßigen Voraussetzungen nach § 60a Abs. 1 AO länger als 3 Jahre seit Ausstellung des Bescheides zurückliegt (§ 63 Abs. 5 AO).</strong>
-        </p>
-      </section>
-
-      <section>
-        <h3>Anlage zur Sammelbestätigung</h3>
-        <h3>Seite 1/1</h3>
-        
-        <table>
-          <thead>
-            <tr>
-              <th>
-                Datum der Zuwendung
-              </th>
-              <th>
-                Art der Zuwendung (Geldzuwendung / Mitgliedsbeitrag)
-              </th>
-              <th>
-                Verzicht auf die Erstattung von Aufwendungen (ja/nein)
-              </th> 
-              <th>
-                Betrag in Euro
-              </th>             
-            </tr>
-          </thead>
-          <tbody>
-            {% for donation in donations %}
-            <tr>
-              <td>
-                {{ donation.date }}
-              </td>
-              <td>
-                Geldzuwendung
-              </td>
-              <td>
-                Nein
-              </td>
-              <td>
-                {{ donation.formatted_amount }}
-                {% if donation.receipt_date %}*{% endif %}
-              </td>
-            </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-
-        <h3 class="mt-3">Gesamtsumme: {{ Jahressumme }} €</h3>
-        {% if receipt_already %}
-          <p>
-            * Zuwendung wurde bereits bestätigt.
-          </p>
-        {% endif %}
-      </section>
-  </body>
+            <p class="checkbox-indent">
+                ☒  Die Einhaltung der satzungsgemäßen Voraussetzungen nach den §§ 51, 59, 60 und 61 AO wurde vom Finanzamt Berlin für Körperschaften I StNr. 27/674/52428 mit Bescheid vom 14.08.2014 nach § 60a AO gesondert festgestellt. Wir fördern nach unserer Satzung die Wissenschaft und Forschung sowie die Volks- und Berufsbildung, das demokratische Staatswesen im Geltungsbereich der Abgabenordnung, und das bürgerschaftliche Engagement zugunsten gemeinnütziger Zwecke.
+            </p>
+            <div class="box">
+                <p>
+                    Es wird bestätigt, dass die Zuwendung nur zur Förderung (Angabe des begünstigten Zwecks / der begünstigten Zwecke)
+                </p>
+                <p class="lead center">
+                    der Wissenschaft und Forschung, der Volks- und Berufsbildung, des demokratischen Staatswesens im Geltungsbereich der Abgabenordnung sowie des bürgerschaftlichen Engagements zugunsten gemeinnütziger Zwecke
+                </p>
+                <p>
+                    verwendet wird.
+                    <br />
+                    <strong>Nur für steuerbegünstigte Einrichtungen, bei denen die Mitgliedsbeiträge steuerlich nicht abziehbar sind:</strong>
+                    <br />
+                    ☐  Es wird bestätigt, dass es sich nicht um einen Mitgliedsbeitrag handelt, dessen Abzug nach § 10b Abs. 1 des Einkommensteuergesetzes ausgeschlossen ist.
+                </p>
+            </div>
+            <aside>
+                Berlin, {{ current_date }}
+                {% if signature_string %}
+                    <img class="signature"
+                         alt="Signature"
+                         src="data:image/png;base64,{{ signature_string }}" />
+                {% endif %}
+            </aside>
+            <hr />
+            <small>(Ort, Datum und Unterschrift des Zuwendungsempfängers)</small>
+            <p class="fineprint mt-3">
+                <strong>Hinweis:</strong>
+                <br />
+                Der Zuwendungsempfänger hat die Nutzung des maschinellen Verfahrens zur Erstellung der Zuwendungsbestätigung dem Finanzamt Leipzig I mit Schreiben vom 04.09.2020 angezeigt.
+                <br />
+                <br />
+                Wer vorsätzlich oder grob fahrlässig eine unrichtige Zuwendungsbestätigung erstellt oder veranlasst, dass Zuwendungen nicht zu den in der Zuwendungsbestätigung angegebenen steuerbegünstigten Zwecken verwendet werden, haftet für die entgangene Steuer (§ 10b Abs. 4 EStG, § 9 Abs. 3 KStG, § 9 Nr. 5 GewStG).
+            </p>
+            <p class="fineprint">
+                Diese Bestätigung wird nicht als Nachweis für die steuerliche Berücksichtigung der Zuwendung anerkannt, wenn das Datum des Freistellungsbescheides länger als 5 Jahre bzw. <strong>das Datum der Feststellung der Einhaltung der satzungsmäßigen Voraussetzungen nach § 60a Abs. 1 AO länger als 3 Jahre seit Ausstellung des Bescheides zurückliegt (§ 63 Abs. 5 AO).</strong>
+            </p>
+        </section>
+        <section>
+            <h3>Anlage zur Sammelbestätigung</h3>
+            <h3>Seite 1/1</h3>
+            <table>
+                <thead>
+                    <tr>
+                        <th>Datum der Zuwendung</th>
+                        <th>Art der Zuwendung (Geldzuwendung / Mitgliedsbeitrag)</th>
+                        <th>Verzicht auf die Erstattung von Aufwendungen (ja/nein)</th>
+                        <th>Betrag in Euro</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for donation in donations %}
+                        <tr>
+                            <td>{{ donation.date }}</td>
+                            <td>Geldzuwendung</td>
+                            <td>Nein</td>
+                            <td>
+                                {{ donation.formatted_amount }}
+                                {% if donation.receipt_date %}*{% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+            <h3 class="mt-3">Gesamtsumme: {{ Jahressumme }} €</h3>
+            {% if receipt_already %}<p>* Zuwendung wurde bereits bestätigt.</p>{% endif %}
+        </section>
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html b/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html
index 00f7434c5..e711213d9 100644
--- a/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html
+++ b/fragdenstaat_de/fds_donation/templates/froide_payment/payment/status/banktransfer.html
@@ -1,7 +1,5 @@
 {% extends "froide_payment/payment/status/base.html" %}
-
 {% load i18n %}
-
 {% block custom_content %}
-  {% include "fds_donation/includes/banktransfer.html" %}
+    {% include "fds_donation/includes/banktransfer.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html b/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html
index 3a1a33625..fa3fc0014 100644
--- a/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html
+++ b/fragdenstaat_de/fds_donation/templates/froide_payment/subscription/banktransfer/detail.html
@@ -1,26 +1,31 @@
 {% extends "froide_payment/subscription/default.html" %}
-
 {% block custom_content %}
-  <div class="card border-danger">
-    <div class="card-header">
-      <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
-    </div>
-    <div class="card-body">
-      <p>
-        <strong>Kontoinhaber:</strong>&nbsp;Open Knowledge Foundation Deutschland e.V.<br>
-        <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00<br>
-        <strong>BIC:</strong>&nbsp;GENODEM1GLS<br>
-        <strong>Betrag:&nbsp;</strong>{{ subscription.plan.total_gross }}&nbsp;EUR<br/>
-        <strong>Turnus:&nbsp;</strong> {{ subscription.plan.get_interval_description }}<br/>
-        <strong>Verwendungszweck:&nbsp;</strong>{{ subscription.remote_reference }}<br>
-        <strong>BLZ:</strong>&nbsp;430 609 67 (GLS Bank)
-      </p>
-      {% comment %} <p>
-        Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:<br/>
+    <div class="card border-danger">
+        <div class="card-header">
+            <h3>Bitte richten Sie einen Dauerauftrag ein</h3>
+        </div>
+        <div class="card-body">
+            <p>
+                <strong>Kontoinhaber:</strong>&nbsp;Open Knowledge Foundation Deutschland e.V.
+                <br>
+                <strong>IBAN:&nbsp;</strong>DE36 4306 0967 1173 8932 00
+                <br>
+                <strong>BIC:</strong>&nbsp;GENODEM1GLS
+                <br>
+                <strong>Betrag:&nbsp;</strong>{{ subscription.plan.total_gross }}&nbsp;EUR
+                <br />
+                <strong>Turnus:&nbsp;</strong> {{ subscription.plan.get_interval_description }}
+                <br />
+                <strong>Verwendungszweck:&nbsp;</strong>{{ subscription.remote_reference }}
+                <br>
+                <strong>BLZ:</strong>&nbsp;430 609 67 (GLS Bank)
+            </p>
+            {% comment %} <p>
+        Falls Sie eine Banking-App verwenden, die Direktaufrufe unterstützt, können Sie diesen Link verwenden:<br />
         <a class="btn btn-success" href="bank://periodicsinglepaymentsepa?name={{ 'Open Knowledge Foundation Deutschland e.V.'|urlencode }}&amp;iban=DE36430609671173893200&amp;bic=GENODEM1GLS&amp;amount={{ subscription.plan.amount }}&amp;reason={{ subscription.remote_reference }}&amp;periodictimeunit=M&amp;periodictimeunitrotation={{ subscription.plan.interval }}">
           Direktlink für Banking-App
         </a>
-      </p> {% endcomment %}
+            </p> {% endcomment %}
+        </div>
     </div>
-  </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html b/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html
index 8d2fee8fe..122ad0208 100644
--- a/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html
+++ b/fragdenstaat_de/fds_fximport/templates/fds_fximport/import_frag.html
@@ -1,43 +1,56 @@
 {% load i18n %}
 {% load static %}
-
 <div class="btn-group btn-group-sm mb-1 ms-sm-auto">
-
-<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#frontex-pad-import-modal-{{message.id}}">
-  {% blocktrans %}
+    <button class="btn btn-primary"
+            data-bs-toggle="modal"
+            data-bs-target="#frontex-pad-import-modal-{{ message.id }}">
+        {% blocktrans %}
   Import Message from Frontex
   {% endblocktrans %}
-</button>
+    </button>
 </div>
-<div data-teleport="body" class="modal fade modal-lg" id="frontex-pad-import-modal-{{message.id}}" tabindex="-1" role="dialog" aria-labelledby="frontex-pad-import-modal-{{message.id}}-title" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="frontex-pad-import-modal-{{message.id}}-title">{% translate "Message from Frontex" %}</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="{% translate "Close" %}">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form id="frontex-import-form" action="{% url 'fragdenstaat-frontex_pad_import' slug=request.slug message_id=message.id %}"
-          method="post" class="horizontal-form disable-submit">
-          {% csrf_token %}
-          <p>
-            {% blocktrans %}
+<div data-teleport="body"
+     class="modal fade modal-lg"
+     id="frontex-pad-import-modal-{{ message.id }}"
+     tabindex="-1"
+     role="dialog"
+     aria-labelledby="frontex-pad-import-modal-{{ message.id }}-title"
+     aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title"
+                    id="frontex-pad-import-modal-{{ message.id }}-title">{% translate "Message from Frontex" %}</h5>
+                <button type="button"
+                        class="close"
+                        data-dismiss="modal"
+                        aria-label="{% translate "Close" %}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form id="frontex-import-form"
+                      action="{% url 'fragdenstaat-frontex_pad_import' slug=request.slug message_id=message.id %}"
+                      method="post"
+                      class="horizontal-form disable-submit">
+                    {% csrf_token %}
+                    <p>
+                        {% blocktrans %}
               We automatically import the message from frontex for you and permanently store it on FragDenStaat.
             {% endblocktrans %}
-          </p>
-
-          <p class="text-right">
-            <button class="btn btn-primary" type="submit" id="frontex-import-button">
-              &rarr; {% translate "Import message" %}
-            </button>
-          </p>
-          <p class="text-center show-while-submitting">
-            <img id="workingGif" alt="{% trans "Gif of a cat furiously typing on a keyboard" %}" src="{% static 'fds_fximport/keyboard-cat.gif' %}" />
-          </p>
-        </form>
-      </div>
+                    </p>
+                    <p class="text-right">
+                        <button class="btn btn-primary" type="submit" id="frontex-import-button">
+                            &rarr; {% translate "Import message" %}
+                        </button>
+                    </p>
+                    <p class="text-center show-while-submitting">
+                        <img id="workingGif"
+                             alt="{% trans "Gif of a cat furiously typing on a keyboard" %}"
+                             src="{% static 'fds_fximport/keyboard-cat.gif' %}" />
+                    </p>
+                </form>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
diff --git a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/emailtemplate/change_form.html b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/emailtemplate/change_form.html
index 2ab900cb2..eac5accc6 100644
--- a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/emailtemplate/change_form.html
+++ b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/emailtemplate/change_form.html
@@ -1,22 +1,18 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
 {% block object-tools-items %}
-  {% if original.pk %}
-    <li>
-      <a href="{% url 'admin:fds_mailing-emailtemplate-preview' pk=original.pk %}" target="_blank">
-        {% trans "Preview" %}
-      </a>
-    </li>
-    <li>
-      <a href="{% url 'admin:fds_mailing-emailtemplate-preview_eml' pk=original.pk %}" target="_blank">
-        {% trans "Download E-Mail" %}
-      </a>
-    </li>
-    <li>
-      <a href="{% url 'admin:fds_mailing-emailtemplate-edit_body' pk=original.pk %}?edit">
-        {% trans "Edit HTML email" %}
-      </a>
-    </li>
-  {% endif %}
-  {{ block.super }}
+    {% if original.pk %}
+        <li>
+            <a href="{% url 'admin:fds_mailing-emailtemplate-preview' pk=original.pk %}"
+               target="_blank">{% trans "Preview" %}</a>
+        </li>
+        <li>
+            <a href="{% url 'admin:fds_mailing-emailtemplate-preview_eml' pk=original.pk %}"
+               target="_blank">{% trans "Download E-Mail" %}</a>
+        </li>
+        <li>
+            <a href="{% url 'admin:fds_mailing-emailtemplate-edit_body' pk=original.pk %}?edit">{% trans "Edit HTML email" %}</a>
+        </li>
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_form.html b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_form.html
index 25961c5b9..d5166681e 100644
--- a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_form.html
+++ b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_form.html
@@ -1,32 +1,31 @@
 {% extends "admin/change_form.html" %}
-
 {% load i18n %}
-
 {% block object-tools-items %}
-  {% if original.pk %}
-    {% if original.newsletter %}
-      <li>{% trans "Sending to all newsletter subscribers" %}</li>
-    {% else %}
-      <li>
-        <a href="{% url 'admin:fds_mailing_mailingmessage_changelist' %}?mailing={{ original.pk }}">
-          {% trans "See recipients" %}
-        </a>
-      </li>
+    {% if original.pk %}
+        {% if original.newsletter %}
+            <li>{% trans "Sending to all newsletter subscribers" %}</li>
+        {% else %}
+            <li>
+                <a href="{% url 'admin:fds_mailing_mailingmessage_changelist' %}?mailing={{ original.pk }}">
+                    {% trans "See recipients" %}
+                </a>
+            </li>
+        {% endif %}
     {% endif %}
-  {% endif %}
-  {% if original and original.ready and not original.submitted %}
-    <li>
-      <form method="post" action="{% url 'admin:fds_mailing_mailing_send' original.pk %}">
-        {% csrf_token %}
-        <button type="submit">
-          {% if original.sending_date %}
-            {% blocktrans with date=original.sending_date|date:"DATE_FORMAT" %}Send on {{ date }}{% endblocktrans %}
-          {% else %}
-            {% trans "Send now" %}
-          {% endif %}
-        </button>
-      </form>
-    </li>
-  {% endif %}
-  {{ block.super }}
+    {% if original and original.ready and not original.submitted %}
+        <li>
+            <form method="post"
+                  action="{% url 'admin:fds_mailing_mailing_send' original.pk %}">
+                {% csrf_token %}
+                <button type="submit">
+                    {% if original.sending_date %}
+                        {% blocktrans with date=original.sending_date|date:"DATE_FORMAT" %}Send on {{ date }}{% endblocktrans %}
+                    {% else %}
+                        {% trans "Send now" %}
+                    {% endif %}
+                </button>
+            </form>
+        </li>
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_list.html b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_list.html
index a80dfe743..29a9c5184 100644
--- a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_list.html
+++ b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/change_list.html
@@ -1,15 +1,16 @@
 {% extends "admin/change_list.html" %}
-
 {% load i18n %}
-
 {% block content %}
-  {{ block.super }}
-  <div>
-    <h4>{% translate "Create Mailing from CSV" %}</h4>
-    <p>{% translate "Fields 'name' and 'email' required." %}</p>
-    <form enctype="multipart/form-data" method="post" action="{% url 'admin:fds_mailing-mailing-import_csv' %}">{% csrf_token %}
-      <input type="file" name="file" required/>
-      <input type="submit"/>
-    </form>
-  </div>
+    {{ block.super }}
+    <div>
+        <h4>{% translate "Create Mailing from CSV" %}</h4>
+        <p>{% translate "Fields 'name' and 'email' required." %}</p>
+        <form enctype="multipart/form-data"
+              method="post"
+              action="{% url 'admin:fds_mailing-mailing-import_csv' %}">
+            {% csrf_token %}
+            <input type="file" name="file" required />
+            <input type="submit" />
+        </form>
+    </div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/send_mailing.html b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/send_mailing.html
index 9f86ef074..824637644 100644
--- a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/send_mailing.html
+++ b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailing/send_mailing.html
@@ -1,33 +1,30 @@
 {% extends "helper/admin_base_action.html" %}
-
 {% load i18n l10n %}
-
-{% block action_title %}{% trans 'Setup mailing' %}{% endblock %}
-
+{% block action_title %}
+    {% trans 'Setup mailing' %}
+{% endblock %}
 {% block breadcrumbs_action_label %}
-  {% trans 'Setup mailing' %}
+    {% trans 'Setup mailing' %}
 {% endblock %}
-
 {% block action_content %}
-
-<form action="" method="post">{% csrf_token %}
-  <div>
-    <p>{% blocktrans %}Setup mailing{% endblocktrans %}</p>
-
-    {{ form.as_p }}
-
-    <p>{% blocktrans %}to these recipients:{% endblocktrans %}</p>
-    <ul>
-    {% for obj in queryset %}
-        <li>
-        {{ obj }}
-        <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
-        </li>
-    {% endfor %}
-    </ul>
-
-    <input type="hidden" name="action" value="setup_mailing" />
-    <input type="submit" value="{% trans 'Setup mailing' %}" />
-  </div>
-</form>
+    <form action="" method="post">
+        {% csrf_token %}
+        <div>
+            <p>{% blocktrans %}Setup mailing{% endblocktrans %}</p>
+            {{ form.as_p }}
+            <p>{% blocktrans %}to these recipients:{% endblocktrans %}</p>
+            <ul>
+                {% for obj in queryset %}
+                    <li>
+                        {{ obj }}
+                        <input type="hidden"
+                               name="{{ action_checkbox_name }}"
+                               value="{{ obj.pk|unlocalize }}" />
+                    </li>
+                {% endfor %}
+            </ul>
+            <input type="hidden" name="action" value="setup_mailing" />
+            <input type="submit" value="{% trans 'Setup mailing' %}" />
+        </div>
+    </form>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailingmessage/change_form.html b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailingmessage/change_form.html
index f2fdb95f8..d16033360 100644
--- a/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailingmessage/change_form.html
+++ b/fragdenstaat_de/fds_mailing/templates/admin/fds_mailing/mailingmessage/change_form.html
@@ -1,12 +1,11 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
 {% block object-tools-items %}
-  {% if original.pk %}
-    <li>
-      <a href="{% url 'admin:fds_mailing-mailingmessage-preview' pk=original.pk %}" target="_blank">
-        {% trans "Preview" %}
-      </a>
-    </li>
-  {% endif %}
-  {{ block.super }}
+    {% if original.pk %}
+        <li>
+            <a href="{% url 'admin:fds_mailing-mailingmessage-preview' pk=original.pk %}"
+               target="_blank">{% trans "Preview" %}</a>
+        </li>
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/action.html b/fragdenstaat_de/fds_mailing/templates/email/default/action.html
index 8f42fe08b..ebde30204 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/action.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/action.html
@@ -1,38 +1,49 @@
 <table cellpadding="0" cellspacing="0" width="100%" bgcolor="#ffffff">
     {% if heading %}
-    <tr>
-      <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
-        <h1>{{ heading }}</h1>
-      </td>
-    </tr>
+        <tr>
+            <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
+                <h1>{{ heading }}</h1>
+            </td>
+        </tr>
     {% endif %}
     <tr>
-      <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
-        {% block top_text %}{% endblock %}
-      </td>
+        <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
+            {% block top_text %}{% endblock %}
+        </td>
     </tr>
     <tr>
-      <td>
-
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td>
-              <table border="0" cellspacing="0" cellpadding="0">
+        <td>
+            <table width="100%" border="0" cellspacing="0" cellpadding="0">
                 <tr>
-                  <td align="center" style="border-radius: 3px;" bgcolor="{{ style.primary }}">
-                    <a href="{{ action_url }}" target="_blank" class="button" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; text-decoration: none;border-radius: 3px; padding: 12px 18px; border: 1px solid {{ style.primary }}; display: inline-block;">{{ action_label }}</a>
-                  </td>
+                    <td>
+                        <table border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                                <td align="center"
+                                    style="border-radius: 3px"
+                                    bgcolor="{{ style.primary }}">
+                                    <a href="{{ action_url }}"
+                                       target="_blank"
+                                       class="button"
+                                       style="font-size: 16px;
+                                              font-family: Helvetica, Arial, sans-serif;
+                                              color: #ffffff;
+                                              text-decoration: none;
+                                              text-decoration: none;
+                                              border-radius: 3px;
+                                              padding: 12px 18px;
+                                              border: 1px solid {{ style.primary }};
+                                              display: inline-block">{{ action_label }}</a>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
                 </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-
-      </td>
+            </table>
+        </td>
     </tr>
     <tr>
-      <td style="padding-top:20px;background-color:#ffffff;">
-        {% block bottom_text %}{% endblock %}
-      </td>
+        <td style="padding-top:20px;background-color:#ffffff;">
+            {% block bottom_text %}{% endblock %}
+        </td>
     </tr>
-  </table>
+</table>
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/action_plugin.html b/fragdenstaat_de/fds_mailing/templates/email/default/action_plugin.html
index 6d3d0699c..cd790e10a 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/action_plugin.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/action_plugin.html
@@ -1,23 +1,20 @@
 {% extends "email/default/action.html" %}
-
 {% load cms_tags %}
-
 {% block top_text %}
-  {% if instance.child_plugin_instances|length > 1 %}
-    {% for plugin in instance.child_plugin_instances|slice:":-1" %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  {% else %}
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  {% endif %}
+    {% if instance.child_plugin_instances|length > 1 %}
+        {% for plugin in instance.child_plugin_instances|slice:":-1" %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    {% else %}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    {% endif %}
 {% endblock %}
-
 {% block bottom_text %}
-  {% if instance.child_plugin_instances|length > 1 %}
-    {% for plugin in instance.child_plugin_instances|slice:"-1:" %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  {% endif %}
-{% endblock %}
\ No newline at end of file
+    {% if instance.child_plugin_instances|length > 1 %}
+        {% for plugin in instance.child_plugin_instances|slice:"-1:" %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    {% endif %}
+{% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/base.html b/fragdenstaat_de/fds_mailing/templates/email/default/base.html
index d7b156c34..30fc8c9b6 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/base.html
@@ -1,11 +1,10 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>{{ subject }}</title>
-  <style type="text/css" media="screen">
-
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>{{ subject }}</title>
+        <style type="text/css" media="screen">
     /* Force Hotmail to display emails at full width */
     .ExternalClass {
       display: block !important;
@@ -173,8 +172,8 @@
       }
     }
 
-  </style>
-  <style type="text/css" media="only screen and (max-width: 600px)">
+        </style>
+        <style type="text/css" media="only screen and (max-width: 600px)">
     @media only screen and (max-width: 600px) {
       body[class*="background"],
       table[class*="background"],
@@ -205,75 +204,93 @@
         padding-bottom: 0 !important;
       }
     }
-  </style>
-</head>
-
-<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" bgcolor="" class="background">
-  <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" class="background">
-    <tr>
-      <td align="center" valign="top" width="100%" class="background">
-        <center>
-          <table cellpadding="0" cellspacing="0" width="600" class="wrap">
+        </style>
+    </head>
+    <body leftmargin="0"
+          marginwidth="0"
+          topmargin="0"
+          marginheight="0"
+          offset="0"
+          bgcolor=""
+          class="background">
+        <table align="center"
+               border="0"
+               cellpadding="0"
+               cellspacing="0"
+               height="100%"
+               width="100%"
+               class="background">
             <tr>
-              <td valign="top" class="wrap-cell" style="padding-top:30px; padding-bottom:30px;">
-                <table cellpadding="0" cellspacing="0" class="force-full-width">
-                  {% block content %}
-                  <tr>
-                    {% block header_image %}
-                    <td height="60" valign="top" class="header-cell" style="padding: 30px 20px">
-                      <img width="260" height="60" src="https://media.frag-den-staat.de/files/media/main/3d/ed/3ded41d1-31d9-4bf5-a04b-4ded2ae5d4e2/logo.png" alt="FragDenStaat.de">
-                    </td>
-                    {% endblock %}
-                  </tr>
-                  <tr>
-                    <td valign="top" class="body-cell">
-
-                      {% block body %}{% endblock %}
-
-                    </td>
-                  </tr>
-                  {% endblock content %}
-                  <tr>
-                    <td valign="top" class="footer-cell">
-                      {% block footer %}
-                      {% if newsletter %}
-                      Wurde die Mail an dich weitergeleitet? Erhalte den nächsten Newsletter persönlich und <a href="https://fragdenstaat.de/newsletter/">abonniere den FragDenStaat-Newsletter direkt hier</a>. Falls dir der Newsletter gefällt, dann  würden wir uns über das Teilen in deinem Netzwerk freuen.
-                      <br><br>
-                      {% endif %}
-
-                      {% block social_media %}
-                      Unsere Social-Media-Kanäle:<br>
-                      <a href="https://twitter.com/fragdenstaat">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://www.facebook.com/fragdenstaat.de">Facebook</a>
-                      <br><br>
-                      {% endblock %}
-                      
-                      Impressum:
-                      <br>
-                      FragDenStaat ist ein Projekt der Open Knowledge Foundation Deutschland e.V.
-                      <br>
-                      Singerstr. 109 | 10179 Berlin
-                      <br>
-                      <a href="mailto:info@fragdenstaat.de">info@fragdenstaat.de</a> | <a href="{{ site_url }}">fragdenstaat.de</a>
-                      <br>
-                      {% if unsubscribe_url %}
-                      <br>
-                      Du hast diese Mitteilung erhalten, weil du dich in die Mailingliste eingetragen hast. Du kannst dich <a href="{{ unsubscribe_url }}">hier von dieser Liste abmelden</a>. Weitere Informationen findest du in unserer <a href="https://fragdenstaat.de/datenschutzerklaerung/">Datenschutzrichtlinie</a>.
-                      {% else %}
-                      <br>
-                      <a href="https://fragdenstaat.de/datenschutzerklaerung/">Datenschutzerklärung</a>
-                      {% endif %}
-                      <br>
-                      {% endblock %}
-                    </td>
-                  </tr>
-                </table>
-              </td>
+                <td align="center" valign="top" width="100%" class="background">
+                    <center>
+                        <table cellpadding="0" cellspacing="0" width="600" class="wrap">
+                            <tr>
+                                <td valign="top"
+                                    class="wrap-cell"
+                                    style="padding-top:30px;
+                                           padding-bottom:30px">
+                                    <table cellpadding="0" cellspacing="0" class="force-full-width">
+                                        {% block content %}
+                                            <tr>
+                                                {% block header_image %}
+                                                    <td height="60"
+                                                        valign="top"
+                                                        class="header-cell"
+                                                        style="padding: 30px 20px">
+                                                        <img width="260"
+                                                             height="60"
+                                                             src="https://media.frag-den-staat.de/files/media/main/3d/ed/3ded41d1-31d9-4bf5-a04b-4ded2ae5d4e2/logo.png"
+                                                             alt="FragDenStaat.de">
+                                                    </td>
+                                                {% endblock %}
+                                            </tr>
+                                            <tr>
+                                                <td valign="top" class="body-cell">
+                                                    {% block body %}{% endblock %}
+                                                </td>
+                                            </tr>
+                                        {% endblock content %}
+                                        <tr>
+                                            <td valign="top" class="footer-cell">
+                                                {% block footer %}
+                                                    {% if newsletter %}
+                                                        Wurde die Mail an dich weitergeleitet? Erhalte den nächsten Newsletter persönlich und <a href="https://fragdenstaat.de/newsletter/">abonniere den FragDenStaat-Newsletter direkt hier</a>. Falls dir der Newsletter gefällt, dann  würden wir uns über das Teilen in deinem Netzwerk freuen.
+                                                        <br>
+                                                        <br>
+                                                    {% endif %}
+                                                    {% block social_media %}
+                                                        Unsere Social-Media-Kanäle:
+                                                        <br>
+                                                        <a href="https://twitter.com/fragdenstaat">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://www.facebook.com/fragdenstaat.de">Facebook</a>
+                                                        <br>
+                                                        <br>
+                                                    {% endblock %}
+                                                    Impressum:
+                                                    <br>
+                                                    FragDenStaat ist ein Projekt der Open Knowledge Foundation Deutschland e.V.
+                                                    <br>
+                                                    Singerstr. 109 | 10179 Berlin
+                                                    <br>
+                                                    <a href="mailto:info@fragdenstaat.de">info@fragdenstaat.de</a> | <a href="{{ site_url }}">fragdenstaat.de</a>
+                                                    <br>
+                                                    {% if unsubscribe_url %}
+                                                        <br>
+                                                        Du hast diese Mitteilung erhalten, weil du dich in die Mailingliste eingetragen hast. Du kannst dich <a href="{{ unsubscribe_url }}">hier von dieser Liste abmelden</a>. Weitere Informationen findest du in unserer <a href="https://fragdenstaat.de/datenschutzerklaerung/">Datenschutzrichtlinie</a>.
+                                                    {% else %}
+                                                        <br>
+                                                        <a href="https://fragdenstaat.de/datenschutzerklaerung/">Datenschutzerklärung</a>
+                                                    {% endif %}
+                                                    <br>
+                                                {% endblock %}
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </center>
+                </td>
             </tr>
-          </table>
-        </center>
-      </td>
-    </tr>
-  </table>
-
-</body>
+        </table>
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/body.html b/fragdenstaat_de/fds_mailing/templates/email/default/body.html
index d0e629edc..c332dd37f 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/body.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/body.html
@@ -1,9 +1,8 @@
 {% load cms_tags %}
-
 <tr>
-  <td valign="top" class="body-cell">
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  </td>
+    <td valign="top" class="body-cell">
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </td>
 </tr>
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/header.html b/fragdenstaat_de/fds_mailing/templates/email/default/header.html
index 956972dba..fcfceb0e5 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/header.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/header.html
@@ -1,7 +1,14 @@
 {% load thumbnail %}
-
 <tr>
-  <td height="60" valign="top" class="header-cell" style="padding: 20px; text-align: center; {% if color %}background-color: {{ color }};{% endif %}">
-    <img width="280" height="60" src="{% thumbnail image 280x60 crop=smart subject_location=image.subject_location %}" alt="{{ label }}">
-  </td>
-</tr>
\ No newline at end of file
+    <td height="60"
+        valign="top"
+        class="header-cell"
+        style="padding: 20px;
+               text-align: center;
+               {% if color %}background-color: {{ color }};{% endif %}">
+        <img width="280"
+             height="60"
+             src="{% thumbnail image 280x60 crop=smart subject_location=image.subject_location %}"
+             alt="{{ label }}">
+    </td>
+</tr>
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/section.html b/fragdenstaat_de/fds_mailing/templates/email/default/section.html
index bc2bbbcf2..059ebbecb 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/section.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/section.html
@@ -1,12 +1,12 @@
 <table cellpadding="0" cellspacing="0" width="100%" bgcolor="#ffffff">
-  <tr>
-    <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
-      <h1>{{ title }}</h1>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
-      {% block content %}{% endblock %}
-    </td>
-  </tr>
+    <tr>
+        <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
+            <h1>{{ title }}</h1>
+        </td>
+    </tr>
+    <tr>
+        <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
+            {% block content %}{% endblock %}
+        </td>
+    </tr>
 </table>
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/section_plugin.html b/fragdenstaat_de/fds_mailing/templates/email/default/section_plugin.html
index 04bc822a1..0ecbe3bce 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/section_plugin.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/section_plugin.html
@@ -1,9 +1,7 @@
 {% extends "email/default/section.html" %}
-
 {% load cms_tags %}
-
 {% block content %}
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/story.html b/fragdenstaat_de/fds_mailing/templates/email/default/story.html
index 99377657c..3d3433152 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/story.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/story.html
@@ -1,19 +1,18 @@
 <table cellpadding="0" cellspacing="0" width="100%" bgcolor="#ffffff">
-  <tr>
-    <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
-      <h3>{{ heading }}</h3>
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
-      {% block content %}{% endblock %}
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" style="background-color:#ffffff;">
-      <a href="{{ url }}" style="color:{{ style.primary }};">{{ label }}</a>
-    </td>
-  </tr>
+    <tr>
+        <td valign="top" style="padding-bottom:15px; background-color:#ffffff;">
+            <h3>{{ heading }}</h3>
+        </td>
+    </tr>
+    <tr>
+        <td valign="top" style="padding-bottom:20px; background-color:#ffffff;">
+            {% block content %}{% endblock %}
+        </td>
+    </tr>
+    <tr>
+        <td valign="top" style="background-color:#ffffff;">
+            <a href="{{ url }}" style="color:{{ style.primary }};">{{ label }}</a>
+        </td>
+    </tr>
 </table>
-
-<hr/>
+<hr />
diff --git a/fragdenstaat_de/fds_mailing/templates/email/default/story_plugin.html b/fragdenstaat_de/fds_mailing/templates/email/default/story_plugin.html
index a122441fc..09ca62c57 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/default/story_plugin.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/default/story_plugin.html
@@ -1,9 +1,7 @@
 {% extends "email/default/story.html" %}
-
 {% load cms_tags %}
-
 {% block content %}
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/formal/base.html b/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
index 1fe6c7019..99388bd3b 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/formal/base.html
@@ -1,7 +1,7 @@
 {% extends "email/default/base.html" %}
-
 {% block social_media %}
-Vernetzen Sie sich mit uns!<br>
-<a href="https://twitter.com/fragdenstaat/">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://www.facebook.com/fragdenstaat.de">Facebook</a>
-<br>
+    Vernetzen Sie sich mit uns!
+    <br>
+    <a href="https://twitter.com/fragdenstaat/">Twitter</a> | <a href="https://instagram.com/fragdenstaat">Instagram</a> | <a href="https://chaos.social/@fragdenstaat">Mastodon</a> | <a href="https://www.facebook.com/fragdenstaat.de">Facebook</a>
+    <br>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/email/newsletter/base.html b/fragdenstaat_de/fds_mailing/templates/email/newsletter/base.html
index 9927d42df..49be64b24 100644
--- a/fragdenstaat_de/fds_mailing/templates/email/newsletter/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/email/newsletter/base.html
@@ -1,5 +1,4 @@
 {% extends "email/default/base.html" %}
-
 {% block content %}
-{% block body %}{% endblock %}
+    {% block body %}{% endblock %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/archive/mailing_detail.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/archive/mailing_detail.html
index 57e76c7d5..3aaf59ecd 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/archive/mailing_detail.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/archive/mailing_detail.html
@@ -1,36 +1,23 @@
 {% extends "base.html" %}
-
 {% block app_body %}
-
-  <div class="row justify-content-center mb-5">
-    <div class="col-md-6">
-      <h4>Diesen Newsletter abonnieren</h4>
-      {% include "fds_newsletter/plugins/newsletter_form.html" %}
-    </div>
-  </div>
-
-
-  <div class="row justify-content-center">
-    <div class="col-md-8">
-      <div class="card">
-        <div class="card-header">
-          Newsletter vom {{ date|date:"DATE_FORMAT" }}
+    <div class="row justify-content-center mb-5">
+        <div class="col-md-6">
+            <h4>Diesen Newsletter abonnieren</h4>
+            {% include "fds_newsletter/plugins/newsletter_form.html" %}
         </div>
-        <div class="card-body">
-          <h3 class="card-title">{{ message.subject }}</h3>
-          <div class="card-text">
-            {{ content }}
-          </div>
+    </div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">Newsletter vom {{ date|date:"DATE_FORMAT" }}</div>
+                <div class="card-body">
+                    <h3 class="card-title">{{ message.subject }}</h3>
+                    <div class="card-text">{{ content }}</div>
+                </div>
+            </div>
         </div>
-      </div>
-
     </div>
-  </div>
-
-  <div class="row justify-content-center mt-5">
-    <div class="col-md-6">
-      {% include "fds_newsletter/plugins/newsletter_form.html" %}
+    <div class="row justify-content-center mt-5">
+        <div class="col-md-6">{% include "fds_newsletter/plugins/newsletter_form.html" %}</div>
     </div>
-  </div>
-
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/base.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/base.html
index 30d6d7dbd..cafb4f917 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/base.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/base.html
@@ -1,5 +1,4 @@
 {% extends "cms/base.html" %}
-
 {% block app_body %}
-{% block content %}{% endblock %}
-{% endblock %}
\ No newline at end of file
+    {% block content %}{% endblock %}
+{% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/emailtemplate_update_form.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/emailtemplate_update_form.html
index bf37ac4cc..b506c3e59 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/emailtemplate_update_form.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/emailtemplate_update_form.html
@@ -1,65 +1,60 @@
 {% extends "fds_mailing/base.html" %}
-
 {% load cms_tags %}
 {% load i18n %}
-
 {% block title %}{{ object.name }}{% endblock %}
-
 {% block top_block %}{% endblock %}
-
 {% block navbar %}{% endblock %}
-
 {% block content %}
-<h3 class="mt-3">
-  {{ object.name }} ({{ object.category }})
-</h3>
-<div class="card mt-5">
-  <div class="card-header">
-    {% trans "Subject:" %} {{ object.subject }}
-    <a class="float-end" href="{% url 'admin:fds_mailing_emailtemplate_change' object_id=object.pk %}">{% trans "zurück" %}</a>
-  </div>
-  <div class="card-body">
-    {% render_placeholder object.email_body %}
-  </div>
-  {% with context_vars=object.get_context_vars %}
-    {% if context_vars %}
-      <div class="card-footer text-body-secondary">
-        {% trans "Context vars:" %}
-        {% for var in context_vars %}{% templatetag openvariable %} {{ var }} {% templatetag closevariable %}{% if not forloop.last %}, {% endif %}{% endfor %}
-        
-      </div>
-    {% endif %}
-  {% endwith %}
-</div>
-
-<h4 class="mt-5">{% trans "HTML Preview" %}</h4>
-<iframe class="w-100" height="680" frameborder="0" srcdoc="{{ object.render_email_html|escape }}"></iframe>
-
-<h4 class="mt-5 ">{% trans "Text Preview" %}</h4>
-<div class="border border-dark p-2 mb-5">
-<pre>{{ object.render_email_text }}</pre>
-</div>
-
-
-{% with extra_placeholder=object.get_extra_placeholder_name %}
-  {% if extra_placeholder %}
-    <hr/>
-    <h4>{% blocktrans with extra_placeholder=extra_placeholder %}'{{ extra_placeholder }}' static placeholder{% endblocktrans %}</h4>
-    <div class="border border-dark p-2 mb-2">
-      {% static_placeholder extra_placeholder %}
+    <h3 class="mt-3">{{ object.name }} ({{ object.category }})</h3>
+    <div class="card mt-5">
+        <div class="card-header">
+            {% trans "Subject:" %} {{ object.subject }}
+            <a class="float-end"
+               href="{% url 'admin:fds_mailing_emailtemplate_change' object_id=object.pk %}">{% trans "zurück" %}</a>
+        </div>
+        <div class="card-body">{% render_placeholder object.email_body %}</div>
+        {% with context_vars=object.get_context_vars %}
+            {% if context_vars %}
+                <div class="card-footer text-body-secondary">
+                    {% trans "Context vars:" %}
+                    {% for var in context_vars %}
+                        {% templatetag openvariable %} {{ var }} {% templatetag closevariable %}
+                        {% if not forloop.last %},{% endif %}
+                    {% endfor %}
+                </div>
+            {% endif %}
+        {% endwith %}
     </div>
-    <form method="post" action="{% url 'admin:cms_staticplaceholder_changelist' %}" class="mb-5">
-      {% csrf_token %}
-      <input type="hidden" name="action" value="publish"/>
-      <input type="hidden" name="select_across" value="0"/>
-      <input type="hidden" name="index" value="0"/>
-      <input type="hidden" name="next" value="{{ request.get_full_path }}"/>
-      <input type="hidden" name="_selected_action" value="{{ static_placeholder_id }}"/>
-      <button type="submit" class="btn btn-primary">{% trans "Apply" %}</button>
-    </form>
-  {% endif %}
-{% endwith %}
-
+    <h4 class="mt-5">{% trans "HTML Preview" %}</h4>
+    <iframe class="w-100"
+            height="680"
+            frameborder="0"
+            srcdoc="{{ object.render_email_html|escape }}"></iframe>
+    <h4 class="mt-5 ">{% trans "Text Preview" %}</h4>
+    <div class="border border-dark p-2 mb-5">
+        <pre>{{ object.render_email_text }}</pre>
+    </div>
+    {% with extra_placeholder=object.get_extra_placeholder_name %}
+        {% if extra_placeholder %}
+            <hr />
+            <h4>
+                {% blocktrans with extra_placeholder=extra_placeholder %}'{{ extra_placeholder }}' static placeholder{% endblocktrans %}
+            </h4>
+            <div class="border border-dark p-2 mb-2">{% static_placeholder extra_placeholder %}</div>
+            <form method="post"
+                  action="{% url 'admin:cms_staticplaceholder_changelist' %}"
+                  class="mb-5">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="publish" />
+                <input type="hidden" name="select_across" value="0" />
+                <input type="hidden" name="index" value="0" />
+                <input type="hidden" name="next" value="{{ request.get_full_path }}" />
+                <input type="hidden"
+                       name="_selected_action"
+                       value="{{ static_placeholder_id }}" />
+                <button type="submit" class="btn btn-primary">{% trans "Apply" %}</button>
+            </form>
+        {% endif %}
+    {% endwith %}
 {% endblock %}
-
 {% block footer_container %}{% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/plugins/archive.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/plugins/archive.html
index 9ebb3e50b..2d6ea8dd2 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/plugins/archive.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/plugins/archive.html
@@ -1,12 +1,11 @@
 <div class="list-group mt-3 mb-3">
-  {% for mailing in latest %}
-    <a class="list-group-item list-group-item-action" href="{% url 'newsletter_archive_detail' newsletter_slug=newsletter.slug year=mailing.sending_date.year month=mailing.sending_date.month day=mailing.sending_date.day pk=mailing.pk %}">
-      <div class="d-flex w-100 justify-content-between">
-        <h5 class="mb-1">{{ mailing.email_template.subject }}</h5>
-        <small class="text-body-secondary">
-          {{ mailing.sending_date|date:"DATE_FORMAT" }}
-        </small>
-      </div>
-    </a>
-  {% endfor %}
+    {% for mailing in latest %}
+        <a class="list-group-item list-group-item-action"
+           href="{% url 'newsletter_archive_detail' newsletter_slug=newsletter.slug year=mailing.sending_date.year month=mailing.sending_date.month day=mailing.sending_date.day pk=mailing.pk %}">
+            <div class="d-flex w-100 justify-content-between">
+                <h5 class="mb-1">{{ mailing.email_template.subject }}</h5>
+                <small class="text-body-secondary">{{ mailing.sending_date|date:"DATE_FORMAT" }}</small>
+            </div>
+        </a>
+    {% endfor %}
 </div>
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html
index 85bc009ac..c0df46182 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_base.html
@@ -1,18 +1,12 @@
 {% extends object.get_template %}
 {% load cms_tags %}
-
 {% block body %}
-  {% render_placeholder placeholder %}
-
-  {% if extra_email_placeholder %}
-    <table width="100%" cellspacing="0" cellpadding="0" bgcolor="#ffffff">
-      <tr>
-        <td style="padding-top:20px;background-color:#ffffff;">
-
-          {% static_placeholder extra_email_placeholder %}
-
-        </td>
-      </tr>
-    </table>
-  {% endif %}
+    {% render_placeholder placeholder %}
+    {% if extra_email_placeholder %}
+        <table width="100%" cellspacing="0" cellpadding="0" bgcolor="#ffffff">
+            <tr>
+                <td style="padding-top:20px;background-color:#ffffff;">{% static_placeholder extra_email_placeholder %}</td>
+            </tr>
+        </table>
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_browser.html b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_browser.html
index b443b51c4..83d516498 100644
--- a/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_browser.html
+++ b/fragdenstaat_de/fds_mailing/templates/fds_mailing/render_browser.html
@@ -1,3 +1,2 @@
 {% load cms_tags %}
-
 {% render_placeholder placeholder %}
diff --git a/fragdenstaat_de/fds_newsletter/templates/admin/fds_newsletter/newsletter/change_form.html b/fragdenstaat_de/fds_newsletter/templates/admin/fds_newsletter/newsletter/change_form.html
index 01ebfec50..73b63e397 100644
--- a/fragdenstaat_de/fds_newsletter/templates/admin/fds_newsletter/newsletter/change_form.html
+++ b/fragdenstaat_de/fds_newsletter/templates/admin/fds_newsletter/newsletter/change_form.html
@@ -1,12 +1,10 @@
 {% extends "admin/change_form.html" %}
 {% load i18n %}
 {% block object-tools-items %}
-{% if original.pk %}
-    <li>
-        <a href="{% url 'admin:fds_newsletter-import_csv' pk=original.pk %}">
-        {% trans "Import CSV" %}
-        </a>
-    </li>
-{% endif %}
-{{ block.super }}
+    {% if original.pk %}
+        <li>
+            <a href="{% url 'admin:fds_newsletter-import_csv' pk=original.pk %}">{% trans "Import CSV" %}</a>
+        </li>
+    {% endif %}
+    {{ block.super }}
 {% endblock %}
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/admin/import_csv.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/admin/import_csv.html
index d7fba67ef..4f33eb468 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/admin/import_csv.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/admin/import_csv.html
@@ -1,20 +1,19 @@
 {% extends "helper/admin_base_action.html" %}
-
 {% load i18n %}
-
-{% block action_title %}{% translate 'Import CSV' %}{% endblock %}
-
+{% block action_title %}
+    {% translate 'Import CSV' %}
+{% endblock %}
 {% block breadcrumbs_action_label %}
-  {% translate 'Import CSV' %}
+    {% translate 'Import CSV' %}
 {% endblock %}
-
-
 {% block action_content %}
-  <form method="post" action="{% url 'admin:fds_newsletter-import_csv' pk=object.pk %}" enctype="multipart/form-data">
-    {% csrf_token %}
-    {{ form.as_p }}
-    <p>
-      <input type="submit" value="{% translate 'Import CSV' %}" class="default">
-    </p>
-  </form>
+    <form method="post"
+          action="{% url 'admin:fds_newsletter-import_csv' pk=object.pk %}"
+          enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <p>
+            <input type="submit" value="{% translate 'Import CSV' %}" class="default">
+        </p>
+    </form>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_form.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_form.html
index 8648ed182..74282bdd2 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_form.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_form.html
@@ -1,20 +1,37 @@
 {% load i18n %}
-
-<form class="ajaxified ajax-parent" method="post" action="{% if newsletter %}{% url 'newsletter_ajax_subscribe_request' newsletter_slug=newsletter.slug %}{% else %}{% url 'newsletter_ajax_subscribe_request' %}{% endif %}" data-reference data-userfill>
-  {# honeypot: spam bots that fill out the field are rejected #}
-  <div class="mb-3 row d-none honigtopf">
-    <label class="col-lg-3 col-form-label" for="newsletter_id_phone_{{ instance.pk }}">Bitte geben Sie hier nichts ein</label>
-    <div class="col-lg-9">
-      <input type="text" name="phone" required id="newsletter_id_phone_{{ instance.pk }}">
+<form class="ajaxified ajax-parent"
+      method="post"
+      action="{% if newsletter %}{% url 'newsletter_ajax_subscribe_request' newsletter_slug=newsletter.slug %}{% else %}{% url 'newsletter_ajax_subscribe_request' %}{% endif %}"
+      data-reference
+      data-userfill>
+    {# honeypot: spam bots that fill out the field are rejected #}
+    <div class="mb-3 row d-none honigtopf">
+        <label class="col-lg-3 col-form-label"
+               for="newsletter_id_phone_{{ instance.pk }}">Bitte geben Sie hier nichts ein</label>
+        <div class="col-lg-9">
+            <input type="text"
+                   name="phone"
+                   required
+                   id="newsletter_id_phone_{{ instance.pk }}">
+        </div>
+    </div>
+    <label for="newsletter_id_email_field_{{ instance.pk }}"
+           class="visually-hidden">{% trans "E-mail address" %}</label>
+    <div class="input-group w-100">
+        <input placeholder="{% trans "E-mail address" %}"
+               class="form-control"
+               type="email"
+               name="email"
+               required
+               id="newsletter_id_email_field_{{ instance.pk }}">
+        <button class="btn btn-primary"
+                name="submit"
+                value="{% trans 'Subscribe' %}"
+                type="submit"
+                aria-label="{% trans 'Subscribe' %}">
+            <span class="fa fa-envelope d-none d-md-inline d-lg-none"
+                  aria-hidden="true"></span>
+            <span class="d-md-none d-lg-inline">{% trans "Subscribe" %}</span>
+        </button>
     </div>
-  </div>
-
-  <label for="newsletter_id_email_field_{{ instance.pk }}" class="visually-hidden">{% trans "E-mail address" %}</label>
-  <div class="input-group w-100">
-    <input placeholder="{% trans "E-mail address" %}" class="form-control" type="email" name="email" required id="newsletter_id_email_field_{{ instance.pk }}">
-    <button class="btn btn-primary" name="submit" value="{% trans 'Subscribe' %}" type="submit" aria-label="{% trans 'Subscribe' %}">
-      <span class="fa fa-envelope d-none d-md-inline d-lg-none" aria-hidden="true"></span>
-      <span class="d-md-none d-lg-inline">{% trans "Subscribe" %}</span>
-    </button>
-  </div>
 </form>
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_logic.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_logic.html
index 558cb2b79..9181f7522 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_logic.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/newsletter_logic.html
@@ -1,7 +1,6 @@
 {% load cms_tags %}
-
 {% if should_render %}
-{% for plugin in instance.child_plugin_instances %}
-  {% render_plugin plugin %}
-{% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% endfor %}
 {% endif %}
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html
index 1bd42cfca..edd7e6856 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/plugins/smart_newsletter_form.html
@@ -1,32 +1,39 @@
 {% load form_helper %}
 <div class="mt-3 mb-3">
-{% if not has_newsletter %}
-  <h4>{{ newsletter.title }}</h4>
-  <p>{{ newsletter.description }}</p>
-  <form method="post" action="{% url 'newsletter_subscribe_request' newsletter_slug=newsletter.slug %}">
-    {% csrf_token %}
-    {% if next %}
-      <input type="hidden" name="next" value="{{ next }}"/>
+    {% if not has_newsletter %}
+        <h4>{{ newsletter.title }}</h4>
+        <p>{{ newsletter.description }}</p>
+        <form method="post"
+              action="{% url 'newsletter_subscribe_request' newsletter_slug=newsletter.slug %}">
+            {% csrf_token %}
+            {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
+            {% render_field form.phone %}
+            {% if form.test %}
+                {% render_field form.test %}
+            {% endif %}
+            <label for="newsletter_id_email_field-{{ newsletter.id }}_{{ instance.pk }}"
+                   class="visually-hidden">E-Mail</label>
+            <div class="input-group w-100">
+                <input placeholder="E-Mail"
+                       class="form-control"
+                       type="email"
+                       {% if request.user.is_authenticated %}value="{{ request.user.email }}"{% endif %}
+                       name="email"
+                       required
+                       id="newsletter_id_email_field-{{ newsletter.id }}_{{ instance.pk }}">
+                <button class="btn btn-primary" name="submit" value="Subscribe" type="submit">
+                    <span class="fa fa-envelope d-none d-md-inline d-lg-none"></span>
+                    <span class="d-md-none d-lg-inline">Abonnieren</span>
+                </button>
+            </div>
+        </form>
+    {% elif has_newsletter and fallback %}
+        <h4>Unterstützen Sie FragDenStaat!</h4>
+        <div class="d-grid">
+            <a class="btn btn-danger text-white"
+               href="/spenden/?pk_campaign=newsletter-subscribed&amp;pk_keyword={{ request.path | urlencode }}">
+                Jetzt spenden
+            </a>
+        </div>
     {% endif %}
-    {% render_field form.phone %}
-    {% if form.test %}
-      {% render_field form.test %}
-    {% endif %}
-    <label for="newsletter_id_email_field-{{ newsletter.id }}_{{ instance.pk }}" class="visually-hidden">E-Mail</label>
-    <div class="input-group w-100">
-      <input placeholder="E-Mail" class="form-control" type="email" {% if request.user.is_authenticated %}value="{{ request.user.email }}"{% endif %} name="email" required id="newsletter_id_email_field-{{ newsletter.id }}_{{ instance.pk }}">
-      <button class="btn btn-primary" name="submit" value="Subscribe" type="submit">
-        <span class="fa fa-envelope d-none d-md-inline d-lg-none"></span>
-        <span class="d-md-none d-lg-inline">Abonnieren</span>
-      </button>
-    </div>
-  </form>
-  {% elif has_newsletter and fallback %}
-    <h4>Unterstützen Sie FragDenStaat!</h4>
-    <div class="d-grid">
-      <a class="btn btn-danger text-white" href="/spenden/?pk_campaign=newsletter-subscribed&amp;pk_keyword={{ request.path | urlencode }}">
-        Jetzt spenden
-      </a>
-    </div>
-  {% endif %}
 </div>
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/subscribe.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/subscribe.html
index 282702467..d2bdfdbb4 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/subscribe.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/subscribe.html
@@ -1,22 +1,17 @@
 {% extends "base.html" %}
-
 {% load form_helper %}
-
-{% block title %}{{ newsletter.title }}{% endblock title %}
-
+{% block title %}
+    {{ newsletter.title }}
+{% endblock title %}
 {% block app_body %}
-  <div class="row justify-content-center">
-    <div class="col-md-10">
-      <h2>{{ newsletter.title }}</h2>
-
-      <form method="post" action=".">
-        {% csrf_token %}
-
-        {% render_form form %}
-
-        <button class="btn btn-primary" type="submit">Abonnieren</button>
-      </form>
-
+    <div class="row justify-content-center">
+        <div class="col-md-10">
+            <h2>{{ newsletter.title }}</h2>
+            <form method="post" action=".">
+                {% csrf_token %}
+                {% render_form form %}
+                <button class="btn btn-primary" type="submit">Abonnieren</button>
+            </form>
+        </div>
     </div>
-  </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/user_settings.html b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/user_settings.html
index 05f26b3d6..bef5be40f 100644
--- a/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/user_settings.html
+++ b/fragdenstaat_de/fds_newsletter/templates/fds_newsletter/user_settings.html
@@ -1,21 +1,15 @@
 {% load i18n %}
-
 {% load form_helper %}
-
 <div id="newsletter" class="card mb-3">
-  <h5 class="card-header">
-    Ihre Newsletter-Einstellungen
-  </h5>
-  <div class="card-body">
-    <p>
-      Bitte wählen Sie, welche Newsletter Sie erhalten wollen.
-    </p>
-    <form method="POST" action="{% url 'newsletter_user_settings' %}">
-      {% csrf_token %}
-      {% render_form form %}
-      <p>
-        <button class="btn btn-secondary" type="submit">{% trans "Update subscriptions" %}</button>
-      </p>
-    </form>
-  </div>
-</div>
\ No newline at end of file
+    <h5 class="card-header">Ihre Newsletter-Einstellungen</h5>
+    <div class="card-body">
+        <p>Bitte wählen Sie, welche Newsletter Sie erhalten wollen.</p>
+        <form method="POST" action="{% url 'newsletter_user_settings' %}">
+            {% csrf_token %}
+            {% render_form form %}
+            <p>
+                <button class="btn btn-secondary" type="submit">{% trans "Update subscriptions" %}</button>
+            </p>
+        </form>
+    </div>
+</div>
diff --git a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/message.html b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/message.html
index 2bc321e65..e3c1d307a 100644
--- a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/message.html
+++ b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/message.html
@@ -1,31 +1,36 @@
-{% load i18n %}<!DOCTYPE html>
-
+{% load i18n %}
+<!DOCTYPE html>
 <html>
-<head>
-    <meta charset="utf-8">
-	<title>{{ newsletter.title }}: {{ message.title }}</title>
-</head>
-<body>
-    <h1>{{ newsletter.title }}</h1>
-    <h2>{{ message.title }}</h2>
-    {% for article in message.articles.all %}
-        <h3>{{ article.title }}</h3>
-        
-        <div>{{ article.text|safe }}</div>
-        
-        {% if article.url %}
-            <div><a href="{{ article.url }}">Weiterlesen</a></div>
-        {% endif %}
-    {% endfor %}
-    
-    <ul>
-        {% if submission.publish %}
-        <li><a href="https://{{ site.domain }}{{ submission.get_absolute_url }}"></a></li>
-        {% endif %}
-        {% if login_url %}
-        <li><a href="{{ login_url }}">Zu Ihrem FragDenStaat.de-Konto</a></li>
-        {% endif %}
-        <li><a href="{{ unsubscribe_url }}">Abbestellen</a></li>
-    </ul>
-</body>
+    <head>
+        <meta charset="utf-8">
+        <title>{{ newsletter.title }}: {{ message.title }}</title>
+    </head>
+    <body>
+        <h1>{{ newsletter.title }}</h1>
+        <h2>{{ message.title }}</h2>
+        {% for article in message.articles.all %}
+            <h3>{{ article.title }}</h3>
+            <div>{{ article.text|safe }}</div>
+            {% if article.url %}
+                <div>
+                    <a href="{{ article.url }}">Weiterlesen</a>
+                </div>
+            {% endif %}
+        {% endfor %}
+        <ul>
+            {% if submission.publish %}
+                <li>
+                    <a href="https://{{ site.domain }}{{ submission.get_absolute_url }}"></a>
+                </li>
+            {% endif %}
+            {% if login_url %}
+                <li>
+                    <a href="{{ login_url }}">Zu Ihrem FragDenStaat.de-Konto</a>
+                </li>
+            {% endif %}
+            <li>
+                <a href="{{ unsubscribe_url }}">Abbestellen</a>
+            </li>
+        </ul>
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/subscribe.html b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/subscribe.html
index c8fd5c2c8..ca34b0014 100644
--- a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/subscribe.html
+++ b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/subscribe.html
@@ -1,22 +1,21 @@
 <!DOCTYPE html>
-
 <html>
-<head>
-    <meta charset="utf-8">
-    <title>Abonnement von {{ newsletter.title }}
-</title>
-</head>
-<body>
-{% if first_name %}Liebe*r {{ first_name }},{% elif name %}Liebe*r {{ name }},{% else %}Hallo!{% endif %}
-
-Du, oder jemand anderes, möchte mit Deiner E-Mail-Adresse den „{{ newsletter.title }}“-Newsletter abonnieren.
-
-Um das Abonnement zu bestätigen, klicke bitte diesen Aktivierungs-Link:
-
-https://{{ domain }}{{ subscription.subscribe_activate_url }}
-
-
-Beste Grüße
-{{ newsletter.sender }}
-</body>
+    <head>
+        <meta charset="utf-8">
+        <title>Abonnement von {{ newsletter.title }}</title>
+    </head>
+    <body>
+        {% if first_name %}
+            Liebe*r {{ first_name }},
+        {% elif name %}
+            Liebe*r {{ name }},
+        {% else %}
+            Hallo!
+        {% endif %}
+        Du, oder jemand anderes, möchte mit Deiner E-Mail-Adresse den „{{ newsletter.title }}“-Newsletter abonnieren.
+        Um das Abonnement zu bestätigen, klicke bitte diesen Aktivierungs-Link:
+        https://{{ domain }}{{ subscription.subscribe_activate_url }}
+        Beste Grüße
+        {{ newsletter.sender }}
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/unsubscribe.html b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/unsubscribe.html
index 80e6fecf1..c4c9dd9bd 100644
--- a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/unsubscribe.html
+++ b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/unsubscribe.html
@@ -1,22 +1,22 @@
-{% load i18n %}<!DOCTYPE html>
-
+{% load i18n %}
+<!DOCTYPE html>
 <html>
-<head>
-    <meta charset="utf-8">
-    <title>Abbestellen von „{{ newsletter.title }}“</title>
-</head>
-<body>
-{% if first_name %}Liebe*r {{ first_name }},{% elif name %}Liebe*r {{ name }},{% else %}Hallo!{% endif %}
-
-Du, oder jemand anderes, möchte mit den „{{ newsletter.title }}“-Newsletter abbestellen.
-
-Um das Abbestellen zu bestätigen, klicke bitte diesen Abbestellen-Link:
-
-https://{{ domain }}{{ subscription.unsubscribe_activate_url }}
-
-
-Beste Grüße
-{{ newsletter.sender }}
-
-</body>
+    <head>
+        <meta charset="utf-8">
+        <title>Abbestellen von „{{ newsletter.title }}“</title>
+    </head>
+    <body>
+        {% if first_name %}
+            Liebe*r {{ first_name }},
+        {% elif name %}
+            Liebe*r {{ name }},
+        {% else %}
+            Hallo!
+        {% endif %}
+        Du, oder jemand anderes, möchte mit den „{{ newsletter.title }}“-Newsletter abbestellen.
+        Um das Abbestellen zu bestätigen, klicke bitte diesen Abbestellen-Link:
+        https://{{ domain }}{{ subscription.unsubscribe_activate_url }}
+        Beste Grüße
+        {{ newsletter.sender }}
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/update.html b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/update.html
index 284d504d4..19fdb00f4 100644
--- a/fragdenstaat_de/fds_newsletter/templates/newsletter/message/update.html
+++ b/fragdenstaat_de/fds_newsletter/templates/newsletter/message/update.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
-
 <html>
-<head>
-    <meta charset="utf-8">
-    <title>Angaben zum Abonnement von „{{ newsletter.title }}“ ändern.</title>
-</head>
-<body>
-{% if first_name %}Liebe*r {{ first_name }},{% elif name %}Liebe*r {{ name }},{% else %}Hallo!{% endif %}
-
-Du, oder jemand anderes, möchte die Abonnement-Details beim „{{ newsletter.title }}“-Newsletter ändern.
-
-Um Änderungen an dem Abonnement durchzuführen, klicke diesen Link:
-
-https://{{ domain }}{{ subscription.update_activate_url }}
-
-
-Beste Grüße
-{{ newsletter.sender }}
-</body>
+    <head>
+        <meta charset="utf-8">
+        <title>Angaben zum Abonnement von „{{ newsletter.title }}“ ändern.</title>
+    </head>
+    <body>
+        {% if first_name %}
+            Liebe*r {{ first_name }},
+        {% elif name %}
+            Liebe*r {{ name }},
+        {% else %}
+            Hallo!
+        {% endif %}
+        Du, oder jemand anderes, möchte die Abonnement-Details beim „{{ newsletter.title }}“-Newsletter ändern.
+        Um Änderungen an dem Abonnement durchzuführen, klicke diesen Link:
+        https://{{ domain }}{{ subscription.update_activate_url }}
+        Beste Grüße
+        {{ newsletter.sender }}
+    </body>
 </html>
diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/base.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/base.html
index c04592e9a..2d233108c 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/base.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/base.html
@@ -1,13 +1,16 @@
-{% load static %}<!DOCTYPE html>
+{% load static %}
+<!DOCTYPE html>
 <html lang="de">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="robots" content="noindex"/>
-  <title>{% block title %}{% endblock %}</title>
-  <link href="{% static 'css/main.css' %}" rel="stylesheet">
-  <style>
+    <head>
+        <meta charset="UTF-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="robots" content="noindex" />
+        <title>
+            {% block title %}{% endblock %}
+        </title>
+        <link href="{% static 'css/main.css' %}" rel="stylesheet">
+        <style>
     .og-container {
       height: 100vh;
       width: 100vw;
@@ -24,10 +27,10 @@
     .og-container .fa {
       font-size: 2.5rem !important;
     }
-  </style>
-  {% block extra_style %}{% endblock %}
-</head>
-<body>
-  {% block body %}{% endblock %}
-</body>
-</html>
\ No newline at end of file
+        </style>
+        {% block extra_style %}{% endblock %}
+    </head>
+    <body>
+        {% block body %}{% endblock %}
+    </body>
+</html>
diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html
index 8ccc6fa65..0a00527dc 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/foirequest.html
@@ -1,78 +1,69 @@
 {% extends "fds_ogimage/base.html" %}
-
 {% load humanize %}
-
 {% block title %}{{ object.title }}{% endblock %}
-
 {% block body %}
-<div class="og-container d-flex flex-column">
-  <div class="bg-body-secondary px-5 pt-5" style="min-height: 40vh">
-    <div class="row">
-      <div class="{% if not object.user.private and object.user.profile_photo %}col-10{% else %}col-12{% endif %}">
-        <h2>
-          {{ object.title|truncatechars:120 }}
-        </h2>
-        {% if object.status_is_final and object.status_representation %}
-          <p class="lead">
-            {% if object.status_representation %}
-              <span class="mt-2 float-start request-link__icon icon status-{{ object.status_representation }} {% if object.has_fee %}--has-fee{% endif %}"></span>
-              <strong>{{ object.readable_status }}</strong>
-            {% endif %}
-          </p>
-        {% elif not object.law.meta %}
-          <p class="lead mt-5">
-            &rarr; {{ object.law.name }}
-          </p>
-        {% endif %}
-      </div>
-      {% if not object.user.private and object.user.profile_photo %}
-        <div class="col-2">
-          <img class="img-fluid rounded-circle" src="{{ object.user.profile_photo.url }}" alt="{{ object.user.get_full_name }}">
-        </div>
-      {% endif %}
-    </div>
-  </div>
-  <div class="d-flex flex-column flex-grow-1">
-    <div class="px-5 pb-5 pt-3">
-      <div class="row">
-        <div class="col-12">
-          <h3>
-            {{ object.public_body.name|truncatechars:90 }}
-          </h3>
-        </div>
-      </div>
-    </div>
-    <div class="pb-5 px-5 mt-auto">
-      <div class="row justify-content-between">
-        <div class="col-4">
-          <div class="d-flex">
-            <span class="flex-shrink-0 fa fa-send me-3"></span>
-            <div class="flex-grow-1 ms-3">
-              <h2 class="mt-0">
-                {{ object.created_at | date }}
-              </h2>
+    <div class="og-container d-flex flex-column">
+        <div class="bg-body-secondary px-5 pt-5" style="min-height: 40vh">
+            <div class="row">
+                <div class="{% if not object.user.private and object.user.profile_photo %}col-10{% else %}col-12{% endif %}">
+                    <h2>{{ object.title|truncatechars:120 }}</h2>
+                    {% if object.status_is_final and object.status_representation %}
+                        <p class="lead">
+                            {% if object.status_representation %}
+                                <span class="mt-2 float-start request-link__icon icon status-{{ object.status_representation }} {% if object.has_fee %}--has-fee{% endif %}"></span>
+                                <strong>{{ object.readable_status }}</strong>
+                            {% endif %}
+                        </p>
+                    {% elif not object.law.meta %}
+                        <p class="lead mt-5">&rarr; {{ object.law.name }}</p>
+                    {% endif %}
+                </div>
+                {% if not object.user.private and object.user.profile_photo %}
+                    <div class="col-2">
+                        <img class="img-fluid rounded-circle"
+                             src="{{ object.user.profile_photo.url }}"
+                             alt="{{ object.user.get_full_name }}">
+                    </div>
+                {% endif %}
             </div>
-          </div>
         </div>
-        <div class="col-4">
-          {% if not object.status_is_final %}
-            <div class="d-flex {% if object.is_overdue %}text-danger{% endif %}">
-              <span class="flex-shrink-0 fa fa-calendar me-3"></span>
-              <div class="flex-grow-1 ms-3">
-                <h2 class="mt-0">
-                  {{ object.due_date | date }}
-                </h2>
-              </div>
+        <div class="d-flex flex-column flex-grow-1">
+            <div class="px-5 pb-5 pt-3">
+                <div class="row">
+                    <div class="col-12">
+                        <h3>{{ object.public_body.name|truncatechars:90 }}</h3>
+                    </div>
+                </div>
+            </div>
+            <div class="pb-5 px-5 mt-auto">
+                <div class="row justify-content-between">
+                    <div class="col-4">
+                        <div class="d-flex">
+                            <span class="flex-shrink-0 fa fa-send me-3"></span>
+                            <div class="flex-grow-1 ms-3">
+                                <h2 class="mt-0">{{ object.created_at | date }}</h2>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-4">
+                        {% if not object.status_is_final %}
+                            <div class="d-flex {% if object.is_overdue %}text-danger{% endif %}">
+                                <span class="flex-shrink-0 fa fa-calendar me-3"></span>
+                                <div class="flex-grow-1 ms-3">
+                                    <h2 class="mt-0">{{ object.due_date | date }}</h2>
+                                </div>
+                            </div>
+                        {% endif %}
+                    </div>
+                    <div class="col-auto ms-auto">
+                        <div class="mt-n4">
+                            <img height="80"
+                                 src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg"
+                                 alt="FragDenStaat.de" />
+                        </div>
+                    </div>
+                </div>
             </div>
-          {% endif %}
-        </div>
-        <div class="col-auto ms-auto">
-          <div class="mt-n4">
-            <img height="80" src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg" alt="FragDenStaat.de"/>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_plan.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_plan.html
index 8fe8be9f4..22cf50b91 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_plan.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_plan.html
@@ -1,11 +1,8 @@
 {% extends "fds_ogimage/base.html" %}
-
 {% load humanize %}
-
 {% block title %}{{ object.title }}{% endblock %}
-
 {% block extra_style %}
-<style>
+    <style>
 body {
   background-image: url('https://media.frag-den-staat.de/files/media/main/d5/0b/d50be174-0cd1-4a35-97e4-2d7747db8404/temp-lineart.jpg');
   background-size: cover;
@@ -15,53 +12,50 @@
 .bg-translucent {
   background: rgba(255,255,255,0.9);
 }
-</style>
+    </style>
 {% endblock %}
-
 {% block body %}
-<div class="og-container d-flex flex-column min-h-screen">
-  <div class="p-5">
-    <img class="img-fluid col-5 px-0" src="https://media.frag-den-staat.de/files/media/main/98/91/98919aa3-9200-4f99-a7c7-de25cda8675a/logo-koalitionstracker-w.svg" alt="Koalitionstracker">
-  </div>
-  <div class="d-flex flex-column flex-grow-1 bg-translucent">
-    <div class="p-5 d-flex align-items-center flex-1 h-100">
-      <h3>
-        {% block tagline %}
-        {{ object.title|truncatechars:100 }}
-        {% endblock %}
-      </h3>
-    </div>
-    <div class="pb-5 px-5 mt-auto">
-      <div class="row justify-content-between align-items-center">
-        {% block bottom_row %}
-        <div class="col-4">
-          <div class="badge text-bg-{{ object.get_status_css }} p-3 d-inline-flex">
-            <i class="fa fa-circle me-3"></i>
-            <span class="h2 m-0">
-              {{ object.get_status_display }}
-            </span>
-          </div>
+    <div class="og-container d-flex flex-column min-h-screen">
+        <div class="p-5">
+            <img class="img-fluid col-5 px-0"
+                 src="https://media.frag-den-staat.de/files/media/main/98/91/98919aa3-9200-4f99-a7c7-de25cda8675a/logo-koalitionstracker-w.svg"
+                 alt="Koalitionstracker">
         </div>
-        <div class="col-4">
-          {% if object.due_date %}
-            <div class="d-flex {% if object.is_overdue %}text-danger{% endif %}">
-              <div class="flex-shrink-0">
-                <span class="fa fa-calendar"></span>
-              </div>
-              <div class="flex-grow-1 ms-3">
-                <h2 class="m-0">
-                  {{ object.due_date | date }}
-                </h2>
-              </div>
+        <div class="d-flex flex-column flex-grow-1 bg-translucent">
+            <div class="p-5 d-flex align-items-center flex-1 h-100">
+                <h3>
+                    {% block tagline %}{{ object.title|truncatechars:100 }}{% endblock %}
+                </h3>
+            </div>
+            <div class="pb-5 px-5 mt-auto">
+                <div class="row justify-content-between align-items-center">
+                    {% block bottom_row %}
+                        <div class="col-4">
+                            <div class="badge text-bg-{{ object.get_status_css }} p-3 d-inline-flex">
+                                <i class="fa fa-circle me-3"></i>
+                                <span class="h2 m-0">{{ object.get_status_display }}</span>
+                            </div>
+                        </div>
+                        <div class="col-4">
+                            {% if object.due_date %}
+                                <div class="d-flex {% if object.is_overdue %}text-danger{% endif %}">
+                                    <div class="flex-shrink-0">
+                                        <span class="fa fa-calendar"></span>
+                                    </div>
+                                    <div class="flex-grow-1 ms-3">
+                                        <h2 class="m-0">{{ object.due_date | date }}</h2>
+                                    </div>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endblock bottom_row %}
+                    <div class="col-auto ms-auto">
+                        <img height="80"
+                             src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg"
+                             alt="FragDenStaat.de" />
+                    </div>
+                </div>
             </div>
-          {% endif %}
-        </div>
-        {% endblock bottom_row %}
-        <div class="col-auto ms-auto">
-          <img height="80" src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg" alt="FragDenStaat.de"/>
         </div>
-      </div>
     </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
index a2094be51..805d4a058 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/govplan_section.html
@@ -1,18 +1,19 @@
 {% extends "fds_ogimage/govplan_plan.html" %}
-
 {% load govplan %}
-
 {% block tagline %}Themenbereich {{ object.title }}{% endblock %}
-
 {% block bottom_row %}
-  {% get_plan_progress plans as progress %}
-  <div class="col-7">
-    <div class="progress text-bg-body" style="height: 60px;">
-      {% for section in progress.sections %}
-        <div class="progress-bar {% if section.name == 'not_started' %}progress-bar-striped bg-secondary{% else %}bg-dark{% endif %}" role="progressbar" style="width: {{ section.css_percentage }}%;" aria-valuenow="{{ section.css_percentage }}" aria-valuemin="0" aria-valuemax="100">
+    {% get_plan_progress plans as progress %}
+    <div class="col-7">
+        <div class="progress text-bg-body" style="height: 60px;">
+            {% for section in progress.sections %}
+                <div class="progress-bar {% if section.name == 'not_started' %}progress-bar-striped bg-secondary{% else %}bg-dark{% endif %}"
+                     role="progressbar"
+                     style="width: {{ section.css_percentage }}%"
+                     aria-valuenow="{{ section.css_percentage }}"
+                     aria-valuemin="0"
+                     aria-valuemax="100"></div>
+            {% endfor %}
         </div>
-      {% endfor %}
     </div>
-  </div>
-  <div class="col-1"></div>
+    <div class="col-1"></div>
 {% endblock %}
diff --git a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/profile.html b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/profile.html
index 9c94ddb15..8a647feef 100644
--- a/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/profile.html
+++ b/fragdenstaat_de/fds_ogimage/templates/fds_ogimage/profile.html
@@ -1,82 +1,72 @@
 {% extends "fds_ogimage/base.html" %}
-
 {% load humanize %}
-
 {% block title %}{{ object.get_full_name }}{% endblock %}
-
 {% block body %}
-<div class="og-container">
-  <div class="bg-body-secondary p-5">
-    <div class="row">
-      <div class="col-10">
-        <h1>
-          {{ object.get_full_name }}
-        </h1>
-        {% if object.organization %}
-          <p class="lead mb-1">
-            {{ object.organization }}
-          </p>
-        {% endif %}
-      </div>
-      <div class="col-2">
-        {% if object.profile_photo %}
-          <img class="img-fluid rounded-circle" src="{{ object.profile_photo.url }}" alt="{{ object.get_full_name }}">
-        {% endif %}
-      </div>
-    </div>
-  </div>
-  <div class="p-5">
-    <div class="row justify-content-between">
-      <div class="col-4">
-        <div class="d-flex">
-          <span class="flex-shrink-0 fa fa-send me-3"></span>
-          <div class="flex-grow-1 ms-3">
-            <h2 class="mt-0">
-              {{ aggregates.count|intcomma }} Anfragen
-            </h2>
-          </div>
-        </div>
-      </div>
-      <div class="col-4">
-        <div class="d-flex">
-          <span class="flex-shrink-0 fa fa-check-circle me-3 me-2"></span>
-          <div class="flex-grow-1 ms-3">
-            <h2 class="mt-0">
-              {{ aggregates.successful|intcomma }} erfolgreich
-            </h2>
-          </div>
+    <div class="og-container">
+        <div class="bg-body-secondary p-5">
+            <div class="row">
+                <div class="col-10">
+                    <h1>{{ object.get_full_name }}</h1>
+                    {% if object.organization %}<p class="lead mb-1">{{ object.organization }}</p>{% endif %}
+                </div>
+                <div class="col-2">
+                    {% if object.profile_photo %}
+                        <img class="img-fluid rounded-circle"
+                             src="{{ object.profile_photo.url }}"
+                             alt="{{ object.get_full_name }}">
+                    {% endif %}
+                </div>
+            </div>
         </div>
-      </div>
-      <div class="col-4">
-        <div class="d-flex">
-          <span class="flex-shrink-0 fa fa-ban me-3"></span>
-          <div class="flex-grow-1 ms-3">
-            <h2 class="mt-0">
-              {{ aggregates.refused|intcomma }} abgelehnt
-            </h2>
-          </div>
+        <div class="p-5">
+            <div class="row justify-content-between">
+                <div class="col-4">
+                    <div class="d-flex">
+                        <span class="flex-shrink-0 fa fa-send me-3"></span>
+                        <div class="flex-grow-1 ms-3">
+                            <h2 class="mt-0">{{ aggregates.count|intcomma }} Anfragen</h2>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="d-flex">
+                        <span class="flex-shrink-0 fa fa-check-circle me-3 me-2"></span>
+                        <div class="flex-grow-1 ms-3">
+                            <h2 class="mt-0">{{ aggregates.successful|intcomma }} erfolgreich</h2>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-4">
+                    <div class="d-flex">
+                        <span class="flex-shrink-0 fa fa-ban me-3"></span>
+                        <div class="flex-grow-1 ms-3">
+                            <h2 class="mt-0">{{ aggregates.refused|intcomma }} abgelehnt</h2>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </div>
-  <div class="px-5 pb-5 pt-3">
-    <div class="row">
-      <div class="col-8">
-        {% if top_publicbodies %}
-          {% with pb=top_publicbodies.0 %}
-            <h2>
-              <span class="badge text-bg-body-secondary">Top-Behörde</span><br/>
-              {{ pb.name }}
-            </h2>
-          {% endwith %}
-        {% endif %}
-      </div>
-      <div class="col-4">
-        <div class="mt-5">
-          <img height="80" src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg" alt="FragDenStaat.de"/>
+        <div class="px-5 pb-5 pt-3">
+            <div class="row">
+                <div class="col-8">
+                    {% if top_publicbodies %}
+                        {% with pb=top_publicbodies.0 %}
+                            <h2>
+                                <span class="badge text-bg-body-secondary">Top-Behörde</span>
+                                <br />
+                                {{ pb.name }}
+                            </h2>
+                        {% endwith %}
+                    {% endif %}
+                </div>
+                <div class="col-4">
+                    <div class="mt-5">
+                        <img height="80"
+                             src="https://static.frag-den-staat.de/static/img/header_logo.580ed694906e.svg"
+                             alt="FragDenStaat.de" />
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/_frontend.html b/fragdenstaat_de/templates/_frontend.html
index fb948412f..fd3315fa9 100644
--- a/fragdenstaat_de/templates/_frontend.html
+++ b/fragdenstaat_de/templates/_frontend.html
@@ -1,8 +1,12 @@
 {% load frontendbuild sekizai_tags %}
-
 {% if request.current_page or force_cms_render %}
     {% getfrontendbuild entry_point as assets %}
-    {% for block, output_list in assets %}{% for output in output_list %}{% addtoblock block %}{{ output|safe }}{% endaddtoblock %}{% endfor %}{% endfor %}
+    {% for block, output_list in assets %}
+        {% for output in output_list %}
+            {% addtoblock block %}
+            {{ output|safe }}{% endaddtoblock %}
+        {% endfor %}
+    {% endfor %}
 {% else %}
     {% addfrontendbuild entry_point %}
 {% endif %}
diff --git a/fragdenstaat_de/templates/account/admin_send_mail.html b/fragdenstaat_de/templates/account/admin_send_mail.html
index 0f6f38b07..4d816b8ea 100644
--- a/fragdenstaat_de/templates/account/admin_send_mail.html
+++ b/fragdenstaat_de/templates/account/admin_send_mail.html
@@ -1,32 +1,36 @@
 {% extends "helper/admin_base_action.html" %}
-
 {% load i18n l10n %}
-
-{% block action_title %}{% trans 'Prepare mailing to users' %}{% endblock %}
-
+{% block action_title %}
+    {% trans 'Prepare mailing to users' %}
+{% endblock %}
 {% block breadcrumbs_action_label %}
-  {% trans 'Prepare mailing to users' %}
+    {% trans 'Prepare mailing to users' %}
 {% endblock %}
-
 {% block action_content %}
-<form action="" method="post">{% csrf_token %}
-  <div>
-    <p>
-      <label>{% trans "Mailing name" %}: <input type="text" name="subject" value=""/>
-    </p>
-    <p>
-      <input type="submit" value="{% blocktrans count count=queryset.count %}Setup mailing to one user{% plural %}Setup mailing to {{ count }} users{% endblocktrans %}" />
-    </p>
-  </div>
-  <input type="hidden" name="action" value="{{ action_name }}" />
-  {% if select_across %}
-    <input type="hidden" name="select_across" value="1"/>
-    {# set invalid selected, so confirmation action path is chosen in admin #}
-    <input type="hidden" name="{{ action_checkbox_name }}" value="_" />
-  {% else %}
-    {% for obj in queryset %}
-      <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
-    {% endfor %}
-  {% endif %}
-</form>
-{% endblock %}
+    <form action="" method="post">
+        {% csrf_token %}
+        <div>
+            <p>
+                <label>
+                    {% trans "Mailing name" %}:
+                    <input type="text" name="subject" value="" />
+                </p>
+                <p>
+                    <input type="submit"
+                           value="{% blocktrans count count=queryset.count %}Setup mailing to one user{% plural %}Setup mailing to {{ count }} users{% endblocktrans %}" />
+                </p>
+            </div>
+            <input type="hidden" name="action" value="{{ action_name }}" />
+            {% if select_across %}
+                <input type="hidden" name="select_across" value="1" />
+                {# set invalid selected, so confirmation action path is chosen in admin #}
+                <input type="hidden" name="{{ action_checkbox_name }}" value="_" />
+            {% else %}
+                {% for obj in queryset %}
+                    <input type="hidden"
+                           name="{{ action_checkbox_name }}"
+                           value="{{ obj.pk|unlocalize }}" />
+                {% endfor %}
+            {% endif %}
+        </form>
+    {% endblock %}
diff --git a/fragdenstaat_de/templates/account/login.html b/fragdenstaat_de/templates/account/login.html
index 4f25d4961..c4f6109af 100644
--- a/fragdenstaat_de/templates/account/login.html
+++ b/fragdenstaat_de/templates/account/login.html
@@ -1,5 +1,4 @@
 {% extends "account/login.html" %}
-
 {% block signup_hint %}
-Noch kein Konto? Klicken Sie hier, um ein Konto zur Antragstellung oder Spendenverwaltung zu erstellen!
+    Noch kein Konto? Klicken Sie hier, um ein Konto zur Antragstellung oder Spendenverwaltung zu erstellen!
 {% endblock %}
diff --git a/fragdenstaat_de/templates/account/new_terms.html b/fragdenstaat_de/templates/account/new_terms.html
index a5560cddb..971e60b6b 100644
--- a/fragdenstaat_de/templates/account/new_terms.html
+++ b/fragdenstaat_de/templates/account/new_terms.html
@@ -1,31 +1,18 @@
 {% extends 'account/new_terms.html' %}
-
 {% block terms_details %}
-<p>
-  Unsere Nutzungsbedingungen wurden von <a href="http://www.irights-law.de/">iRights.Law</a> komplett überarbeitet und verständlicher gemacht.
-</p>
-
-<p>
-  Folgendes ist besser geworden:
-</p>
-
-<ul>
-  <li>
-    Klare Trennung der zwei grundlegenden FragDenStaat.de-Funktionalitäten <strong>E-Mail-Dienst</strong> und <strong>Anfragen-Archiv</strong> in separate Nutzungsbedingungen.
-  </li>
-  <li>
-    Bessere Erklärung, welche Dienstleistungen FragDenStaat.de anbietet und wie diese funktionieren.
-  </li>
-  <li>
-    Verständlichere Datenschutzerklärung
-  </li>
-  <li>
-    Möglichkeit eines Newsletters
-  </li>
-</ul>
-
-<p>
-  Mit den neuen Nutzungsbedingungen wollen wir Nutzerinnen und Nutzern sowie Behörden verständlicher kommunizieren, was FragDenStaat.de für Dienstleistungen anbietet. Falls Sie zu diesen Änderungen Fragen haben, schreiben Sie uns eine Mail an <a href="mailto:info@fragdenstaat.de">info@fragdenstaat.de</a>.
-</p>
-
+    <p>
+        Unsere Nutzungsbedingungen wurden von <a href="http://www.irights-law.de/">iRights.Law</a> komplett überarbeitet und verständlicher gemacht.
+    </p>
+    <p>Folgendes ist besser geworden:</p>
+    <ul>
+        <li>
+            Klare Trennung der zwei grundlegenden FragDenStaat.de-Funktionalitäten <strong>E-Mail-Dienst</strong> und <strong>Anfragen-Archiv</strong> in separate Nutzungsbedingungen.
+        </li>
+        <li>Bessere Erklärung, welche Dienstleistungen FragDenStaat.de anbietet und wie diese funktionieren.</li>
+        <li>Verständlichere Datenschutzerklärung</li>
+        <li>Möglichkeit eines Newsletters</li>
+    </ul>
+    <p>
+        Mit den neuen Nutzungsbedingungen wollen wir Nutzerinnen und Nutzern sowie Behörden verständlicher kommunizieren, was FragDenStaat.de für Dienstleistungen anbietet. Falls Sie zu diesen Änderungen Fragen haben, schreiben Sie uns eine Mail an <a href="mailto:info@fragdenstaat.de">info@fragdenstaat.de</a>.
+    </p>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/account/profile.html b/fragdenstaat_de/templates/account/profile.html
index 5017ed8d5..ede9fea5b 100644
--- a/fragdenstaat_de/templates/account/profile.html
+++ b/fragdenstaat_de/templates/account/profile.html
@@ -1,15 +1,11 @@
 {% extends "account/profile.html" %}
-
 {% load fds_ogimage %}
-
 {% block meta %}
-{{ block.super }}
-
-{% url 'account-profile-og' slug=object.username as profile_path %}
-{% ogimage_url path=profile_path as og_image_url %}
-
-<meta property="og:title" content="{{ object.get_full_name }} – FragDenStaat-Profil" />
-<meta property="og:image" content="{{ og_image_url }}" />
-<meta name="twitter:card" content="summary_large_image">
-
+    {{ block.super }}
+    {% url 'account-profile-og' slug=object.username as profile_path %}
+    {% ogimage_url path=profile_path as og_image_url %}
+    <meta property="og:title"
+          content="{{ object.get_full_name }} – FragDenStaat-Profil" />
+    <meta property="og:image" content="{{ og_image_url }}" />
+    <meta name="twitter:card" content="summary_large_image">
 {% endblock %}
diff --git a/fragdenstaat_de/templates/account/settings.html b/fragdenstaat_de/templates/account/settings.html
index 4de940ea1..cee042b21 100644
--- a/fragdenstaat_de/templates/account/settings.html
+++ b/fragdenstaat_de/templates/account/settings.html
@@ -1,33 +1,24 @@
 {% extends "account/settings.html" %}
-
 {% load fax_tags %}
 {% load newsletter_tags %}
-
 {% block settings_name %}
-<a href="/hilfe/funktionen-der-plattform/namen-aendern/" title="Siehe Hilfe-Seite zum Ändern Ihres Namens">
-  <i class="fa fa-question-circle"></i>
-</a>
+    <a href="/hilfe/funktionen-der-plattform/namen-aendern/"
+       title="Siehe Hilfe-Seite zum Ändern Ihres Namens">
+        <i class="fa fa-question-circle"></i>
+    </a>
 {% endblock %}
-
 {% block settings_privacy %}
-<a href="/hilfe/ihr-konto-verwalten/privatsphare-einstellungen/" title="Siehe Hilfe-Bereich zu Ihren Privatsphäre-Einstellungen">
-  <i class="fa fa-question-circle"></i>
-</a>
+    <a href="/hilfe/ihr-konto-verwalten/privatsphare-einstellungen/"
+       title="Siehe Hilfe-Bereich zu Ihren Privatsphäre-Einstellungen">
+        <i class="fa fa-question-circle"></i>
+    </a>
 {% endblock %}
-
 {% block post_password_menu %}
-<a href="#newsletter" class="list-group-item list-group-item-action">
-  Newsletter
-</a>
-<a href="#signature-setting" class="list-group-item list-group-item-action">
-  Unterschrift
-</a>
+    <a href="#newsletter" class="list-group-item list-group-item-action">Newsletter</a>
+    <a href="#signature-setting"
+       class="list-group-item list-group-item-action">Unterschrift</a>
 {% endblock %}
-
 {% block post_password %}
-
-  {% newsletter_settings %}
-
-  {% include "froide_fax/_signature_form.html" with form=request.user|get_signature_form next=request.get_full_path %}
-
-{% endblock %}
\ No newline at end of file
+    {% newsletter_settings %}
+    {% include "froide_fax/_signature_form.html" with form=request.user|get_signature_form next=request.get_full_path %}
+{% endblock %}
diff --git a/fragdenstaat_de/templates/admin/base.html b/fragdenstaat_de/templates/admin/base.html
index a72a3776e..77c47def7 100644
--- a/fragdenstaat_de/templates/admin/base.html
+++ b/fragdenstaat_de/templates/admin/base.html
@@ -1,12 +1,12 @@
 {% extends 'admin/base.html' %}
-
-{% block extrahead %}{{ block.super }}
-<style>
+{% block extrahead %}
+    {{ block.super }}
+    <style>
 :root {
   --primary: #356bde;
   --secondary: #719DFF;
   --link-fg: #0034A5;
   --link-selected-fg: #001C5A;
 }
-</style>
-{% endblock %}
\ No newline at end of file
+    </style>
+{% endblock %}
diff --git a/fragdenstaat_de/templates/admin/djangocms_icon/includes/assets.html b/fragdenstaat_de/templates/admin/djangocms_icon/includes/assets.html
index ff67a6ffa..b295a720b 100644
--- a/fragdenstaat_de/templates/admin/djangocms_icon/includes/assets.html
+++ b/fragdenstaat_de/templates/admin/djangocms_icon/includes/assets.html
@@ -1,2 +1,3 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'font-awesome/font-awesome.min.css' %}">
+<link rel="stylesheet"
+      href="{% static 'font-awesome/font-awesome.min.css' %}">
diff --git a/fragdenstaat_de/templates/base.html b/fragdenstaat_de/templates/base.html
index 74e6ebd42..f3a40b757 100644
--- a/fragdenstaat_de/templates/base.html
+++ b/fragdenstaat_de/templates/base.html
@@ -1,28 +1,23 @@
 {% extends "base.html" %}
 {% load fds_cms_tags %}
-
-{% block metadescription %}Das Portal für Informationsfreiheit für Bürger, Initiativen und Vereine. Stellen Sie eine IFG-Anfrage nach Behördendokumenten, die für Sie und Ihr Engagement wichtig sind! Informieren Sie sich über Informationsfreiheitsanfragen, IFG-Anfragen, IFG, Transparenz, Informationsfreiheitsgesetz, Behördeninformationen, Anfrage Stellen, Behörden, Open Data, Transparenzgesetz, Auskunftsrecht und vieles mehr!{% endblock metadescription %}
-
-{% block body_extra_attributes %} data-staticurl="{{ STATIC_URL }}"{% if request.user.is_staff %} data-sentry="{{ SENTRY_JS_URL}}"{% endif %}{% endblock %}
-
+{% block metadescription %}
+    Das Portal für Informationsfreiheit für Bürger, Initiativen und Vereine. Stellen Sie eine IFG-Anfrage nach Behördendokumenten, die für Sie und Ihr Engagement wichtig sind! Informieren Sie sich über Informationsfreiheitsanfragen, IFG-Anfragen, IFG, Transparenz, Informationsfreiheitsgesetz, Behördeninformationen, Anfrage Stellen, Behörden, Open Data, Transparenzgesetz, Auskunftsrecht und vieles mehr!
+{% endblock metadescription %}
+{% block body_extra_attributes %}
+    data-staticurl="{{ STATIC_URL }}"
+    {% if request.user.is_staff %}data-sentry="{{ SENTRY_JS_URL }}"{% endif %}
+{% endblock %}
 {% block top_block %}
-  <div class="dropdown-wrapper">
-    {% fds_static_placeholder "dropdown_banner" %}
-  </div>
+    <div class="dropdown-wrapper">{% fds_static_placeholder "dropdown_banner" %}</div>
 {% endblock %}
-
 {% block footer_container %}
-  <footer class="footer" id="footer">
-    <div class="container">
-      {% fds_static_placeholder "footer" %}
-    </div>
-  </footer>
-{% endblock %}
-
-{% block scripts %}
-  {{ block.super }}
+    <footer class="footer" id="footer">
+        <div class="container">{% fds_static_placeholder "footer" %}</div>
+    </footer>
 {% endblock %}
-
+{% block scripts %}{{ block.super }}{% endblock %}
 {% block below_scripts %}
-  {% block tracking_code %}{% include "snippets/tracking.html" %}{% endblock %}
+    {% block tracking_code %}
+        {% include "snippets/tracking.html" %}
+    {% endblock %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/campaign/food/request_banner.html b/fragdenstaat_de/templates/campaign/food/request_banner.html
index a1d981e48..de863c401 100644
--- a/fragdenstaat_de/templates/campaign/food/request_banner.html
+++ b/fragdenstaat_de/templates/campaign/food/request_banner.html
@@ -1,30 +1,29 @@
 {% load markup %}
-
 {% with campaign=object.campaign %}
-  <div class="card d-print-none">
-    <div class="card-body">
-      <div class="row">
-        <div class="col">
-          <a href="/kampagnen/lebensmittelkontrolle/app/?pk_campaign=request">
-            <img src="https://media.frag-den-staat.de/files/media/thumbnails/95/94/9594735c-851f-4192-b86f-9845806ff763/topf_secret_square_1.png__210x0_q85_subject_location-500%2C500_subsampling-2_upscale.png" height="100px" alt="Topf Secret"/>
-          </a>
+    <div class="card d-print-none">
+        <div class="card-body">
+            <div class="row">
+                <div class="col">
+                    <a href="/kampagnen/lebensmittelkontrolle/app/?pk_campaign=request">
+                        <img src="https://media.frag-den-staat.de/files/media/thumbnails/95/94/9594735c-851f-4192-b86f-9845806ff763/topf_secret_square_1.png__210x0_q85_subject_location-500%2C500_subsampling-2_upscale.png"
+                             height="100px"
+                             alt="Topf Secret" />
+                    </a>
+                </div>
+                <div class="col-auto">
+                    {% if campaign.description %}{{ campaign.description|markdown }}{% endif %}
+                    <p class="text-end">
+                        Diese Anfrage wurde im Rahmen unserer Kampagne <a href="{{ campaign.url }}?pk_campaign=request">„{{ campaign.name }}“</a> gestellt.
+                    </p>
+                    {% if campaign.active %}
+                        {% if not request.user.is_authenticated or campaign.ident not in request.user.tags %}
+                            <p class="text-end">
+                                <a href="{{ campaign.url }}?pk_campaign=request" class="btn btn-primary">&rarr; Selbst eine Anfrage stellen</a>
+                            </p>
+                        {% endif %}
+                    {% endif %}
+                </div>
+            </div>
         </div>
-        <div class="col-auto">
-          {% if campaign.description %}
-            {{ campaign.description|markdown }}
-          {% endif %}
-          <p class="text-end">
-            Diese Anfrage wurde im Rahmen unserer Kampagne <a href="{{ campaign.url }}?pk_campaign=request">„{{ campaign.name }}“</a> gestellt.
-          </p>
-          {% if campaign.active %}
-            {% if not request.user.is_authenticated or campaign.ident not in request.user.tags %}
-              <p class="text-end">
-                <a href="{{ campaign.url }}?pk_campaign=request" class="btn btn-primary">&rarr; Selbst eine Anfrage stellen</a>
-              </p>
-            {% endif %}
-          {% endif %}
-        </div>
-      </div>
     </div>
-  </div>
 {% endwith %}
diff --git a/fragdenstaat_de/templates/djangocms_audio/default/audio_player.html b/fragdenstaat_de/templates/djangocms_audio/default/audio_player.html
index 9fab8bd07..a5cf0e970 100644
--- a/fragdenstaat_de/templates/djangocms_audio/default/audio_player.html
+++ b/fragdenstaat_de/templates/djangocms_audio/default/audio_player.html
@@ -1,18 +1,15 @@
 {% load i18n cms_tags %}
-
 <div class="audio-player bg-body-tertiary border-gray p-3">
-  {% for plugin in instance.child_plugin_instances %}
-    {% render_plugin plugin %}
-  {% empty %}
-    {% trans "No audio file available." %}
-  {% endfor %}
+    {% for plugin in instance.child_plugin_instances %}
+        {% render_plugin plugin %}
+    {% empty %}
+        {% trans "No audio file available." %}
+    {% endfor %}
 </div>
-
 {% comment %}
     # Available variables:
     {{ instance.template }}
     {{ instance.label }}
     {{ instance.attributes_str }}
 {% endcomment %}
-
 {% include "_frontend.html" with entry_point="audio_player.js" %}
diff --git a/fragdenstaat_de/templates/djangocms_audio/default/file.html b/fragdenstaat_de/templates/djangocms_audio/default/file.html
index 8be7b3715..3359122d8 100644
--- a/fragdenstaat_de/templates/djangocms_audio/default/file.html
+++ b/fragdenstaat_de/templates/djangocms_audio/default/file.html
@@ -1,58 +1,51 @@
 {% load i18n cms_tags %}
-
 {% with instance.audio_file.extension as ext %}
-  <audio
-    {% if instance.text_title %} title="{{ instance.text_title }}"{% endif %}
-    {% if instance.attributes %} {{ instance.attributes_str }}{% endif %}>
-    <source src="{{ instance.audio_file.url }}" type="audio/{% if ext == "mp3" %}mpeg{% else %}{{ ext }}{% endif %}">
-    {{ instance.text_description }}
-    {% for plugin in instance.child_plugin_instances %}
-      {% render_plugin plugin %}
-    {% endfor %}
-  </audio>
-
-  <div class="d-md-flex text-nowrap">
-    <div class="w-100 hstack align-items-center gap-3">
-      <button class="btn btn-primary rounded-circle audio-player__playpause">
-        <i class="fa fa-play"></i>
-        <span class="sr-only">{% trans "Play/pause" %}</span>
-      </button>
-
-      <button class="btn text-center btn-sm rounded-circle audio-player__backward">
-        <i class="fa fa-backward"></i>
-        <span class="sr-only">{% trans "Backwards" %}</span>
-      </button>
-      
-      <input type="range" class="form-range audio-player__progress" value="0" min="0">
-      
-      <button class="btn text-center btn-sm rounded-circle audio-player__forward">
-        <i class="fa fa-forward"></i>
-        <span class="sr-only">{% trans "Forwards" %}</span>
-      </button>
+    <audio {% if instance.text_title %}title="{{ instance.text_title }}"{% endif %} {% if instance.attributes %}{{ instance.attributes_str }}{% endif %}>
+        <source src="{{ instance.audio_file.url }}"
+                type="audio/{% if ext == "mp3" %}mpeg{% else %}{{ ext }}{% endif %}">
+        {{ instance.text_description }}
+        {% for plugin in instance.child_plugin_instances %}
+            {% render_plugin plugin %}
+        {% endfor %}
+    </audio>
+    <div class="d-md-flex text-nowrap">
+        <div class="w-100 hstack align-items-center gap-3">
+            <button class="btn btn-primary rounded-circle audio-player__playpause">
+                <i class="fa fa-play"></i>
+                <span class="sr-only">{% trans "Play/pause" %}</span>
+            </button>
+            <button class="btn text-center btn-sm rounded-circle audio-player__backward">
+                <i class="fa fa-backward"></i>
+                <span class="sr-only">{% trans "Backwards" %}</span>
+            </button>
+            <input type="range"
+                   class="form-range audio-player__progress"
+                   value="0"
+                   min="0">
+            <button class="btn text-center btn-sm rounded-circle audio-player__forward">
+                <i class="fa fa-forward"></i>
+                <span class="sr-only">{% trans "Forwards" %}</span>
+            </button>
+        </div>
+        <div class="hstack align-items-center gap-3 mt-3 mt-md-0 ">
+            <div class="audio-player__textprogress text-center"
+                 style="min-width: 11ch">00:00 / 00:00</div>
+            <button class="btn d-flex align-items-center audio-player__speed">
+                <i class="fa fa-clock-o"></i>
+                <span class="sr-only">{% trans "Playback speed" %}:</span>
+                &nbsp;<span class="audio-player__speed-display">1x</span>
+            </button>
+            <a href="{{ instance.audio_file.url }}"
+               download="{{ instance.audio_file.label }}"
+               class="btn d-flex align-items-center text-nowrap audio-player__download">
+                <i class="fa fa-download"></i>
+                &nbsp; {% trans "Download" %}
+            </a>
+        </div>
     </div>
-    
-    <div class="hstack align-items-center gap-3 mt-3 mt-md-0 ">
-      <div class="audio-player__textprogress text-center" style="min-width: 11ch;">
-        00:00 / 00:00
-      </div>
-
-      <button class="btn d-flex align-items-center audio-player__speed">
-        <i class="fa fa-clock-o"></i>
-        <span class="sr-only">{% trans "Playback speed" %}:</span>
-        &nbsp;<span class="audio-player__speed-display">1x</span>
-      </button>
-      <a href="{{ instance.audio_file.url }}" download="{{ instance.audio_file.label }}" class="btn d-flex align-items-center text-nowrap audio-player__download">
-        <i class="fa fa-download"></i>
-        &nbsp; {% trans "Download" %}
-      </a>
-    </div>
-  </div>
-
-  <ul class="vstack gap-2 m-0 pt-3 mt-3 border-top list-unstyled audio-player__chapters d-none">
-
-  </ul>
+    <ul class="vstack gap-2 m-0 pt-3 mt-3 border-top list-unstyled audio-player__chapters d-none">
+    </ul>
 {% endwith %}
-
 {% comment %}
   # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/audio
   # https://github.com/divio/django-filer/blob/master/filer/models/filemodels.py
diff --git a/fragdenstaat_de/templates/djangocms_audio/default/track.html b/fragdenstaat_de/templates/djangocms_audio/default/track.html
index 9da65900b..f28091e53 100644
--- a/fragdenstaat_de/templates/djangocms_audio/default/track.html
+++ b/fragdenstaat_de/templates/djangocms_audio/default/track.html
@@ -1,10 +1,4 @@
-<track kind="{{ instance.kind }}" src="{{ instance.src.url }}"
-    {% if instance.srclang %} srclang="{{ instance.srclang }}"{% endif %}
-    {% if instance.label %} label="{{ instance.label }}"{% endif %}
-    default="true"
-    {% if instance.attributes %} {{ instance.attributes_str }}{% endif %}
->
-
+<track kind="{{ instance.kind }}" src="{{ instance.src.url }}" {% if instance.srclang %}srclang="{{ instance.srclang }}"{% endif %} {% if instance.label %}label="{{ instance.label }}"{% endif %} default="true" {% if instance.attributes %}{{ instance.attributes_str }}{% endif %}>
 {% comment %}
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/track
     # https://github.com/divio/django-filer/blob/master/filer/models/foldermodels.py
diff --git a/fragdenstaat_de/templates/djangocms_frontend/bootstrap5/grid_row.html b/fragdenstaat_de/templates/djangocms_frontend/bootstrap5/grid_row.html
index 9a3c8d463..529b7c4b7 100644
--- a/fragdenstaat_de/templates/djangocms_frontend/bootstrap5/grid_row.html
+++ b/fragdenstaat_de/templates/djangocms_frontend/bootstrap5/grid_row.html
@@ -1,8 +1,10 @@
 {% load cms_tags %}
-    <{{ instance.tag_type }}{{ instance.get_attributes }}>
-    {% for plugin in instance.child_plugin_instances %}
-        {% if plugin.plugin_type == "CardPlugin" %}<div class="col mb-3">{% endif %}
-        {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}
+<{{ instance.tag_type }}{{ instance.get_attributes }}>
+{% for plugin in instance.child_plugin_instances %}
+    {% if plugin.plugin_type == "CardPlugin" %}<div class="col mb-3">{% endif %}
+        {% with forloop as parentloop %}
+            {% render_plugin plugin %}
+        {% endwith %}
         {% if plugin.plugin_type == "CardPlugin" %}</div>{% endif %}
-    {% endfor %}
-    </{{ instance.tag_type }}>
+{% endfor %}
+</{{ instance.tag_type }}>
diff --git a/fragdenstaat_de/templates/djangocms_frontend/html_container.html b/fragdenstaat_de/templates/djangocms_frontend/html_container.html
index 44a54431f..ad66f21c2 100644
--- a/fragdenstaat_de/templates/djangocms_frontend/html_container.html
+++ b/fragdenstaat_de/templates/djangocms_frontend/html_container.html
@@ -1,7 +1,9 @@
 {% load cms_tags %}
-
 <{{ instance.tag_type }}{{ instance.get_attributes }}>
 {% for plugin in instance.child_plugin_instances %}
-    {% with parentloop=forloop parent=instance %}{% render_plugin plugin %}{% endwith %}
-{% empty %}{{ instance.simple_content }}{% endfor %}
+    {% with parentloop=forloop parent=instance %}
+        {% render_plugin plugin %}
+    {% endwith %}
+{% empty %}{{ instance.simple_content }}
+{% endfor %}
 </{{ instance.tag_type }}>
diff --git a/fragdenstaat_de/templates/djangocms_picture/default/picture.html b/fragdenstaat_de/templates/djangocms_picture/default/picture.html
index 61e96891d..284ddff1b 100644
--- a/fragdenstaat_de/templates/djangocms_picture/default/picture.html
+++ b/fragdenstaat_de/templates/djangocms_picture/default/picture.html
@@ -1,79 +1,58 @@
 {% load fds_cms_tags %}
 {% load markup %}
-
 {# start render figure/figcaption #}
-{% if instance.caption_text or instance.picture.author or instance.picture.description %}
-  <figure>
-{% endif %}
-{# end render figure/figcaption #}
-
-{% if picture_link %}
-    <a href="{{ picture_link }}"
-    {% if instance.link_target %} target="{{ instance.link_target }}" rel="noopener"{% endif %}
-    {{ instance.link_attributes_str }}>
-{% endif %}
-
-{% if not instance.external_picture and not instance.use_no_cropping %}
-<picture>
-  {% if instance.picture.mime_type != "image/svg+xml" %}
-    {% get_responsive_plugin_image instance as respimg %}
-      {% for source in respimg.sources %}
-        <source
-          srcset="{{ source.srcset }}"
-          sizes="{{ respimg.sizes }}"
-          type="{{ source.mime_type }}"
-        />
-      {% endfor %}
-  {% endif %}
-{% endif %}
-
-<img class="{% if instance.width or instance.height %}{% else %}img-fluid{% endif %}{% if instance.attributes.class %} {{ instance.attributes.class }}{% endif %}"
-  {% if instance.external_picture %}src="{{ instance.external_picture }}"
-  {% elif instance.use_no_cropping or instance.picture.mime_type == "image/svg+xml" %}src="{{ instance.picture.url }}"
-  {% else %}src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}"{% endif %}
-
-  {% if not instance.attributes.alt %} alt="{{ instance.picture.default_alt_text|default:"" }}"{% endif %}
-  {% if instance.width or instance.height %}
-    {# We are cropping #}
-    {% if instance.width %} width="{{ instance.width|floatformat:"0u" }}" {% endif %}
-    {% if instance.height %} height="{{ instance.height|floatformat:"0u" }}" {% endif %}
-  {% else %}
-    {% if instance.picture.width %} width="{{ instance.picture.width|floatformat:"0u" }}"{% endif %}
-    {% if instance.picture.height %} height="{{ instance.picture.height|floatformat:"0u" }}"{% endif %}
-  {% endif %}
-
-  {% if instance.attributes.loading %}loading="{{ instance.attributes.loading }}"{% else %}loading="lazy"{% endif %}
-  {{ instance.attributes_str }}
-/>
-
-{% if not instance.external_picture and not instance.use_no_cropping %}
-</picture>
-{% endif %}
-
-{% if picture_link %}
-    </a>
-{% endif %}
-
-{# start render figure/figcaption #}
-{% if instance.caption_text or instance.picture.author or instance.picture.description %}
-  <figcaption class="text-end">
-    {% if instance.caption_text or instance.picture.description %}
-    <div class="picture-description">
-      {% if instance.caption_text %}{{ instance.caption_text }}{% elif instance.picture.description %}{{ instance.picture.description }}{% endif %}
-      {% if instance.picture.author %} – {% endif %}
-    </div>
-    {% endif %}
-    {% if instance.picture.author %}
-      <div class="picture-credits">
-        {{ instance.picture.author|markdown }}
-      </div>
-    {% endif %}
-  </figcaption>
-  </figure>
-{% endif %}
-{# end render figure/figcaption #}
-
-{% comment %}
+{% if instance.caption_text or instance.picture.author or instance.picture.description %}<figure>{% endif %}
+    {# end render figure/figcaption #}
+    {% if picture_link %}
+        <a href="{{ picture_link }}" {% if instance.link_target %}target="{{ instance.link_target }}" rel="noopener"{% endif %} {{ instance.link_attributes_str }}>
+        {% endif %}
+        {% if not instance.external_picture and not instance.use_no_cropping %}
+            <picture>
+                {% if instance.picture.mime_type != "image/svg+xml" %}
+                    {% get_responsive_plugin_image instance as respimg %}
+                    {% for source in respimg.sources %}
+                        <source srcset="{{ source.srcset }}"
+                                sizes="{{ respimg.sizes }}"
+                                type="{{ source.mime_type }}" />
+                    {% endfor %}
+                {% endif %}
+            {% endif %}
+            <img class="{% if instance.width or instance.height %}{% else %}img-fluid{% endif %}{% if instance.attributes.class %} {{ instance.attributes.class }}{% endif %}"
+                {% if instance.external_picture %}src="{{ instance.external_picture }}"
+                {% elif instance.use_no_cropping or instance.picture.mime_type == "image/svg+xml" %}src="{{ instance.picture.url }}"
+                {% else %}src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}"{% endif %}
+                    {% if not instance.attributes.alt %}alt="{{ instance.picture.default_alt_text|default:"" }}"{% endif %}
+                    {% if instance.width or instance.height %}
+                        {# We are cropping #}
+                        {% if instance.width %}width="{{ instance.width|floatformat:"0u" }}"{% endif %}
+                        {% if instance.height %}height="{{ instance.height|floatformat:"0u" }}"{% endif %}
+                    {% else %}
+                        {% if instance.picture.width %}width="{{ instance.picture.width|floatformat:"0u" }}"{% endif %}
+                        {% if instance.picture.height %}height="{{ instance.picture.height|floatformat:"0u" }}"{% endif %}
+                    {% endif %}
+                    {% if instance.attributes.loading %}loading="{{ instance.attributes.loading }}"{% else %}loading="lazy"{% endif %}
+                    {{ instance.attributes_str }}
+                    />
+                    {% if not instance.external_picture and not instance.use_no_cropping %}</picture>{% endif %}
+                {% if picture_link %}</a>{% endif %}
+            {# start render figure/figcaption #}
+            {% if instance.caption_text or instance.picture.author or instance.picture.description %}
+                <figcaption class="text-end">
+                    {% if instance.caption_text or instance.picture.description %}
+                        <div class="picture-description">
+                            {% if instance.caption_text %}
+                                {{ instance.caption_text }}
+                            {% elif instance.picture.description %}
+                                {{ instance.picture.description }}{% endif %}
+                                {% if instance.picture.author %}–{% endif %}
+                                </div>
+                            {% endif %}
+                            {% if instance.picture.author %}<div class="picture-credits">{{ instance.picture.author|markdown }}</div>{% endif %}
+                        </figcaption>
+                    </figure>
+                {% endif %}
+                {# end render figure/figcaption #}
+                {% comment %}
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img
     # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/figure
     # https://github.com/divio/django-filer/blob/master/filer/models/imagemodels.py
@@ -104,4 +83,4 @@
     {% for plugin in instance.child_plugin_instances %}
         {% render_plugin plugin %}
     {% endfor %}
-{% endcomment %}
+                {% endcomment %}
diff --git a/fragdenstaat_de/templates/djangocms_picture/email/picture.html b/fragdenstaat_de/templates/djangocms_picture/email/picture.html
index 9ae866c98..6b1f1d8eb 100644
--- a/fragdenstaat_de/templates/djangocms_picture/email/picture.html
+++ b/fragdenstaat_de/templates/djangocms_picture/email/picture.html
@@ -1,34 +1,28 @@
 {% load thumbnail %}
 {% load markup %}
-
 <!--[if gte MSO 9]>
   <table width="640">
      <tr>
         <td>
 <![endif]-->
-
 <table width="100%" style="max-width:600px;">
-  <tr>
-    <td height="60" valign="top">
-{% if picture_link %}
-    <a href="{{ picture_link }}" {% if instance.link_target %} target="{{ instance.link_target }}"{% endif %} {{ instance.link_attributes_str }}>
-{% endif %}
-
-<img class="emailImage {% if instance.attributes.class %} {{ instance.attributes.class }}{% endif %}" src="{% spaceless %}
-{% thumbnail instance.picture 768x0 crop=scale subject_location=instance.picture.subject_location %}{% endspaceless %}"{% if not instance.attributes.alt %} alt="{{ instance.picture.default_alt_text|default:"" }}"{% endif %} width="100%" height="" {{ instance.attributes_str }}/>
-
-{% if picture_link %}
-    </a>
-{% endif %}
-</td></tr>
-{% if instance.picture.author %}
-<tr><td style="text-align: right; font-size: 8px">
-{{ instance.picture.author|markdown }}
-</td></tr>
-{% endif %}
+    <tr>
+        <td height="60" valign="top">
+            {% if picture_link %}
+                <a href="{{ picture_link }}" {% if instance.link_target %}target="{{ instance.link_target }}"{% endif %} {{ instance.link_attributes_str }}>
+                {% endif %}
+                <img class="emailImage {% if instance.attributes.class %}{{ instance.attributes.class }}{% endif %}" src="{% spaceless %} {% thumbnail instance.picture 768x0 crop=scale subject_location=instance.picture.subject_location %}{% endspaceless %}"{% if not instance.attributes.alt %} alt="{{ instance.picture.default_alt_text|default:"" }}"{% endif %} width="100%" height="" {{ instance.attributes_str }} />
+                {% if picture_link %}</a>{% endif %}
+        </td>
+    </tr>
+    {% if instance.picture.author %}
+        <tr>
+            <td style="text-align: right; font-size: 8px">{{ instance.picture.author|markdown }}</td>
+        </tr>
+    {% endif %}
 </table>
 <!--[if gte MSO 9]>
       </td>
     </tr>
   </table>
-<![endif]-->
\ No newline at end of file
+<![endif]-->
diff --git a/fragdenstaat_de/templates/djangocms_picture/hero/picture.html b/fragdenstaat_de/templates/djangocms_picture/hero/picture.html
index eb951872f..3243d8196 100644
--- a/fragdenstaat_de/templates/djangocms_picture/hero/picture.html
+++ b/fragdenstaat_de/templates/djangocms_picture/hero/picture.html
@@ -1,19 +1,22 @@
 {% load cms_tags %}
 {% load fds_cms_tags %}
-
 <div class="hero-image{% if instance.attributes.class %} {{ instance.attributes.class }}{% endif %}" {{ instance.attributes_str }}>
     {% with picture=instance.picture %}
         {% get_responsive_filer_image picture "col-12" as respimg %}
         <picture>
             {% for source in respimg.sources %}
-            <source
-                srcset="{{ source.srcset }}"
-                sizes="{{ respimg.sizes }}"
-                type="{{ source.mime_type }}"
-            />
+                <source srcset="{{ source.srcset }}"
+                        sizes="{{ respimg.sizes }}"
+                        type="{{ source.mime_type }}" />
             {% endfor %}
-
-            <img class="hero-image-img" {% if instance.attributes.loading %}loading="{{ instance.attributes.loading }}"{% endif %} width="{{ picture.width|floatformat:"0u" }}" height="{{ picture.height|floatformat:"0u" }}" src="{{ respimg.src }}" srcset="{{ respimg.srcset }}" sizes="{{ respimg.sizes }}" alt="">
+            <img class="hero-image-img"
+                 {% if instance.attributes.loading %}loading="{{ instance.attributes.loading }}"{% endif %}
+                 width="{{ picture.width|floatformat:"0u" }}"
+                 height="{{ picture.height|floatformat:"0u" }}"
+                 src="{{ respimg.src }}"
+                 srcset="{{ respimg.srcset }}"
+                 sizes="{{ respimg.sizes }}"
+                 alt="">
         </picture>
     {% endwith %}
     {% for plugin in instance.child_plugin_instances %}
diff --git a/fragdenstaat_de/templates/djangocms_video/default/video_player.html b/fragdenstaat_de/templates/djangocms_video/default/video_player.html
index dce836121..faadf3de2 100644
--- a/fragdenstaat_de/templates/djangocms_video/default/video_player.html
+++ b/fragdenstaat_de/templates/djangocms_video/default/video_player.html
@@ -1,26 +1,23 @@
 {% load i18n cms_tags %}
-
 {% if instance.embed_link %}
     {# show iframe if embed_link is provided #}
     <div class="aspect-ratio aspect-ratio-{% if instance.attributes.ratio %}{{ instance.attributes.ratio }}{% else %}16x9{% endif %}">
-      <iframe src="{{ instance.embed_link }}" {{ instance.attributes_str }} frameborder="0" allowfullscreen="true"></iframe>
-      {% with disabled=instance.embed_link %}
-          {% for plugin in instance.child_plugin_instances %}
-              {% render_plugin plugin %}
-          {% endfor %}
-      {% endwith %}
+        <iframe src="{{ instance.embed_link }}" {{ instance.attributes_str }} frameborder="0" allowfullscreen="true"></iframe>
+        {% with disabled=instance.embed_link %}
+            {% for plugin in instance.child_plugin_instances %}
+                {% render_plugin plugin %}
+            {% endfor %}
+        {% endwith %}
     </div>
 {% else %}
     {# render <source> or <track> plugins #}
-    <video {{ instance.attributes_str }}
-        {% if instance.poster %} poster="{{ instance.poster.url }}"{% endif %}>
+    <video {{ instance.attributes_str }} {% if instance.poster %}poster="{{ instance.poster.url }}"{% endif %}>
         {% for plugin in instance.child_plugin_instances %}
             {% render_plugin plugin %}
         {% endfor %}
         {% trans "Your browser doesn't support this video format." %}
     </video>
 {% endif %}
-
 {% comment %}
     # Available variables:
     {{ instance.template }}
diff --git a/fragdenstaat_de/templates/emails/footer.html b/fragdenstaat_de/templates/emails/footer.html
index 810725fbb..f419c6f9f 100644
--- a/fragdenstaat_de/templates/emails/footer.html
+++ b/fragdenstaat_de/templates/emails/footer.html
@@ -1,5 +1,7 @@
 {% extends "emails/footer.html" %}
-{% block content %}FragDenStaat.de<br/><br/>
-
-Wir befreien Informationen! <a href="https://fragdenstaat.de/email/spenden/">Unterstützen Sie uns mit Ihrer Spende.</a>
+{% block content %}
+    FragDenStaat.de
+    <br />
+    <br />
+    Wir befreien Informationen! <a href="https://fragdenstaat.de/email/spenden/">Unterstützen Sie uns mit Ihrer Spende.</a>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/error_base.html b/fragdenstaat_de/templates/error_base.html
index 03ffeacac..4aaf77176 100644
--- a/fragdenstaat_de/templates/error_base.html
+++ b/fragdenstaat_de/templates/error_base.html
@@ -1,19 +1,16 @@
 {% extends "error_base.html" %}
 {% load i18n %}
 {% load blog_tags %}
-
 {% block error_right %}
-<div class="col order-first order-md-2 col-12 col-md-4 text-end">
-  <img src="https://media.frag-den-staat.de/files/media/main/2c/30/2c300e57-bcd3-4265-bbda-103c02078eff/errorcat.png" alt="" class="img-lg">
-</div>
+    <div class="col order-first order-md-2 col-12 col-md-4 text-end">
+        <img src="https://media.frag-den-staat.de/files/media/main/2c/30/2c300e57-bcd3-4265-bbda-103c02078eff/errorcat.png"
+             alt=""
+             class="img-lg">
+    </div>
 {% endblock error_right %}
-
 {% block error_footer %}
-<div class="container mt-5 tight-margin">
-  <p class="lead">
-    {% blocktrans %}Or, read some of our recent articles:{% endblocktrans %}
-  </p>
-
-  {% get_blog_preview %}
-</div>
-{% endblock error_footer %}
\ No newline at end of file
+    <div class="container mt-5 tight-margin">
+        <p class="lead">{% blocktrans %}Or, read some of our recent articles:{% endblocktrans %}</p>
+        {% get_blog_preview %}
+    </div>
+{% endblock error_footer %}
diff --git a/fragdenstaat_de/templates/fcdocs_annotation/annotate_document.html b/fragdenstaat_de/templates/fcdocs_annotation/annotate_document.html
index bce540cbc..dfde6b16c 100644
--- a/fragdenstaat_de/templates/fcdocs_annotation/annotate_document.html
+++ b/fragdenstaat_de/templates/fcdocs_annotation/annotate_document.html
@@ -1,69 +1,60 @@
 {% extends 'filingcabinet/document_detail.html' %}
 {% load static i18n %}
-
 {% block body %}
-{% if object %}
-{% block document_top %}
-<div class="container-fluid mt-3 mb-5">
-  <h2>{{ object.title }}</h2>
-  {% if not object.public %}
-  <span class="badge text-bg-secondary">{% trans "private" %}</span>
-  {% endif %}
-  {% if object.description %}
-  <p>
-    {{ object.description }}
-  </p>
-  {% endif %}
-</div>
-{% endblock document_top %}
-
-{% block document_main %}
-<div class="container-fluid mt-3 mb-5">
-  <div class="row">
-    <div class="col">
-      {% include "filingcabinet/_document_viewer.html" with object=object %}
-    </div>
-    <div class="col">
-      <div class="sticky-top">
-        <form method="POST">
-          {% csrf_token %}
-          {{ skipform }}
-          <div class="row">
-            <div class="col">
-              <button type="submit" name="skip" class="btn btn-outline-primary float-end">Skip &#62;
-                &#62;</button>
-              </div>
+    {% if object %}
+        {% block document_top %}
+            <div class="container-fluid mt-3 mb-5">
+                <h2>{{ object.title }}</h2>
+                {% if not object.public %}
+                    <span class="badge text-bg-secondary">{% trans "private" %}</span>
+                {% endif %}
+                {% if object.description %}<p>{{ object.description }}</p>{% endif %}
             </div>
-        </form>
-        <form method="POST" class="my-3 border p-3">
-          <h1 class="h6">{% trans "Please indicate which of the following statements are true. If nothing applies simply click 'submit'." %}</h1>
-          {% csrf_token %}
-          {{ feature_form_set.management_form }}
-          {% for form in feature_form_set %}
-              {% for hidden in form.hidden_fields %}
-                  {{ hidden }}
-              {% endfor %}
-              <div class="form-check">
-                  <input class="form-check-input" name="{{ form.value.html_name }}" type="checkbox" id="{{ form.value.id_for_label }}">
-                  <label class="form-check-label" for="{{ form.value.id_for_label }}">
-                      {{ form.value.label }}
-                  </label>
+        {% endblock document_top %}
+        {% block document_main %}
+            <div class="container-fluid mt-3 mb-5">
+                <div class="row">
+                    <div class="col">{% include "filingcabinet/_document_viewer.html" with object=object %}</div>
+                    <div class="col">
+                        <div class="sticky-top">
+                            <form method="POST">
+                                {% csrf_token %}
+                                {{ skipform }}
+                                <div class="row">
+                                    <div class="col">
+                                        <button type="submit" name="skip" class="btn btn-outline-primary float-end">
+                                            Skip &#62;
+                                            &#62;
+                                        </button>
+                                    </div>
+                                </div>
+                            </form>
+                            <form method="POST" class="my-3 border p-3">
+                                <h1 class="h6">
+                                    {% trans "Please indicate which of the following statements are true. If nothing applies simply click 'submit'." %}
+                                </h1>
+                                {% csrf_token %}
+                                {{ feature_form_set.management_form }}
+                                {% for form in feature_form_set %}
+                                    {% for hidden in form.hidden_fields %}{{ hidden }}{% endfor %}
+                                    <div class="form-check">
+                                        <input class="form-check-input"
+                                               name="{{ form.value.html_name }}"
+                                               type="checkbox"
+                                               id="{{ form.value.id_for_label }}">
+                                        <label class="form-check-label" for="{{ form.value.id_for_label }}">{{ form.value.label }}</label>
+                                    </div>
+                                {% endfor %}
+                                <button type="submit" class="btn btn-primary mt-3">Submit</button>
+                            </form>
+                        </div>
+                    </div>
                 </div>
-          {% endfor %}
-          <button type="submit" class="btn btn-primary mt-3">Submit</button>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock document_main %}
-{% else %}
-<div class="container">
-  <div class="alert alert-success mt-3" role="alert">
-    {% translate 'All done! Thanks a lot for your support.' %}
-  </div>
-</div>
-{% endif %}
-
-
+            </div>
+        {% endblock document_main %}
+    {% else %}
+        <div class="container">
+            <div class="alert alert-success mt-3" role="alert">{% translate 'All done! Thanks a lot for your support.' %}</div>
+        </div>
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/filingcabinet/_fds_banner.html b/fragdenstaat_de/templates/filingcabinet/_fds_banner.html
index e83dc7021..f7f894349 100644
--- a/fragdenstaat_de/templates/filingcabinet/_fds_banner.html
+++ b/fragdenstaat_de/templates/filingcabinet/_fds_banner.html
@@ -1,12 +1,23 @@
 {% load static %}
-
 {% if not object.properties.disable_embed_banner %}
-<div style="position:fixed;bottom:0;right:0;" class="text-bg-body w-100 px-1 pb-1">
-  <a class="w-50 text-truncate float-start mt-1" href="{{ SITE_URL }}{{ object.get_absolute_url }}" target="_blank" rel="noopener">
-    <small>„{{ object.title }}“</small>
-  </a>
-  <a class="float-end" href="{{ SITE_URL }}" target="_blank" rel="noopener">
-    <img class="mt-1" style="height:25px;" src="{% static 'img/header_logo.svg' %}" alt="FragDenStaat.de"/>
-  </a>
-</div>
+    <div style="position:fixed;
+                bottom:0;
+                right:0"
+         class="text-bg-body w-100 px-1 pb-1">
+        <a class="w-50 text-truncate float-start mt-1"
+           href="{{ SITE_URL }}{{ object.get_absolute_url }}"
+           target="_blank"
+           rel="noopener">
+            <small>„{{ object.title }}“</small>
+        </a>
+        <a class="float-end"
+           href="{{ SITE_URL }}"
+           target="_blank"
+           rel="noopener">
+            <img class="mt-1"
+                 style="height:25px"
+                 src="{% static 'img/header_logo.svg' %}"
+                 alt="FragDenStaat.de" />
+        </a>
+    </div>
 {% endif %}
diff --git a/fragdenstaat_de/templates/filingcabinet/document_detail.html b/fragdenstaat_de/templates/filingcabinet/document_detail.html
index 07430a911..16f3d7b36 100644
--- a/fragdenstaat_de/templates/filingcabinet/document_detail.html
+++ b/fragdenstaat_de/templates/filingcabinet/document_detail.html
@@ -1,39 +1,26 @@
 {% extends "filingcabinet/document_detail.html" %}
-
 {% load thumbnail %}
-
 {% block meta %}
-  {% include "snippets/meta.html" %}
-
-  {% if object.public %}
-  <meta itemprop="name" content="{{ object.title }}">
-  {% if object.description %}
-    <meta itemprop="description" content="{{ object.description }}">
-  {% endif %}
-
-  {# Twitter Card data #}
-
-  <meta name="twitter:site" content="@fragdenstaat">
-  <meta name="twitter:title" content="{{ object.title }}">
-  {% if object.description %}
-    <meta name="twitter:description" content="{{ object.description }}">
-  {% endif %}
-  <meta name="twitter:creator" content="@fragdenstaat">
-
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:image:src" content="{% thumbnail object.get_cover_image_file 1120x600 crop %}">
-
-  {# Open Graph data #}
-  <meta property="og:title" content="{{ object.title }}" />
-  <meta property="og:type" content="article" />
-  <meta property="og:url" content="{{ SITE_URL }}{{ object.get_absolute_url }}" />
-
-
-  <meta property="og:image" content="{% thumbnail object.get_cover_image_file 1200x630 crop %}" />
-  {% if description %}
-    <meta property="og:description" content="{{ object.description }}" />
-  {% endif %}
-
-  <meta property="og:site_name" content="{{ SITE_NAME }}" />
-  {% endif %}
+    {% include "snippets/meta.html" %}
+    {% if object.public %}
+        <meta itemprop="name" content="{{ object.title }}">
+        {% if object.description %}<meta itemprop="description" content="{{ object.description }}">{% endif %}
+        {# Twitter Card data #}
+        <meta name="twitter:site" content="@fragdenstaat">
+        <meta name="twitter:title" content="{{ object.title }}">
+        {% if object.description %}<meta name="twitter:description" content="{{ object.description }}">{% endif %}
+        <meta name="twitter:creator" content="@fragdenstaat">
+        <meta name="twitter:card" content="summary_large_image">
+        <meta name="twitter:image:src"
+              content="{% thumbnail object.get_cover_image_file 1120x600 crop %}">
+        {# Open Graph data #}
+        <meta property="og:title" content="{{ object.title }}" />
+        <meta property="og:type" content="article" />
+        <meta property="og:url"
+              content="{{ SITE_URL }}{{ object.get_absolute_url }}" />
+        <meta property="og:image"
+              content="{% thumbnail object.get_cover_image_file 1200x630 crop %}" />
+        {% if description %}<meta property="og:description" content="{{ object.description }}" />{% endif %}
+        <meta property="og:site_name" content="{{ SITE_NAME }}" />
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/filingcabinet/document_detail_embed.html b/fragdenstaat_de/templates/filingcabinet/document_detail_embed.html
index 245929ef7..6f0f7f77c 100644
--- a/fragdenstaat_de/templates/filingcabinet/document_detail_embed.html
+++ b/fragdenstaat_de/templates/filingcabinet/document_detail_embed.html
@@ -1,8 +1,6 @@
 {% extends "filingcabinet/document_detail_embed.html" %}
-
 {% load static %}
-
 {% block body_tag %}
-{{ block.super }}
-{% include "filingcabinet/_fds_banner.html" %}
+    {{ block.super }}
+    {% include "filingcabinet/_fds_banner.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/filingcabinet/documentcollection_detail_embed.html b/fragdenstaat_de/templates/filingcabinet/documentcollection_detail_embed.html
index d058a8554..6ed9aec03 100644
--- a/fragdenstaat_de/templates/filingcabinet/documentcollection_detail_embed.html
+++ b/fragdenstaat_de/templates/filingcabinet/documentcollection_detail_embed.html
@@ -1,8 +1,6 @@
 {% extends "filingcabinet/documentcollection_detail_embed.html" %}
-
 {% load static %}
-
 {% block body_tag %}
-{{ block.super }}
-{% include "filingcabinet/_fds_banner.html" %}
+    {{ block.super }}
+    {% include "filingcabinet/_fds_banner.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/flatpages/default.html b/fragdenstaat_de/templates/flatpages/default.html
index 5d2231247..6f6e8a44e 100644
--- a/fragdenstaat_de/templates/flatpages/default.html
+++ b/fragdenstaat_de/templates/flatpages/default.html
@@ -1,7 +1,3 @@
 {% extends "base.html" %}
-
 {% block title %}{{ flatpage.title }} - {{ super }}{% endblock %}
-
-{% block body %}
-{{ flatpage.content }}
-{% endblock %}
+{% block body %}{{ flatpage.content }}{% endblock %}
diff --git a/fragdenstaat_de/templates/flatpages/full.html b/fragdenstaat_de/templates/flatpages/full.html
index 4e24269e0..f66fa763a 100644
--- a/fragdenstaat_de/templates/flatpages/full.html
+++ b/fragdenstaat_de/templates/flatpages/full.html
@@ -1,7 +1,3 @@
 {% extends "base.html" %}
-
 {% block title %}{{ flatpage.title }} - {{ super }}{% endblock %}
-
-{% block body_wrapper %}
-{{ flatpage.content }}
-{% endblock %}
+{% block body_wrapper %}{{ flatpage.content }}{% endblock %}
diff --git a/fragdenstaat_de/templates/flatpages/full_blank.html b/fragdenstaat_de/templates/flatpages/full_blank.html
index 235a6915a..2abcc55c6 100644
--- a/fragdenstaat_de/templates/flatpages/full_blank.html
+++ b/fragdenstaat_de/templates/flatpages/full_blank.html
@@ -1,4 +1,3 @@
 {% extends "flatpages/full_nonav.html" %}
-
 {% block tracking_code %}{% endblock %}
 {% block scripts %}{% endblock %}
diff --git a/fragdenstaat_de/templates/flatpages/full_nonav.html b/fragdenstaat_de/templates/flatpages/full_nonav.html
index 7c730d14a..7a7737974 100644
--- a/fragdenstaat_de/templates/flatpages/full_nonav.html
+++ b/fragdenstaat_de/templates/flatpages/full_nonav.html
@@ -1,9 +1,4 @@
 {% extends "flatpages/full.html" %}
-
-{% block extra_css %}
-<style>body { background-color: transparent; }</style>
-{% endblock %}
-
+{% block extra_css %}<style>body { background-color: transparent; }</style>{% endblock %}
 {% block navbar %}{% endblock %}
-
 {% block footer_container %}{% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/body/body.html b/fragdenstaat_de/templates/foirequest/body/body.html
index 7bc4bc19e..2d20159e0 100644
--- a/fragdenstaat_de/templates/foirequest/body/body.html
+++ b/fragdenstaat_de/templates/foirequest/body/body.html
@@ -1,72 +1,62 @@
 {% extends "foirequest/body/body.html" %}
-
 {% load foirequest_tags %}
 {% load i18n %}
 {% load legalaction %}
 {% load campaign_tags %}
-
-
 {% block request_top_pane %}
-
-{% if object|can_write_foirequest:request %}
-
-{% if object.costs %}
-  <div
-  role="tabpanel"
-  class="tab-pane fade"
-  id="crowdfunding-panel"
-  aria-labelledby="crowdfunding-tab"
-  >
-    <div class="container p-5">
-      {% include "froide_crowdfunding/includes/request_pane.html" with object=object %}
-    </div>
-  </div>
-{% endif %}
-
-{% can_use_klageautomat object as has_right_permissions %}
-{% if object.is_actionable or has_right_permissions %}
-  <div
-    role="tabpanel"
-    class="tab-pane fade"
-    id="legalaction-panel"
-    aria-labelledby="legalaction-tab"
-  >
-    <div class="container py-5">
-      {% include "froide_legalaction/includes/request_pane.html" with object=object %}
-    </div>
-  </div>
-{% endif %}
-
-{% endif %}
+    {% if object|can_write_foirequest:request %}
+        {% if object.costs %}
+            <div role="tabpanel"
+                 class="tab-pane fade"
+                 id="crowdfunding-panel"
+                 aria-labelledby="crowdfunding-tab">
+                <div class="container p-5">{% include "froide_crowdfunding/includes/request_pane.html" with object=object %}</div>
+            </div>
+        {% endif %}
+        {% can_use_klageautomat object as has_right_permissions %}
+        {% if object.is_actionable or has_right_permissions %}
+            <div role="tabpanel"
+                 class="tab-pane fade"
+                 id="legalaction-panel"
+                 aria-labelledby="legalaction-tab">
+                <div class="container py-5">{% include "froide_legalaction/includes/request_pane.html" with object=object %}</div>
+            </div>
+        {% endif %}
+    {% endif %}
 {% endblock %}
-
 {% block request_action_menu_footer %}
-{% if object|can_write_foirequest:request and object|foirequest_has_questionaire %}
-  <li class="nav-item">
-    <a id="questionaire-tab" class="nav-link" data-bs-toggle="tab" href="#questionaire" role="tab" aria-controls="questionaire" aria-selected="false">
-      <span>
-        {% translate "Questionnaire" %}
-        {% if object|foirequest_campaign_report_count == 0 %}
-          {% if object.status_is_final %}
-            <span class="badge rounded-pill bg-danger">
-              <span class="fa fa-exclamation-circle"></span>
-            </span>
-          {% endif %}
-        {% else %}
-          <span class="badge rounded-pill bg-success">
-            <span class="fa fa-check"></span>
-          </span>
-        {% endif %}
-      </span>
-    </a>
-  </li>
-{% endif %}
+    {% if object|can_write_foirequest:request and object|foirequest_has_questionaire %}
+        <li class="nav-item">
+            <a id="questionaire-tab"
+               class="nav-link"
+               data-bs-toggle="tab"
+               href="#questionaire"
+               role="tab"
+               aria-controls="questionaire"
+               aria-selected="false">
+                <span>
+                    {% translate "Questionnaire" %}
+                    {% if object|foirequest_campaign_report_count == 0 %}
+                        {% if object.status_is_final %}
+                            <span class="badge rounded-pill bg-danger">
+                                <span class="fa fa-exclamation-circle"></span>
+                            </span>
+                        {% endif %}
+                    {% else %}
+                        <span class="badge rounded-pill bg-success">
+                            <span class="fa fa-check"></span>
+                        </span>
+                    {% endif %}
+                </span>
+            </a>
+        </li>
+    {% endif %}
 {% endblock %}
-
 {% block request_action_pane_footer %}
-  {% if object|can_write_foirequest:request and object|foirequest_has_questionaire %}
-    <div id="questionaire" class="tab-pane fade" role="tabpanel" aria-labelledby="questionaire-tab">
-      {% render_campaign_questionaire object %}
-    </div>
-  {% endif %}
+    {% if object|can_write_foirequest:request and object|foirequest_has_questionaire %}
+        <div id="questionaire"
+             class="tab-pane fade"
+             role="tabpanel"
+             aria-labelledby="questionaire-tab">{% render_campaign_questionaire object %}</div>
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/body/correspondence.html b/fragdenstaat_de/templates/foirequest/body/correspondence.html
index 4de45f923..2236b3931 100644
--- a/fragdenstaat_de/templates/foirequest/body/correspondence.html
+++ b/fragdenstaat_de/templates/foirequest/body/correspondence.html
@@ -1,33 +1,26 @@
 {% extends "foirequest/body/correspondence.html" %}
-
 {% load i18n %}
 {% load fds_cms_tags %}
 {% load foirequest_tags %}
 {% load campaign_tags %}
 {% load fds_tags %}
-
 {% block foirequest_message_before_last %}
-  <div class="d-print-none">
-    {% fds_static_placeholder "message_donation_banner" %}
-  </div>
+    <div class="d-print-none">{% fds_static_placeholder "message_donation_banner" %}</div>
 {% endblock %}
-
 {% block foirequest_message_after_single %}
-  <div class="d-print-none">
-    {% fds_static_placeholder "message_donation_banner" %}
-  </div>
+    <div class="d-print-none">{% fds_static_placeholder "message_donation_banner" %}</div>
 {% endblock %}
-
 {% block after_foirequest_messages %}
-  {% if object|can_write_foirequest:request and object.status_is_final and object|foirequest_has_questionaire and object|foirequest_campaign_report_count == 0 %}
-    <div class="position-sticky d-print-none" style="bottom: 0">
-      <div class="bg-yellow-100 text-center p-2">
-        <a data-tabgo="tab" data-scrollto="questionaire" data-name="questionaire" href="#questionaire">
-          {% translate "Please fill out the questionnaire!" %}
-        </a>
-      </div>
-    </div>
-  {% else %}
-    {{ block.super }}
-  {% endif %}
-{% endblock %}
\ No newline at end of file
+    {% if object|can_write_foirequest:request and object.status_is_final and object|foirequest_has_questionaire and object|foirequest_campaign_report_count == 0 %}
+        <div class="position-sticky d-print-none" style="bottom: 0">
+            <div class="bg-yellow-100 text-center p-2">
+                <a data-tabgo="tab"
+                   data-scrollto="questionaire"
+                   data-name="questionaire"
+                   href="#questionaire">{% translate "Please fill out the questionnaire!" %}</a>
+            </div>
+        </div>
+    {% else %}
+        {{ block.super }}
+    {% endif %}
+{% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/body/message/message.html b/fragdenstaat_de/templates/foirequest/body/message/message.html
index 573745584..3be9b554a 100644
--- a/fragdenstaat_de/templates/foirequest/body/message/message.html
+++ b/fragdenstaat_de/templates/foirequest/body/message/message.html
@@ -1,69 +1,86 @@
 {% extends "foirequest/body/message/message.html" %}
-
 {% load i18n %}
 {% load foirequest_tags %}
 {% load fax_tags %}
 {% load fds_tags %}
 {% load campaign_tags %}
-
 {# add bump to sticky message toolbar when showing questionaire hint! #}
-{% block message_extra_classes %}{{ block.super }}{% if object|can_write_foirequest:request and object.status_is_final and object|foirequest_has_questionaire and object|foirequest_campaign_report_count == 0 %} alpha-message__toolbar--stickybump{% endif %}{% endblock message_extra_classes %}
-
-
-{% block message_toolbar_item %}
-  {% if object|can_write_foirequest:request %}
-    {% if message|can_fax_message:request %}
-      {% include "froide_fax/_send_message_form.html" %}
+{% block message_extra_classes %}
+    {{ block.super }}
+    {% if object|can_write_foirequest:request and object.status_is_final and object|foirequest_has_questionaire and object|foirequest_campaign_report_count == 0 %}
+        alpha-message__toolbar--stickybump
     {% endif %}
-    {% if message|can_resend_fax %}
-      {% include "froide_fax/_resend_message_form.html" %}
+{% endblock message_extra_classes %}
+{% block message_toolbar_item %}
+    {% if object|can_write_foirequest:request %}
+        {% if message|can_fax_message:request %}
+            {% include "froide_fax/_send_message_form.html" %}
+        {% endif %}
+        {% if message|can_resend_fax %}
+            {% include "froide_fax/_resend_message_form.html" %}
+        {% endif %}
+        {% if message|can_get_fax_report %}
+            {% include "froide_fax/_show_report_link.html" %}
+        {% endif %}
     {% endif %}
-    {% if message|can_get_fax_report %}
-      {% include "froide_fax/_show_report_link.html" %}
+    {% if message|needs_frontex_import:request.user %}
+        {% include "fds_fximport/import_frag.html" with request=object message=message %}
     {% endif %}
-  {% endif %}
-
-  {% if message|needs_frontex_import:request.user %}
-    {% include "fds_fximport/import_frag.html" with request=object message=message%}
-  {% endif %}
-
-  {% if message|needs_glyphosat_attachment %}
-    <button class="btn btn-primary btn-sm mb-1 mx-sm-1" data-bs-toggle="modal" data-bs-target="#glyphosat-download">
-      Gutachten herunterladen und speichern
-    </button>
-
-    <div data-teleport="body" class="modal fade modal-lg" id="glyphosat-download" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <h5 class="modal-title" id="exampleModalLongTitle">Glyphosat-Gutachten</h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
-          </div>
-          <div class="modal-body">
-            <form id="glyphosat-download-form" action="{% url 'fragdenstaat-glyphosat_download' slug=object.slug message_id=message.id %}" method="post" class="horizontal-form disable-submit">
-              {% csrf_token %}
-              <p>
-                Wir laden für Sie mit Ihren persönlichen Zugangsdaten das Dokument herunter,
-                bereiten es auf und stellen es nur Ihnen persönlich dauerhaft auf FragDenStaat.de zur Verfügung.
-              </p>
-              <div class="mb-3 form-check">
-                <input type="checkbox" id="confirm-notes" name="confirm-notes" value="1" class="form-check-input" required>
-                <label for="confirm-notes" class="form-check-label">
-                  Ich habe <a href="https://dokumente.bfr.bund.de/glypo/" rel="noopener" target="_blank">die Hinweise des BfR</a>, die <a href="https://fragdenstaat.de/blog/2019/05/06/glyphosat-gutachten-antwort-allgemeinverfugung/" rel="noopener" target="_blank">Allgemeinverfügung des BfR</a> sowie die <a href="https://dokumente.bfr.bund.de/glypo/p/privacy" rel="noopener" target="_blank">Datenschutzhinweise</a> zur Kenntnis genommen.
-                </label>
-              </div>
-              <p class="text-end">
-                <button class="btn btn-primary" type="submit" id="glyphosat-download-button">
-                  &rarr; Jetzt Gutachten herunterladen und speichern
-                </button>
-              </p>
-            </form>
-          </div>
+    {% if message|needs_glyphosat_attachment %}
+        <button class="btn btn-primary btn-sm mb-1 mx-sm-1"
+                data-bs-toggle="modal"
+                data-bs-target="#glyphosat-download">Gutachten herunterladen und speichern</button>
+        <div data-teleport="body"
+             class="modal fade modal-lg"
+             id="glyphosat-download"
+             tabindex="-1"
+             role="dialog"
+             aria-labelledby="exampleModalLongTitle"
+             aria-hidden="true">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="exampleModalLongTitle">Glyphosat-Gutachten</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="glyphosat-download-form"
+                              action="{% url 'fragdenstaat-glyphosat_download' slug=object.slug message_id=message.id %}"
+                              method="post"
+                              class="horizontal-form disable-submit">
+                            {% csrf_token %}
+                            <p>
+                                Wir laden für Sie mit Ihren persönlichen Zugangsdaten das Dokument herunter,
+                                bereiten es auf und stellen es nur Ihnen persönlich dauerhaft auf FragDenStaat.de zur Verfügung.
+                            </p>
+                            <div class="mb-3 form-check">
+                                <input type="checkbox"
+                                       id="confirm-notes"
+                                       name="confirm-notes"
+                                       value="1"
+                                       class="form-check-input"
+                                       required>
+                                <label for="confirm-notes" class="form-check-label">
+                                    Ich habe <a href="https://dokumente.bfr.bund.de/glypo/"
+    rel="noopener"
+    target="_blank">die Hinweise des BfR</a>, die <a href="https://fragdenstaat.de/blog/2019/05/06/glyphosat-gutachten-antwort-allgemeinverfugung/"
+    rel="noopener"
+    target="_blank">Allgemeinverfügung des BfR</a> sowie die <a href="https://dokumente.bfr.bund.de/glypo/p/privacy"
+    rel="noopener"
+    target="_blank">Datenschutzhinweise</a> zur Kenntnis genommen.
+                                </label>
+                            </div>
+                            <p class="text-end">
+                                <button class="btn btn-primary" type="submit" id="glyphosat-download-button">
+                                    &rarr; Jetzt Gutachten herunterladen und speichern
+                                </button>
+                            </p>
+                        </form>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-
-  {% endif %}
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/header/header.html b/fragdenstaat_de/templates/foirequest/header/header.html
index de009a353..c34d99118 100644
--- a/fragdenstaat_de/templates/foirequest/header/header.html
+++ b/fragdenstaat_de/templates/foirequest/header/header.html
@@ -1,79 +1,58 @@
 {% extends "foirequest/header/header.html" %}
-
 {% load static %}
 {% load i18n %}
-
 {% load foirequest_tags %}
 {% load food_tags %}
 {% load fax_tags %}
 {% load crowdfunding %}
 {% load fds_cms_tags %}
 {% load legalaction %}
-
 {% block aditional_actions %}
-  {% can_use_klageautomat object as has_legal_action_option %}
-  {% if has_legal_action_option %}
-    <li>
-      Auf Ihre Anfrage wurde mehr als drei Monate nicht geantwortet.
-      &rarr;
-      <a href="{% url 'klageautomat-info' pk=object.pk %}">
-        Zum Klageautomat
-      </a>
-    </li>
-  {% endif %}
+    {% can_use_klageautomat object as has_legal_action_option %}
+    {% if has_legal_action_option %}
+        <li>
+            Auf Ihre Anfrage wurde mehr als drei Monate nicht geantwortet.
+            &rarr;
+            <a href="{% url 'klageautomat-info' pk=object.pk %}">Zum Klageautomat</a>
+        </li>
+    {% endif %}
 {% endblock %}
-
-
 {% block foirequest_header %}
-
-  {# Brüssler Büro #}
-  {% if object.jurisdiction.id == 107 %}
-  <div class="alert alert-info">
-     🇪🇺 Sie wollen mehr Transparenz in der EU? <a href="/info/ueber/eu-recherchen/">Entdecken Sie unsere EU-Recherchen!</a>
-  </div>
-  {% endif %}
-
-  {# Triggers another query #}
-  {% if "Umwelt" in object.public_body.category_list %}
-    <div class="alert alert-info">
-      🌼 Interesse an Umweltinfos? Wir beraten Aktivist*innen und Initiativen kostenlos bei Anfragen.
-      <a href="https://fragdenstaat.de/aktionen/klima-helpdesk/">
-        Zum Klima-Helpdesk
-      </a>
-    </div>
-  {% endif %}
-
-  {% if "corona" in object.title|lower or "covid" in object.title|lower or "virus" in object.title|lower or "novavax" in object.title|lower  %}
-  <div class="alert alert-warning text-center">
-    🦠<a href="https://www.rki.de/DE/Content/InfAZ/N/Neuartiges_Coronavirus/nCoV.html">Allgemeine Infos zum Corona-Virus finden Sie hier beim Robert-Koch-Institut</a>🦠
-  </div>
-  {% endif %}
-
-  {% if object|can_write_foirequest:request and object|foirequest_needs_signature %}
-    <div class="alert alert-warning">
-      <h3>
-        Schriftformerfordnis: Bitte hinterlegen Sie Ihre Unterschrift
-      </h3>
-      <div class="row">
-        <div class="col-md-8">
-          <p>
-            Diese Anfrage nach dem {{ object.law.name }} muss in Schriftform erfolgen. Wir können für Sie ein Fax versenden, wenn Sie Ihre Unterschrift hinterlegen.
-          </p>
+    {# Brüssler Büro #}
+    {% if object.jurisdiction.id == 107 %}
+        <div class="alert alert-info">
+            🇪🇺 Sie wollen mehr Transparenz in der EU? <a href="/info/ueber/eu-recherchen/">Entdecken Sie unsere EU-Recherchen!</a>
         </div>
-      </div>
-      {% include "froide_fax/_signature_form.html" with form=request.user|get_signature_form:True foirequest=object next=request.get_full_path hide_explanation=True save_button="Unterschrift speichern und Fax versenden" %}
-    </div>
-  {% endif %}
+    {% endif %}
+    {# Triggers another query #}
+    {% if "Umwelt" in object.public_body.category_list %}
+        <div class="alert alert-info">
+            🌼 Interesse an Umweltinfos? Wir beraten Aktivist*innen und Initiativen kostenlos bei Anfragen.
+            <a href="https://fragdenstaat.de/aktionen/klima-helpdesk/">Zum Klima-Helpdesk</a>
+        </div>
+    {% endif %}
+    {% if "corona" in object.title|lower or "covid" in object.title|lower or "virus" in object.title|lower or "novavax" in object.title|lower %}
+        <div class="alert alert-warning text-center">
+            🦠<a href="https://www.rki.de/DE/Content/InfAZ/N/Neuartiges_Coronavirus/nCoV.html">Allgemeine Infos zum Corona-Virus finden Sie hier beim Robert-Koch-Institut</a>🦠
+        </div>
+    {% endif %}
+    {% if object|can_write_foirequest:request and object|foirequest_needs_signature %}
+        <div class="alert alert-warning">
+            <h3>Schriftformerfordnis: Bitte hinterlegen Sie Ihre Unterschrift</h3>
+            <div class="row">
+                <div class="col-md-8">
+                    <p>
+                        Diese Anfrage nach dem {{ object.law.name }} muss in Schriftform erfolgen. Wir können für Sie ein Fax versenden, wenn Sie Ihre Unterschrift hinterlegen.
+                    </p>
+                </div>
+            </div>
+            {% include "froide_fax/_signature_form.html" with form=request.user|get_signature_form:True foirequest=object next=request.get_full_path hide_explanation=True save_button="Unterschrift speichern und Fax versenden" %}
+        </div>
+    {% endif %}
 {% endblock %}
-
-
 {% block foirequest_below_header %}
-  {% if object.campaign.slug == "topf-secret" %}
-    <div class="container mt-4">
-      {% food_authority_status object %}
-    </div>
-  {% endif %}
-
-  {% include "froide_crowdfunding/includes/request_block.html" with object=object %}
-
+    {% if object.campaign.slug == "topf-secret" %}
+        <div class="container mt-4">{% food_authority_status object %}</div>
+    {% endif %}
+    {% include "froide_crowdfunding/includes/request_block.html" with object=object %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/header/info-box.html b/fragdenstaat_de/templates/foirequest/header/info-box.html
index ca16c136c..e40033d77 100644
--- a/fragdenstaat_de/templates/foirequest/header/info-box.html
+++ b/fragdenstaat_de/templates/foirequest/header/info-box.html
@@ -1,5 +1,6 @@
 {% extends "foirequest/header/info-box.html" %}
-
 {% block foirequest_explain_deadline %}
-<a class="d-print-none" href="/hilfe/fuer-behoerden/wie-errechnen-sie-die-frist-die-auf-den-anfrage-seiten-angezeigt-wird/" title="Wie wird das berechnet?"><i class="fa fa-question-circle-o" aria-hidden="true"></i></a>
+    <a class="d-print-none"
+       href="/hilfe/fuer-behoerden/wie-errechnen-sie-die-frist-die-auf-den-anfrage-seiten-angezeigt-wird/"
+       title="Wie wird das berechnet?"><i class="fa fa-question-circle-o" aria-hidden="true"></i></a>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/header/tabs.html b/fragdenstaat_de/templates/foirequest/header/tabs.html
index ef5d139e2..fe8843513 100644
--- a/fragdenstaat_de/templates/foirequest/header/tabs.html
+++ b/fragdenstaat_de/templates/foirequest/header/tabs.html
@@ -1,46 +1,36 @@
 {% extends "foirequest/header/tabs.html" %}
-
 {% load i18n %}
 {% load foirequest_tags %}
 {% load legalaction %}
 {% load campaign_tags %}
-
-
 {% block request_top_menu_last %}
-
-{% if object|can_write_foirequest:request %}
-  {% if object.costs %}
-  <li class="alpha-tabs__tab">
-    <a
-      href="#crowdfunding-panel"
-      id="crowdfunding-tab"
-      data-bs-toggle="tab"
-      class="alpha-tabs__tab-link"
-      data-bs-toggle="tab"
-      aria-controls="crowdfunding-panel"
-      role="tab"
-    >
-      <span>Crowdfunding</span>
-    </a>
-  </li>
-  {% endif %}
-
-  {% can_use_klageautomat object as has_right_permissions %}
-  {% if object.is_actionable or has_right_permissions %}
-    <li class="alpha-tabs__tab">
-      <a
-        href="#legalaction-panel"
-        id="legalaction-tab"
-        data-bs-toggle="tab"
-        class="alpha-tabs__tab-link"
-        data-bs-toggle="tab"
-        aria-controls="legalaction-panel"
-        role="tab"
-      >
-        <span>Klage prüfen</span>
-      </a>
-    </li>
-  {% endif %}
-{% endif %}
-
+    {% if object|can_write_foirequest:request %}
+        {% if object.costs %}
+            <li class="alpha-tabs__tab">
+                <a href="#crowdfunding-panel"
+                   id="crowdfunding-tab"
+                   data-bs-toggle="tab"
+                   class="alpha-tabs__tab-link"
+                   data-bs-toggle="tab"
+                   aria-controls="crowdfunding-panel"
+                   role="tab">
+                    <span>Crowdfunding</span>
+                </a>
+            </li>
+        {% endif %}
+        {% can_use_klageautomat object as has_right_permissions %}
+        {% if object.is_actionable or has_right_permissions %}
+            <li class="alpha-tabs__tab">
+                <a href="#legalaction-panel"
+                   id="legalaction-tab"
+                   data-bs-toggle="tab"
+                   class="alpha-tabs__tab-link"
+                   data-bs-toggle="tab"
+                   aria-controls="legalaction-panel"
+                   role="tab">
+                    <span>Klage prüfen</span>
+                </a>
+            </li>
+        {% endif %}
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/sent.html b/fragdenstaat_de/templates/foirequest/sent.html
index 03cdfc90e..bd455f235 100644
--- a/fragdenstaat_de/templates/foirequest/sent.html
+++ b/fragdenstaat_de/templates/foirequest/sent.html
@@ -1,34 +1,25 @@
 {% extends 'foirequest/sent.html' %}
-
 {% load newsletter_tags %}
-
 {% block foirequest_sent_footer %}
-
-  {% newsletter_is_subscribed as has_newsletter %}
-
-  {% if has_newsletter %}
-    <p class="mb-0">
-      <strong>Unterstützen Sie Ihre Transparenzplattform!</strong>
-    </p>
-    <p class="mt-0 mb-3">
-      FragDenStaat ist gemeinnützig. Nur mithilfe der Spenden Vieler können wir weitermachen, unabhängig bleiben und Informationen befreien. Sind Sie dabei?
-    </p>
-
-    <a href="/spenden/?pk_campaign=request-sent&pk_keyword={{ url | urlencode }}" class="btn btn-primary">
-      Jetzt spenden!
-    </a>
-  {% else %}
-    <p class="mb-0">
-      Erhalten Sie den <strong>FragDenStaat-Newsletter</strong>!
-    </p>
-    <p class="mt-0 mb-3">
-      Wir versorgen Sie regelmäßig mit Neuigkeiten zu unseren <a href="/blog/">Recherchen</a>, <a href="/info/ueber/kampagnen/">Kampagnen</a> und <a href="/info/ueber/klagen/">Klagen</a>.
-    </p>
-
-    <div class="row">
-      <div class="col-md-8 mx-auto">
-        {% include "fds_newsletter/plugins/newsletter_form.html" %}
-      </div>
-    </div>
-  {% endif %}
+    {% newsletter_is_subscribed as has_newsletter %}
+    {% if has_newsletter %}
+        <p class="mb-0">
+            <strong>Unterstützen Sie Ihre Transparenzplattform!</strong>
+        </p>
+        <p class="mt-0 mb-3">
+            FragDenStaat ist gemeinnützig. Nur mithilfe der Spenden Vieler können wir weitermachen, unabhängig bleiben und Informationen befreien. Sind Sie dabei?
+        </p>
+        <a href="/spenden/?pk_campaign=request-sent&pk_keyword={{ url | urlencode }}"
+           class="btn btn-primary">Jetzt spenden!</a>
+    {% else %}
+        <p class="mb-0">
+            Erhalten Sie den <strong>FragDenStaat-Newsletter</strong>!
+        </p>
+        <p class="mt-0 mb-3">
+            Wir versorgen Sie regelmäßig mit Neuigkeiten zu unseren <a href="/blog/">Recherchen</a>, <a href="/info/ueber/kampagnen/">Kampagnen</a> und <a href="/info/ueber/klagen/">Klagen</a>.
+        </p>
+        <div class="row">
+            <div class="col-md-8 mx-auto">{% include "fds_newsletter/plugins/newsletter_form.html" %}</div>
+        </div>
+    {% endif %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/foirequest/show.html b/fragdenstaat_de/templates/foirequest/show.html
index 98f76040c..497dfaf10 100644
--- a/fragdenstaat_de/templates/foirequest/show.html
+++ b/fragdenstaat_de/templates/foirequest/show.html
@@ -1,13 +1,8 @@
 {% extends "foirequest/show.html" %}
-
 {% load fds_ogimage %}
-
-
 {% block share_image %}
-
-{% url 'foirequest-show-og' slug=object.slug as foirequest_path %}
-{% ogimage_url path=foirequest_path as og_image_url %}
-<meta property="og:image" content="{{ og_image_url }}" />
-<meta name="twitter:card" content="summary_large_image">
-
+    {% url 'foirequest-show-og' slug=object.slug as foirequest_path %}
+    {% ogimage_url path=foirequest_path as og_image_url %}
+    <meta property="og:image" content="{{ og_image_url }}" />
+    <meta name="twitter:card" content="summary_large_image">
 {% endblock %}
diff --git a/fragdenstaat_de/templates/froide_crowdfunding/request_crowdfunding.html b/fragdenstaat_de/templates/froide_crowdfunding/request_crowdfunding.html
index c941e5722..f3dacb31b 100644
--- a/fragdenstaat_de/templates/froide_crowdfunding/request_crowdfunding.html
+++ b/fragdenstaat_de/templates/froide_crowdfunding/request_crowdfunding.html
@@ -1,6 +1,5 @@
 {% extends "froide_crowdfunding/request_crowdfunding.html" %}
 {% load cms_tags %}
-
 {% block conditions %}
-{% static_placeholder "crowdfunding_conditions" %}
+    {% static_placeholder "crowdfunding_conditions" %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/froide_govplan/detail.html b/fragdenstaat_de/templates/froide_govplan/detail.html
index 800ef9367..fd04e8e51 100644
--- a/fragdenstaat_de/templates/froide_govplan/detail.html
+++ b/fragdenstaat_de/templates/froide_govplan/detail.html
@@ -1,12 +1,8 @@
 {% extends "froide_govplan/detail.html" %}
-
 {% load fds_ogimage %}
-
 {% block meta %}
-  {{ block.super }}
-
-  {% url 'govplan_og:plan_og' gov=object.government.slug plan=object.slug as plan_og_path %}
-  {% ogimage_url path=plan_og_path template="fds_ogimage/govplan_plan.html" as og_image_url %}
-  {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %}
-
-  {% endblock %}
+    {{ block.super }}
+    {% url 'govplan_og:plan_og' gov=object.government.slug plan=object.slug as plan_og_path %}
+    {% ogimage_url path=plan_og_path template="fds_ogimage/govplan_plan.html" as og_image_url %}
+    {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %}
+{% endblock %}
diff --git a/fragdenstaat_de/templates/froide_govplan/section.html b/fragdenstaat_de/templates/froide_govplan/section.html
index b6a30b7d2..14ea4e15e 100644
--- a/fragdenstaat_de/templates/froide_govplan/section.html
+++ b/fragdenstaat_de/templates/froide_govplan/section.html
@@ -1,12 +1,8 @@
 {% extends "froide_govplan/section.html" %}
-
 {% load fds_ogimage %}
-
 {% block meta %}
-  {{ block.super }}
-
-  {% url 'govplan_og:section_og' gov=object.government.slug section=object.slug as section_og_path %}
-  {% ogimage_url path=section_og_path template="fds_ogimage/govplan_section.html" as og_image_url %}
-  {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %}
-
+    {{ block.super }}
+    {% url 'govplan_og:section_og' gov=object.government.slug section=object.slug as section_og_path %}
+    {% ogimage_url path=section_og_path template="fds_ogimage/govplan_section.html" as og_image_url %}
+    {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/froide_payment/order/base.html b/fragdenstaat_de/templates/froide_payment/order/base.html
index 36a2ca314..252f5e7e1 100644
--- a/fragdenstaat_de/templates/froide_payment/order/base.html
+++ b/fragdenstaat_de/templates/froide_payment/order/base.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-
 {% block navbar %}
-  {% include "header_reduced.html" %}
+    {% include "header_reduced.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/froide_payment/subscription/base.html b/fragdenstaat_de/templates/froide_payment/subscription/base.html
index 36a2ca314..252f5e7e1 100644
--- a/fragdenstaat_de/templates/froide_payment/subscription/base.html
+++ b/fragdenstaat_de/templates/froide_payment/subscription/base.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-
 {% block navbar %}
-  {% include "header_reduced.html" %}
+    {% include "header_reduced.html" %}
 {% endblock %}
diff --git a/fragdenstaat_de/templates/header.html b/fragdenstaat_de/templates/header.html
index 4f121635f..377d7539c 100644
--- a/fragdenstaat_de/templates/header.html
+++ b/fragdenstaat_de/templates/header.html
@@ -3,249 +3,266 @@
 {% load icons %}
 {% load content_helper %}
 {% load thumbnail %}
-
 {% load cms_tags %}
 {% load account_tags %}
-
 {% if request.user.is_authenticated %}
-  {% get_menu_items as menu_items %}
+    {% get_menu_items as menu_items %}
 {% endif %}
-
 <header id="header">
-  <div class="container">
-    <nav class="navbar navbar-fds bg-body">
-      {% page_url "home" as home_url %}
-      <a href="{{ home_url|default:'/' }}" class="navbar-brand navbar-brand-fds">
-        {% render_svg "img/header_logo.svg" %}
-        <span class="visually-hidden visually-hidden-focusable">{% block nav_brand_name %}{{ SITE_NAME }}{% endblock %}</span>
-      </a>
-      {% url 'foirequest-list' as requests_url %}
-      {% block nav %}
-      <div class="navbar-expand-md">
-        <button class="navbar-toggler ms-auto position-relative z-3 d-flex d-md-none align-items-center" type="button" data-bs-toggle="offcanvas" data-bs-target="#menu" aria-controls="menu" aria-label="{% translate "Toggle main menu" %}">
-          <span class="navbar-toggler-icon me-2"></span>
-          {% translate "Menu" %}
-        </button>
-        <div class="offcanvas offcanvas-start" tabindex="-1" id="menu" aria-labelledby="menu-label">
-          <div class="offcanvas-header">
-            {% render_svg "img/header_logo.svg" %}
-            <h5 id="menu-label" class="visually-hidden">{% translate "Main Menu" %}</h5>
-            <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{% translate "Close" %}"></button>
-          </div>
-          <div class="offcanvas-body d-flex flex-column">
-            <ul class="navbar-nav navbar-nav-primary">
-              <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if request.path == requests_url %}active{% endif %}" href="#" data-bs-toggle="dropdown" aria-expanded="false">
-                  {% blocktrans %}Requests{% endblocktrans %}
-                </a>
-              
-                <ul class="dropdown-menu">
-                  <li>
-                    <a class="dropdown-item" href="{{ requests_url }}">
-                      {% blocktrans %}See requests{% endblocktrans %}
-                    </a>
-                  </li>
-                  <li>
-                    <a class="dropdown-item" href="{% url 'foirequest-make_request' %}">
-                      {% blocktrans %}Make request{% endblocktrans %}
-                    </a>
-                  </li>
-                  {% page_url "beginnersguide" as beginners_url %}
-                  {% if beginners_url %}
-                    <li>
-                      <a class="dropdown-item" href="{{ beginners_url }}">
-                        {% blocktrans %}Beginner's guide{% endblocktrans %}
-                      </a>
+    <div class="container">
+        <nav class="navbar navbar-fds bg-body">
+            {% page_url "home" as home_url %}
+            <a href="{{ home_url|default:'/' }}"
+               class="navbar-brand navbar-brand-fds">
+                {% render_svg "img/header_logo.svg" %}
+                <span class="visually-hidden visually-hidden-focusable">
+                    {% block nav_brand_name %}{{ SITE_NAME }}{% endblock %}
+                </span>
+            </a>
+            {% url 'foirequest-list' as requests_url %}
+            {% block nav %}
+                <div class="navbar-expand-md">
+                    <button class="navbar-toggler ms-auto position-relative z-3 d-flex d-md-none align-items-center"
+                            type="button"
+                            data-bs-toggle="offcanvas"
+                            data-bs-target="#menu"
+                            aria-controls="menu"
+                            aria-label="{% translate "Toggle main menu" %}">
+                        <span class="navbar-toggler-icon me-2"></span>
+                        {% translate "Menu" %}
+                    </button>
+                    <div class="offcanvas offcanvas-start"
+                         tabindex="-1"
+                         id="menu"
+                         aria-labelledby="menu-label">
+                        <div class="offcanvas-header">
+                            {% render_svg "img/header_logo.svg" %}
+                            <h5 id="menu-label" class="visually-hidden">{% translate "Main Menu" %}</h5>
+                            <button type="button"
+                                    class="btn-close"
+                                    data-bs-dismiss="offcanvas"
+                                    aria-label="{% translate "Close" %}"></button>
+                        </div>
+                        <div class="offcanvas-body d-flex flex-column">
+                            <ul class="navbar-nav navbar-nav-primary">
+                                <li class="nav-item dropdown">
+                                    <a class="nav-link dropdown-toggle {% if request.path == requests_url %}active{% endif %}"
+                                       href="#"
+                                       data-bs-toggle="dropdown"
+                                       aria-expanded="false">{% blocktrans %}Requests{% endblocktrans %}</a>
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a class="dropdown-item" href="{{ requests_url }}">{% blocktrans %}See requests{% endblocktrans %}</a>
+                                        </li>
+                                        <li>
+                                            <a class="dropdown-item" href="{% url 'foirequest-make_request' %}">{% blocktrans %}Make request{% endblocktrans %}</a>
+                                        </li>
+                                        {% page_url "beginnersguide" as beginners_url %}
+                                        {% if beginners_url %}
+                                            <li>
+                                                <a class="dropdown-item" href="{{ beginners_url }}">{% blocktrans %}Beginner's guide{% endblocktrans %}</a>
+                                            </li>
+                                        {% endif %}
+                                    </ul>
+                                </li>
+                                {% page_url "campaigns" as campaigns_url %}
+                                <li class="nav-item">
+                                    <a class="nav-link {% if request.path == campaigns_url %}active{% endif %}"
+                                       href="{{ campaigns_url|default:'/kampagnen/' }}">
+                                        {% blocktrans %}Campaigns{% endblocktrans %}
+                                    </a>
+                                </li>
+                                {% page_url "blog" as blog_url %}
+                                <li class="nav-item">
+                                    <a class="nav-link {% if request.path|startswith:blog_url %}active{% endif %}"
+                                       href="{{ blog_url|default:'/blog/' }}">
+                                        {% blocktrans %}Investigations{% endblocktrans %}
+                                    </a>
+                                </li>
+                                {% page_url "lawsuits" as lawsuits_url %}
+                                {% if lawsuits_url %}
+                                    {% page_attribute "menu_title" "lawsuits" as lawsuits_title %}
+                                {% endif %}
+                                <li class="nav-item">
+                                    <a class="nav-link {% if request.path == lawsuits_url %}active{% endif %}"
+                                       href="{{ lawsuits_url|default:'/klagen/' }}">{{ lawsuits_title }}</a>
+                                </li>
+                            </ul>
+                            <ul class="navbar-nav navbar-nav-secondary me-auto">
+                                {% page_url "about" as about_url %}
+                                {% if about_url %}
+                                    {% page_attribute "menu_title" "about" as about_title %}
+                                {% endif %}
+                                <li class="nav-item">
+                                    <a class="nav-link {% if request.path|startswith:about_url %}active{% endif %}" href="{{ about_url|default:"/ueber-uns/" }}">
+                                        {{ about_title }}
+                                    </a>
+                                </li>
+                                {% page_url "newsletter" as newsletter_url %}
+                                {% if newsletter_url %}
+                                    <li class="nav-item">
+                                        <a class="nav-link {% if request.path|startswith:newsletter_url %}active{% endif %}"
+                                           href="{{ newsletter_url }}">{% translate "Newsletter" %}</a>
+                                    </li>
+                                {% endif %}
+                                {# Show either donate or signin as last item #}
+                                {% page_url "donate" as donate_url %}
+                                {% if request.user.is_authenticated %}
+                                    <li class="nav-item logged-in">
+                                        <a class="nav-link fw-bold text-danger"
+                                           href="{{ donate_url|default:'/spenden/' }}?pk_campaign=site-header&pk_keyword={{ request.path | urlencode }}">
+                                            <i class="fa fa-heart" aria-hidden="true"></i>
+                                            {% blocktrans %}Donate{% endblocktrans %}
+                                        </a>
+                                    </li>
+                                {% else %}
+                                    {% url 'account-login' as login_url %}
+                                    <li class="nav-item">
+                                        <a class="nav-link {% if request.path|startswith:login_url %}active{% endif %}"
+                                           href="{% url 'account-login' %}?next={{ request.path|urlencode }}">
+                                            <i class="fa fa-sign-in" aria-hidden="true"></i>
+                                            {% blocktrans %}Sign in{% endblocktrans %}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                            </ul>
+                            <div class="d-md-none">
+                                <hr />
+                                <form action="{{ requests_url }}" method="get">
+                                    <p>{% blocktrans %}Search requests, authorities, investigations etc.{% endblocktrans %}</p>
+                                    <div class="input-group">
+                                        <input type="text" name="q" class="form-control">
+                                        <button type="submit" class="btn btn-outline-primary">{% translate "Search" %}</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endblock nav %}
+            <ul class="navbar-nav ms-auto d-flex flex-row">
+                {% block nav_search %}
+                    <li class="nav-item {% block nav_search_class %}d-none {% if request.user.is_authenticated %}d-sm-block{% else %}d-md-block{% endif %}{% endblock nav_search_class %}">
+                        <button class="nav-link fw-bold me-2"
+                                data-bs-toggle="modal"
+                                data-bs-target="#search-modal"
+                                aria-label="{% translate "Search" %}"
+                                title="{% translate "Search" %}">
+                            <i class="fa fa-search" aria-hidden="true"></i>
+                            <span class="d-none d-lg-inline-block">{% translate "Search" %}</span>
+                        </button>
                     </li>
-                  {% endif %}
-                </ul>
-              </li>
-
-              {% page_url "campaigns" as campaigns_url %}                
-              <li class="nav-item">
-                <a class="nav-link {% if request.path == campaigns_url %}active{% endif %}" href="{{ campaigns_url|default:'/kampagnen/' }}">
-                  {% blocktrans %}Campaigns{% endblocktrans %}
-                </a>
-              </li>
-
-              {% page_url "blog" as blog_url %}
-              <li class="nav-item">
-                <a class="nav-link {% if request.path|startswith:blog_url %}active{% endif %}" href="{{ blog_url|default:'/blog/' }}">
-                  {% blocktrans %}Investigations{% endblocktrans %}
-                </a>
-              </li>
-
-              {% page_url "lawsuits" as lawsuits_url %}
-              {% if lawsuits_url %}
-                {% page_attribute "menu_title" "lawsuits" as lawsuits_title %}
-              {% endif %}
-              <li class="nav-item">
-                <a class="nav-link {% if request.path == lawsuits_url %}active{% endif %}" href="{{ lawsuits_url|default:'/klagen/' }}">
-                  {{ lawsuits_title }}
-                </a>
-              </li>
-
-            </ul>
-            <ul class="navbar-nav navbar-nav-secondary me-auto">
-
-              {% page_url "about" as about_url %}
-              {% if about_url %}
-                {% page_attribute "menu_title" "about" as about_title %}
-              {% endif %}
-              <li class="nav-item">
-                <a class="nav-link {% if request.path|startswith:about_url %}active{% endif %}" href="{{ about_url|default:"/ueber-uns/" }}">
-                  {{ about_title }}
-                </a>
-              </li>
-
-              {% page_url "newsletter" as newsletter_url %}
-              {% if newsletter_url %}
-                <li class="nav-item">
-                  <a class="nav-link {% if request.path|startswith:newsletter_url %}active{% endif %}" href="{{ newsletter_url }}">{% translate "Newsletter" %}</a>
-                </li>
-              {% endif %}
-
-              {# Show either donate or signin as last item #}
-              {% page_url "donate" as donate_url %}
-              {% if request.user.is_authenticated %}
-                <li class="nav-item logged-in">
-                  <a class="nav-link fw-bold text-danger" href="{{ donate_url|default:'/spenden/' }}?pk_campaign=site-header&pk_keyword={{ request.path | urlencode }}">
-                    <i class="fa fa-heart" aria-hidden="true"></i>
-                    {% blocktrans %}Donate{% endblocktrans %}
-                  </a>
-                </li>
-              {% else %}
-                {% url 'account-login' as login_url %}
-                <li class="nav-item">
-                  <a class="nav-link {% if request.path|startswith:login_url %}active{% endif %}" href="{% url 'account-login' %}?next={{ request.path|urlencode }}">
-                    <i class="fa fa-sign-in" aria-hidden="true"></i>
-                    {% blocktrans %}Sign in{% endblocktrans %}
-                  </a>
-                </li>
-              {% endif %}
+                {% endblock nav_search %}
+                {% block nav_donate %}
+                    <li class="nav-item ms-2 {% block nav_donate_class %}{% if request.user.is_authenticated %}d-md-none{% endif %}{% endblock nav_donate_class %}">
+                        <a class="nav-link fw-bold text-danger"
+                           href="{{ donate_url|default:'/spenden/' }}?pk_campaign=site-header&pk_keyword={{ request.path | urlencode }}"
+                           aria-label="{% translate "Donate" %}"
+                           title="{% translate "Donate" %}">
+                            <i class="fa fa-heart" aria-hidden="true"></i>
+                            <span class="d-none d-sm-inline">{% translate "Donate" %}</span>
+                        </a>
+                    </li>
+                {% endblock nav_donate %}
+                {% block nav_account_login %}
+                    {% if request.user.is_authenticated %}
+                        <li class="nav-item ms-2 align-self-center">
+                            <button class="btn py-0 pe-0"
+                                    type="button"
+                                    data-bs-toggle="offcanvas"
+                                    data-bs-target="#user-menu"
+                                    aria-controls="user-menu"
+                                    aria-label="{% translate "Toggle account menu" %}">
+                                {% if request.user.profile_photo %}
+                                    <img width="32"
+                                         height="32"
+                                         src="{% thumbnail request.user.profile_photo 64x64 %}"
+                                         alt="{{ request.user.get_full_name }}"
+                                         class="img-fluid rounded-circle">
+                                {% else %}
+                                    <div class="rounded-circle text-bg-callout d-flex justify-content-center align-items-center"
+                                         style="aspect-ratio: 1/1;
+                                                height: 32px">
+                                        <i class="fa fa-user" aria-hidden="true"></i>
+                                        <span class="visually-hidden">{{ request.user.first_name }}</span>
+                                    </div>
+                                {% endif %}
+                            </button>
+                        </li>
+                    {% endif %}
+                {% endblock %}
             </ul>
-            <div class="d-md-none">
-              <hr/>
-              <form action="{{ requests_url }}" method="get">
-                <p>{% blocktrans %}Search requests, authorities, investigations etc.{% endblocktrans %}</p>
-                <div class="input-group">
-                  <input type="text" name="q" class="form-control">
-                  <button type="submit" class="btn btn-outline-primary">
-                    {% translate "Search" %}
-                  </button>
-                </div>
-              </form>
-            </div>
-          </div>
-        </div>
-      </div>
-      {% endblock nav %}
-
-      <ul class="navbar-nav ms-auto d-flex flex-row">
-
-        {% block nav_search %}
-        <li class="nav-item {% block nav_search_class %}d-none {% if request.user.is_authenticated %}d-sm-block{% else %}d-md-block{% endif %}{% endblock nav_search_class %}">
-          <button class="nav-link fw-bold me-2" data-bs-toggle="modal" data-bs-target="#search-modal" aria-label="{% translate "Search" %}" title="{% translate "Search" %}">
-            <i class="fa fa-search" aria-hidden="true"></i>
-            <span class="d-none d-lg-inline-block">{% translate "Search" %}</span>
-          </button>
-        </li>
-        {% endblock nav_search %}
-
-        {% block nav_donate %}
-        <li class="nav-item ms-2 {% block nav_donate_class %}{% if request.user.is_authenticated %}d-md-none{% endif %}{% endblock nav_donate_class %}">
-          <a class="nav-link fw-bold text-danger" href="{{ donate_url|default:'/spenden/' }}?pk_campaign=site-header&pk_keyword={{ request.path | urlencode }}" aria-label="{% translate "Donate" %}" title="{% translate "Donate" %}">
-            <i class="fa fa-heart" aria-hidden="true"></i>
-            <span class="d-none d-sm-inline">{% translate "Donate" %}</span>
-          </a>
-        </li>
-        {% endblock nav_donate %}
-
-        {% block nav_account_login %}
-          {% if request.user.is_authenticated %}
-            <li class="nav-item ms-2 align-self-center">
-              <button class="btn py-0 pe-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#user-menu" aria-controls="user-menu" aria-label="{% translate "Toggle account menu" %}">
-                {% if request.user.profile_photo %}
-                  <img width="32" height="32" src="{% thumbnail request.user.profile_photo 64x64 %}" alt="{{ request.user.get_full_name }}" class="img-fluid rounded-circle">
-                {% else %}
-                  <div class="rounded-circle text-bg-callout d-flex justify-content-center align-items-center" style="aspect-ratio: 1/1; height: 32px">
-                    <i class="fa fa-user" aria-hidden="true"></i>
-                    <span class="visually-hidden">{{ request.user.first_name }}</span>
-                  </div>
+            {% if request.user.is_authenticated %}
+                <div class="offcanvas offcanvas-end"
+                     tabindex="-1"
+                     id="user-menu"
+                     aria-labelledby="user-menu-label">
+                    <div class="offcanvas-header text-bg-callout">
+                        <h5 id="user-menu-label" class="visually-hidden">{% translate "Account Menu" %}</h5>
+                        {% if request.user.profile_photo %}
+                            <img width="32"
+                                 height="32"
+                                 src="{% thumbnail request.user.profile_photo 64x64 %}"
+                                 alt="{{ request.user.get_full_name }}"
+                                 class="img-fluid rounded-circle">
+                        {% endif %}
+                        <div class="flex-column">
+                            <span class="d-block text-truncate">{{ request.user.get_full_name }}</span>
+                            <small class="d-block text-truncate">{{ request.user.email }}</small>
+                        </div>
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="offcanvas"
+                                aria-label="{% translate "Close" %}"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                        <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+                            {% for menu_item in menu_items.before_request %}
+                                <li class="nav-item">
+                                    <a class="nav-link" href="{{ menu_item.url }}">{{ menu_item.label }}</a>
+                                </li>
+                            {% endfor %}
+                            {% for menu_item in menu_items.before_settings %}
+                                <li class="nav-item">
+                                    <a class="nav-link" href="{{ menu_item.url }}">{{ menu_item.label }}</a>
+                                </li>
+                            {% endfor %}
+                            {% for menu_item in menu_items.after_settings %}
+                                <li class="nav-item">
+                                    <a class="nav-link" href="{{ menu_item.url }}">{{ menu_item.label }}</a>
+                                </li>
+                            {% endfor %}
+                            <li class="nav-item">
+                                <hr />
+                                <form action="{% url 'account-logout' %}" method="post">
+                                    {% csrf_token %}
+                                    <button type="submit" class="nav-link">{% blocktrans %}Log out{% endblocktrans %}</button>
+                                </form>
+                            </li>
+                        </ul>
+                    </div>
                 {% endif %}
-              </button>      
-            </li>
-          {% endif %}
-        {% endblock %}
-      </ul>
-      {% if request.user.is_authenticated %}
-        <div class="offcanvas offcanvas-end" tabindex="-1" id="user-menu" aria-labelledby="user-menu-label">
-          <div class="offcanvas-header text-bg-callout">
-            <h5 id="user-menu-label" class="visually-hidden">{% translate "Account Menu" %}</h5>
-            {% if request.user.profile_photo %}
-              <img width="32" height="32" src="{% thumbnail request.user.profile_photo 64x64 %}" alt="{{ request.user.get_full_name }}" class="img-fluid rounded-circle">
-            {% endif %}
-            <div class="flex-column">
-              <span class="d-block text-truncate">{{ request.user.get_full_name }}</span>
-              <small class="d-block text-truncate">{{ request.user.email }}</small>
             </div>
-            <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{% translate "Close" %}"></button>
-          </div>
-          <div class="offcanvas-body">
-            <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
-              {% for menu_item in menu_items.before_request %}
-                <li class="nav-item">
-                  <a class="nav-link" href="{{ menu_item.url }}">
-                    {{ menu_item.label }}
-                  </a>
-                </li>
-              {% endfor %}
-              {% for menu_item in menu_items.before_settings %}
-                <li class="nav-item">
-                  <a class="nav-link" href="{{ menu_item.url }}">
-                    {{ menu_item.label }}
-                  </a>
-                </li>
-              {% endfor %}
-              {% for menu_item in menu_items.after_settings %}
-                <li class="nav-item">
-                  <a class="nav-link" href="{{ menu_item.url }}">
-                    {{ menu_item.label }}
-                  </a>
-                </li>
-              {% endfor %}
-              <li class="nav-item">
-                <hr/>
-                <form action="{% url 'account-logout' %}" method="post">
-                  {% csrf_token %}
-                  <button type="submit" class="nav-link">
-                    {% blocktrans %}Log out{% endblocktrans %}
-                  </button>
-                </form>
-              </li>
-            </ul>
-          </div>
-        {% endif %}
-      </div>
-    </nav>
-  </div>
-  <div class="modal" tabindex="-1" id="search-modal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-body">
-          <form action="{% block nav_search_url %}{% url 'foirequest-list' %}{% endblock nav_search_url %}" method="get">
-            <button type="button" class="btn-close float-end" data-bs-dismiss="modal" aria-label="{% translate "Close" %}"></button>
-            <p>{% blocktrans %}Search requests, authorities, investigations etc.{% endblocktrans %}</p>
-            <div class="input-group">
-              <input type="text" name="q" class="form-control" data-focus="true">
-              <button type="submit" class="btn btn-outline-primary">
-                {% translate "Search" %}
-              </button>
+        </nav>
+    </div>
+    <div class="modal" tabindex="-1" id="search-modal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-body">
+                    <form action="{% block nav_search_url %}{% url 'foirequest-list' %}{% endblock nav_search_url %}"
+                          method="get">
+                        <button type="button"
+                                class="btn-close float-end"
+                                data-bs-dismiss="modal"
+                                aria-label="{% translate "Close" %}"></button>
+                        <p>{% blocktrans %}Search requests, authorities, investigations etc.{% endblocktrans %}</p>
+                        <div class="input-group">
+                            <input type="text" name="q" class="form-control" data-focus="true">
+                            <button type="submit" class="btn btn-outline-primary">{% translate "Search" %}</button>
+                        </div>
+                    </form>
+                </div>
             </div>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
-  
 </header>
diff --git a/fragdenstaat_de/templates/header_minimal.html b/fragdenstaat_de/templates/header_minimal.html
index c82a9c523..081ba9994 100644
--- a/fragdenstaat_de/templates/header_minimal.html
+++ b/fragdenstaat_de/templates/header_minimal.html
@@ -1,25 +1,27 @@
 {% extends "header.html" %}
-
 {% load i18n %}
 {% load thumbnail %}
-
 {% block nav_search %}{% endblock %}
-
-{% block nav %}{% endblock nav %}
-
+{% block nav %}
+{% endblock nav %}
 {% block nav_donate %}{% endblock %}
-
 {% block nav_account_login %}
-  {% if request.user.is_authenticated %}
-    <li class="nav-item ms-lg-2 align-self-center">
-      {% if request.user.profile_photo %}
-        <img width="32" height="32" src="{% thumbnail request.user.profile_photo 64x64 %}" alt="{{ request.user.get_full_name }}" class="img-fluid rounded-circle">
-      {% else %}
-        <div class="rounded-circle text-bg-callout d-flex justify-content-center align-items-center" style="aspect-ratio: 1/1; height: 32px">
-          <i class="fa fa-user" aria-hidden="true"></i>
-          <span class="visually-hidden">{{ request.user.first_name }}</span>
-        </div>
-      {% endif %}
-    </li>
-  {% endif %}
+    {% if request.user.is_authenticated %}
+        <li class="nav-item ms-lg-2 align-self-center">
+            {% if request.user.profile_photo %}
+                <img width="32"
+                     height="32"
+                     src="{% thumbnail request.user.profile_photo 64x64 %}"
+                     alt="{{ request.user.get_full_name }}"
+                     class="img-fluid rounded-circle">
+            {% else %}
+                <div class="rounded-circle text-bg-callout d-flex justify-content-center align-items-center"
+                     style="aspect-ratio: 1/1;
+                            height: 32px">
+                    <i class="fa fa-user" aria-hidden="true"></i>
+                    <span class="visually-hidden">{{ request.user.first_name }}</span>
+                </div>
+            {% endif %}
+        </li>
+    {% endif %}
 {% endblock nav_account_login %}
diff --git a/fragdenstaat_de/templates/header_reduced.html b/fragdenstaat_de/templates/header_reduced.html
index b7303ec35..5c9dc3e7b 100644
--- a/fragdenstaat_de/templates/header_reduced.html
+++ b/fragdenstaat_de/templates/header_reduced.html
@@ -1,7 +1,4 @@
 {% extends "header.html" %}
-
 {% block nav_search %}{% endblock %}
-
 {% block nav %}{% endblock %}
-
 {% block nav_donate_class %}{% endblock %}
diff --git a/fragdenstaat_de/templates/index.html b/fragdenstaat_de/templates/index.html
index f900068e2..4c5a576ee 100644
--- a/fragdenstaat_de/templates/index.html
+++ b/fragdenstaat_de/templates/index.html
@@ -1,62 +1,49 @@
 {% extends "index.html" %}
-
 {% load i18n %}
 {% load static %}
-
 {% block title %}FragDenStaat - Portal für Informationsfreiheit und Transparenz{% endblock %}
-
 {% block index_content_row %}
-  {% include "snippets/homepage_how.html" %}
+    {% include "snippets/homepage_how.html" %}
 {% endblock %}
-
 {% block index_requests_row %}
-<div class="row">
-  <div class="col-md-6">
-    <div class="card">
-      {% if successful_foi_requests %}
-        <h4 class="card-header">
-          {% blocktrans %}Successful Requests{% endblocktrans %}
-        </h4>
-        <div class="card-body">
-          <ul class="list-unstyled">
-            {% for object in successful_foi_requests %}
-              <li class="d-flex">
-                {% include "foirequest/snippets/request_item.html" %}
-              </li>
-            {% endfor %}
-          </ul>
-          <p>
-            <a class="btn btn-default" href="{% url "foirequest-list" %}">Weitere Anfragen</a>
-          </p>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="card">
+                {% if successful_foi_requests %}
+                    <h4 class="card-header">{% blocktrans %}Successful Requests{% endblocktrans %}</h4>
+                    <div class="card-body">
+                        <ul class="list-unstyled">
+                            {% for object in successful_foi_requests %}
+                                <li class="d-flex">{% include "foirequest/snippets/request_item.html" %}</li>
+                            {% endfor %}
+                        </ul>
+                        <p>
+                            <a class="btn btn-default" href="{% url "foirequest-list" %}">Weitere Anfragen</a>
+                        </p>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="card">
+                <h4 class="card-header">Blog</h4>
+                <div class="card-body">
+                    {% for object in featured %}
+                        <h5>
+                            <a href="{{ object.url }}">{{ object.title }}</a>
+                        </h5>
+                        <p>{{ object.text|truncatewords:55|linebreaksbr }}</p>
+                        {% if object.request %}
+                            <p>
+                                <a href="{% url 'foirequest-show' slug=object.request.slug %}">
+                                    <span class="glyphicon glyphicon-share-alt"></span>
+                                    {% blocktrans %}Visit this request{% endblocktrans %}
+                                </a>
+                            </p>
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
         </div>
-      {% endif %}
-    </div>
-  </div>
-
-  <div class="col-md-6">
-    <div class="card">
-      <h4 class="card-header">
-        Blog
-      </h4>
-      <div class="card-body">
-        {% for object in featured %}
-          <h5>
-            <a href="{{ object.url }}">{{ object.title }}</a>
-          </h5>
-          <p>
-            {{ object.text|truncatewords:55|linebreaksbr }}
-          </p>
-          {% if object.request %}
-            <p>
-              <a href="{% url 'foirequest-show' slug=object.request.slug %}">
-                <span class="glyphicon glyphicon-share-alt"></span>
-                {% blocktrans %}Visit this request{% endblocktrans %}
-              </a>
-            </p>
-          {% endif %}
-        {% endfor %}
-      </div>
     </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/legal_advice_builder/answer_form.html b/fragdenstaat_de/templates/legal_advice_builder/answer_form.html
index cb662e3d2..76d06f487 100644
--- a/fragdenstaat_de/templates/legal_advice_builder/answer_form.html
+++ b/fragdenstaat_de/templates/legal_advice_builder/answer_form.html
@@ -1,70 +1,80 @@
 {% extends "base.html" %}
 {% load form_helper i18n %}
-
 {% block body %}
-<div class="bg-body-tertiary">
-  <div class="container">
-    <div class="row justify-content-left">
-      <div class="col-md-8">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="{% url 'account-show' %}">{% trans "My requests" %}</a></li>
-            <li class="breadcrumb-item"><a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a></li>
-            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
-          </ol>
-        </nav>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="bg-body-tertiary bg-body-tertiary-header">
-  <div class="container pb-5">
-    <div class="row justify-content-left">
-      <div class="col-md-8">
-        <h2>{{ law_case.title }}</h2>
-        <div>zu: <a href="{% url 'foirequest-shortlink' foi_request.id %}" target="_blank">{{ foi_request.title }}</a>,</br>an: {{ foi_request.public_body }}</div>
-      </div>
+    <div class="bg-body-tertiary">
+        <div class="container">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    <nav aria-label="breadcrumb">
+                        <ol class="breadcrumb">
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'account-show' %}">{% trans "My requests" %}</a>
+                            </li>
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a>
+                            </li>
+                            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
+                        </ol>
+                    </nav>
+                </div>
+            </div>
+        </div>
     </div>
-
-    <div class="row mt-2">
-      <div class="col-md-8">
-        <form method="post" class="clearfix mt-3 border-gray shadow-sm p-3">
-          {{ form.media }}
-          {% csrf_token %}
-          {{ form }}
-          <div class="row mt-2">
-            <div class="col">
-              <div class="dropdown mt-2">
-                <button id="downloadActions" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  Klageentwurf herunterladen
-                </button>
-                <div class="dropdown-menu alpha-dropdown-menu" aria-labelledby="downloadActions">
-                  <a class="dropdown-item" href="{% url 'klageautomat-word-download-answer' foi_request.id %}">
-                    Word-Dokument
-                  </a>
-                  <a class="dropdown-item" href="{% url 'klageautomat-pdf-download-answer' foi_request.id %}">
-                    PDF-Dokument
-                  </a>
-                  <a class="dropdown-item" href="{% url 'klageautomat-html-download-answer' foi_request.id %}">
-                    HTML-Dokument
-                  </a>
+    <div class="bg-body-tertiary bg-body-tertiary-header">
+        <div class="container pb-5">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    <h2>{{ law_case.title }}</h2>
+                    <div>
+                        zu: <a href="{% url 'foirequest-shortlink' foi_request.id %}"
+    target="_blank">{{ foi_request.title }}</a>,
+                    </br>
+                    an: {{ foi_request.public_body }}
                 </div>
-              </div>
             </div>
-            <div class="col">
-              <input class="btn btn-primary btn-sm float-end mt-2" type="submit" value="Änderungen speichern" />
+        </div>
+        <div class="row mt-2">
+            <div class="col-md-8">
+                <form method="post" class="clearfix mt-3 border-gray shadow-sm p-3">
+                    {{ form.media }}
+                    {% csrf_token %}
+                    {{ form }}
+                    <div class="row mt-2">
+                        <div class="col">
+                            <div class="dropdown mt-2">
+                                <button id="downloadActions"
+                                        type="button"
+                                        class="btn btn-primary btn-sm dropdown-toggle"
+                                        data-bs-toggle="dropdown"
+                                        aria-haspopup="true"
+                                        aria-expanded="false">Klageentwurf herunterladen</button>
+                                <div class="dropdown-menu alpha-dropdown-menu"
+                                     aria-labelledby="downloadActions">
+                                    <a class="dropdown-item"
+                                       href="{% url 'klageautomat-word-download-answer' foi_request.id %}">
+                                        Word-Dokument
+                                    </a>
+                                    <a class="dropdown-item"
+                                       href="{% url 'klageautomat-pdf-download-answer' foi_request.id %}">
+                                        PDF-Dokument
+                                    </a>
+                                    <a class="dropdown-item"
+                                       href="{% url 'klageautomat-html-download-answer' foi_request.id %}">
+                                        HTML-Dokument
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <input class="btn btn-primary btn-sm float-end mt-2"
+                                   type="submit"
+                                   value="Änderungen speichern" />
+                        </div>
+                    </div>
+                </form>
             </div>
-          </div>
-        </form>
-      </div>
-
-      <div class="col-md-4 mt-3">
-        {% include 'legal_advice_builder/includes/info_box.html' %}
-      </div>
-
+            <div class="col-md-4 mt-3">{% include 'legal_advice_builder/includes/info_box.html' %}</div>
+        </div>
     </div>
-  </div>
 </div>
-
 {% endblock %}
diff --git a/fragdenstaat_de/templates/legal_advice_builder/form_wizard.html b/fragdenstaat_de/templates/legal_advice_builder/form_wizard.html
index 6b4da0500..771724c0d 100644
--- a/fragdenstaat_de/templates/legal_advice_builder/form_wizard.html
+++ b/fragdenstaat_de/templates/legal_advice_builder/form_wizard.html
@@ -1,201 +1,206 @@
 {% extends "base.html" %}
 {% load form_helper markup i18n %}
-
 {% block body %}
-<div class="bg-body-tertiary">
-  <div class="container">
-    <div class="row justify-content-left">
-      <div class="col-md-8">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="{% url 'account-show' %}">{% trans "My requests" %}</a></li>
-            <li class="breadcrumb-item"><a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a></li>
-            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
-          </ol>
-        </nav>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="bg-body-tertiary bg-body-tertiary-header">
-    <div class="container pb-5">
-      <div class="row justify-content-left">
-        <div class="col-md-8">
-          <h2>{{ law_case.title }}</h2>
-          <div>zu: <a href="{% url 'foirequest-shortlink' foi_request.id %}" target="_blank">{{ foi_request.title }}</a>,</br>an: {{ foi_request.public_body }}</div>
-        </div>
-      </div>
-
-  <div class="row justify-content-center mt-2">
-    <div class="col-md-8">
-      {% if form %}
-        <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
-          <form method="post" >
-            <div class="pb-2 mb-3">
-              {% if step_count > 1 %}
-              <div class="fw-bold mb-3">{{ question.questionaire }}</div>
-              {% endif %}
-              <div class="progress">
-                <div class="progress-bar" role="progressbar" style="width: {{ progess }}%" aria-valuenow="{{ progess }}" aria-valuemin="0" aria-valuemax="100"></div>
-              </div>
-              <div class="text-end">
-                <small class="text-body-secondary">
-                  Frage {{ answer_count }} von max. {{ question_count }}.
-                </small>
-              </div>
-            </div>
-
-            {% csrf_token %}
-            <div class="no-required-asterisk">
-              {% render_form form horizontal=False %}
+    <div class="bg-body-tertiary">
+        <div class="container">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    <nav aria-label="breadcrumb">
+                        <ol class="breadcrumb">
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'account-show' %}">{% trans "My requests" %}</a>
+                            </li>
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a>
+                            </li>
+                            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
+                        </ol>
+                    </nav>
+                </div>
             </div>
-            <input class="btn btn-primary btn-sm float-end" type="submit" value="Weiter" />
-          </form>
-
-          {% if has_previous_question%}
-            <form method="post">
-              {% csrf_token %}
-              <input class="btn btn-link btn-sm float-end" name="previous-question" type="submit" value="Zurück" />
-            </form>
-          {% endif %}
         </div>
-      {% endif %}
-
-      {% if success %}
-      <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
-        <div class="pb-2 mb-3">
-          {% if step_count > 1 %}
-          <div class="fw-bold mb-3">{{ question.questionaire }}</div>
-          {% endif %}
-          <div class="progress">
-            <div class="progress-bar" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
-          </div>
-          <div class="text-end">
-            <small class="text-body-secondary">
-              Alle Fragen beantwortet.
-            </small>
-          </div>
-          <div class="alert alert-success mt-5" role="alert">
-            {% if step_count > 1 %}
-              <div class="mb-3 fw-bold pb-2">{{ question.questionaire }} <i class="fa fa-check" aria-hidden="true"></i></div>
-            {% endif %}
-            <div>
-              {{ message|markdown|linebreaks }}
-            </div>
-          </div>
-          {% if next %}
-          <form method="post">
-            {% csrf_token %}
-            <div class="mt-3 mb-3 float-end">
-              <button class="btn btn-primary btn-sm">
-                <input type="hidden" name="next" value="{{ next.id }}" />
-                Jetzt Klage erstellen
-              </button>
+    </div>
+    <div class="bg-body-tertiary bg-body-tertiary-header">
+        <div class="container pb-5">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    <h2>{{ law_case.title }}</h2>
+                    <div>
+                        zu: <a href="{% url 'foirequest-shortlink' foi_request.id %}"
+    target="_blank">{{ foi_request.title }}</a>,
+                    </br>
+                    an: {{ foi_request.public_body }}
+                </div>
             </div>
-          </form>
-          {% endif %}
         </div>
-        </div>
-        {% endif %}
-
-      {% if failure %}
-        <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
-          <div class="pb-2 mb-3">
-            {% if step_count > 1 %}
-            <div class="fw-bold mb-3">{{ question.questionaire }}</div>
-            {% endif %}
-            <div class="progress">
-              <div class="progress-bar" role="progressbar" style="width: {{ progess }}%" aria-valuenow="{{ progess }}" aria-valuemin="0" aria-valuemax="100"></div>
-            </div>
-            <div class="text-end">
-              <small class="text-body-secondary">
-                Frage {{ answer_count }} von max. {{ question_count }}.
-              </small>
+        <div class="row justify-content-center mt-2">
+            <div class="col-md-8">
+                {% if form %}
+                    <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
+                        <form method="post">
+                            <div class="pb-2 mb-3">
+                                {% if step_count > 1 %}<div class="fw-bold mb-3">{{ question.questionaire }}</div>{% endif %}
+                                <div class="progress">
+                                    <div class="progress-bar"
+                                         role="progressbar"
+                                         style="width: {{ progess }}%"
+                                         aria-valuenow="{{ progess }}"
+                                         aria-valuemin="0"
+                                         aria-valuemax="100"></div>
+                                </div>
+                                <div class="text-end">
+                                    <small class="text-body-secondary">Frage {{ answer_count }} von max. {{ question_count }}.</small>
+                                </div>
+                            </div>
+                            {% csrf_token %}
+                            <div class="no-required-asterisk">{% render_form form horizontal=False %}</div>
+                            <input class="btn btn-primary btn-sm float-end" type="submit" value="Weiter" />
+                        </form>
+                        {% if has_previous_question %}
+                            <form method="post">
+                                {% csrf_token %}
+                                <input class="btn btn-link btn-sm float-end"
+                                       name="previous-question"
+                                       type="submit"
+                                       value="Zurück" />
+                            </form>
+                        {% endif %}
+                    </div>
+                {% endif %}
+                {% if success %}
+                    <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
+                        <div class="pb-2 mb-3">
+                            {% if step_count > 1 %}<div class="fw-bold mb-3">{{ question.questionaire }}</div>{% endif %}
+                            <div class="progress">
+                                <div class="progress-bar"
+                                     role="progressbar"
+                                     style="width: 100%"
+                                     aria-valuenow="100"
+                                     aria-valuemin="0"
+                                     aria-valuemax="100"></div>
+                            </div>
+                            <div class="text-end">
+                                <small class="text-body-secondary">Alle Fragen beantwortet.</small>
+                            </div>
+                            <div class="alert alert-success mt-5" role="alert">
+                                {% if step_count > 1 %}
+                                    <div class="mb-3 fw-bold pb-2">
+                                        {{ question.questionaire }} <i class="fa fa-check" aria-hidden="true"></i>
+                                    </div>
+                                {% endif %}
+                                <div>{{ message|markdown|linebreaks }}</div>
+                            </div>
+                            {% if next %}
+                                <form method="post">
+                                    {% csrf_token %}
+                                    <div class="mt-3 mb-3 float-end">
+                                        <button class="btn btn-primary btn-sm">
+                                            <input type="hidden" name="next" value="{{ next.id }}" />
+                                            Jetzt Klage erstellen
+                                        </button>
+                                    </div>
+                                </form>
+                            {% endif %}
+                        </div>
+                    </div>
+                {% endif %}
+                {% if failure %}
+                    <div class="clearfix mt-3 text-bg-body border-gray shadow-sm p-3">
+                        <div class="pb-2 mb-3">
+                            {% if step_count > 1 %}<div class="fw-bold mb-3">{{ question.questionaire }}</div>{% endif %}
+                            <div class="progress">
+                                <div class="progress-bar"
+                                     role="progressbar"
+                                     style="width: {{ progess }}%"
+                                     aria-valuenow="{{ progess }}"
+                                     aria-valuemin="0"
+                                     aria-valuemax="100"></div>
+                            </div>
+                            <div class="text-end">
+                                <small class="text-body-secondary">Frage {{ answer_count }} von max. {{ question_count }}.</small>
+                            </div>
+                            <div class="alert alert-danger mt-1 mb-0" role="alert">
+                                {% if step_count > 1 %}
+                                    <div class="mb-3 fw-bold pb-2">
+                                        {{ question.questionaire }} <i class="fa fa-times" aria-hidden="true"></i>
+                                    </div>
+                                {% endif %}
+                                <div>{{ message|markdown|linebreaks }}</div>
+                            </div>
+                        </div>
+                        <a class="btn btn-primary btn-sm float-end"
+                           href="{% url 'foirequest-shortlink' foi_request.id %}">Zurück zu Anfrage</a>
+                        {% if has_previous_question %}
+                            <form method="post">
+                                {% csrf_token %}
+                                <input class="btn btn-link btn-sm float-end"
+                                       name="previous-question"
+                                       type="submit"
+                                       value="Zurück zur letzten Frage" />
+                            </form>
+                        {% endif %}
+                    </div>
+                {% endif %}
+                {% if answer_form %}
+                    <div class="alert alert-success mt-3" role="alert">
+                        <p>Die Prüfung ist abgeschlossen – es kommt eine Untätigkeitsklage in Betracht!</p>
+                        <p>Ein Klageentwurf wurde für Sie erstellt.</p>
+                    </div>
+                    {{ answer_form.media }}
+                    <form method="post" class="clearfix mt-3 border-gray shadow-sm p-3">
+                        {% csrf_token %}
+                        {{ answer_form }}
+                        <div class="row mt-2">
+                            <div class="col">
+                                <div class="dropdown mt-2">
+                                    <button id="downloadActions"
+                                            type="button"
+                                            class="btn btn-primary btn-sm dropdown-toggle"
+                                            data-bs-toggle="dropdown"
+                                            aria-haspopup="true"
+                                            aria-expanded="false">Klageentwurf herunterladen</button>
+                                    <div class="dropdown-menu alpha-dropdown-menu"
+                                         aria-labelledby="downloadActions">
+                                        <button class="dropdown-item" type="submit" name="download" value="pdf">als PDF-Dokument</button>
+                                        <button class="dropdown-item" type="submit" name="download" value="word">als Word-Dokument</button>
+                                        <button class="dropdown-item" type="submit" name="download" value="html">als HTML-Dokument</button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="mt-2 mb-3">
+                                    <input class="btn btn-primary btn-sm float-end"
+                                           type="submit"
+                                           value="Änderungen speichern" />
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                {% endif %}
             </div>
-            <div class="alert alert-danger mt-1 mb-0" role="alert">
-            {% if step_count > 1 %}
-              <div class="mb-3 fw-bold pb-2">{{ question.questionaire }} <i class="fa fa-times" aria-hidden="true"></i></div>
-            {% endif %}
-            <div>{{ message|markdown|linebreaks }}</div>
-          </div>
-        </div>
-        <a class="btn btn-primary btn-sm float-end" href="{% url 'foirequest-shortlink' foi_request.id %}">
-          Zurück zu Anfrage
-        </a>
-        {% if has_previous_question%}
-        <form method="post">
-          {% csrf_token %}
-          <input class="btn btn-link btn-sm float-end" name="previous-question" type="submit" value="Zurück zur letzten Frage" />
-        </form>
-        {% endif %}
-      </div>
-      {% endif %}
-
-      {% if answer_form %}
-        <div class="alert alert-success mt-3" role="alert">
-          <p>Die Prüfung ist abgeschlossen – es kommt eine Untätigkeitsklage in Betracht!</p>
-          <p>Ein Klageentwurf wurde für Sie erstellt.</p>
-        </div>
-        {{ answer_form.media }}
-        <form method="post" class="clearfix mt-3 border-gray shadow-sm p-3">
-          {% csrf_token %}
-          {{ answer_form }}
-
-          <div class="row mt-2">
-
-            <div class="col">
-              <div class="dropdown mt-2">
-                <button id="downloadActions" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  Klageentwurf herunterladen
-                </button>
-                <div class="dropdown-menu alpha-dropdown-menu" aria-labelledby="downloadActions">
-                  <button class="dropdown-item" type="submit" name="download" value="pdf">als PDF-Dokument</button>
-                  <button class="dropdown-item" type="submit" name="download" value="word">als Word-Dokument</button>
-                  <button class="dropdown-item" type="submit" name="download" value="html">als HTML-Dokument</button>
+            <div class="col-md-4 mt-3">
+                {% if question.information and not success %}
+                    <div id="infobox" class="info-box mb-3 info-box--regular mt-0">
+                        <div class="info-box__header d-flex flex-nowrap justify-content-between align-items-center">
+                            <div>
+                                <h3 class="h5 info-box__title">Hilfe</h3>
+                                <div class="info-box__subtitle"></div>
+                            </div>
+                        </div>
+                        <div class="info-box__body">
+                            <ul class="info-box__list ">
+                                <li class="info-box__list-item">
+                                    <div class="info-box__list-label"></div>
+                                    <div class="info-box__list-value">{{ question.information|markdown|linebreaks }}</div>
+                                </li>
+                            </div>
+                        </div>
+                    {% endif %}
+                    {% if answer_form %}
+                        {% include 'legal_advice_builder/includes/info_box.html' %}
+                    {% endif %}
                 </div>
-              </div>
-            </div>
-
-            <div class="col">
-              <div class="mt-2 mb-3">
-                <input class="btn btn-primary btn-sm float-end" type="submit" value="Änderungen speichern" />
-              </div>
-            </div>
-
-          </div>
-
-        </form>
-      {% endif %}
-
-
-    </div>
-    <div class="col-md-4 mt-3">
-      {% if question.information and not success %}
-        <div id="infobox" class="info-box mb-3 info-box--regular mt-0">
-          <div class="info-box__header d-flex flex-nowrap justify-content-between align-items-center">
-            <div>
-              <h3 class="h5 info-box__title">Hilfe</h3>
-              <div class="info-box__subtitle"></div>
             </div>
-          </div>
-
-          <div class="info-box__body">
-            <ul class="info-box__list ">
-              <li class="info-box__list-item">
-                <div class="info-box__list-label"></div>
-                <div class="info-box__list-value">{{ question.information|markdown|linebreaks }}</div>
-              </li>
-          </div>
         </div>
-      {% endif %}
-
-      {% if answer_form %}
-      {% include 'legal_advice_builder/includes/info_box.html' %}
-      {% endif %}
     </div>
-  </div>
-</div>
-</div>
-
 {% endblock %}
diff --git a/fragdenstaat_de/templates/legal_advice_builder/includes/info_box.html b/fragdenstaat_de/templates/legal_advice_builder/includes/info_box.html
index 912285738..9cca17d24 100644
--- a/fragdenstaat_de/templates/legal_advice_builder/includes/info_box.html
+++ b/fragdenstaat_de/templates/legal_advice_builder/includes/info_box.html
@@ -1,66 +1,58 @@
 <div class="info-box mb-3 info-box--regular mt-0">
-  <div class="info-box__header d-flex flex-nowrap justify-content-between align-items-center">
-    <div>
-      <h3 class="h5 info-box__title">Wie geht es weiter?</h3>
-      <div class="info-box__subtitle"></div>
-    </div>
-  </div>
-
-  <div class="info-box__body">
-    <ul class="info-box__list ">
-
-      <li class="info-box__list-item">
-        <div class="info-box__list-label">Option 1: Klage eigenständig einreichen</div>
-        <div class="info-box__list-value">
-          Laden Sie den Entwurf herunter und nutzen Sie ggf. die Word-Version, um Anpassungen vorzunehmen. Ausgedruckt
-          und unterschrieben können Sie die Klage direkt an das Gericht schicken und damit offiziell einreichen.
-        </div>
-      </li>
-
-      <li class="info-box__list-item">
-        <div class="info-box__list-label">Option 2: Anwaltliche Beratung einbeziehen</div>
-        <div class="info-box__list-value">
-          Besprechen Sie den Entwurf mit Ihrer Anwältin oder Ihrem Anwalt.
-        </div>
-      </li>
-
-      <li class="info-box__list-item info-box__list-item--has-divider">
-        <div class="info-box__list-label">Option 3: Klage FragDenStaat vorschlagen</div>
-        <div class="info-box__list-value">
-          Sie haben selbst keine Kapazitäten die Klage alleine einzureichen, die erfragten Informationen sind aber
-          von breitem öffentlichen Interesse? Dann schicken Sie uns gern den Klageentwurf zu.
+    <div class="info-box__header d-flex flex-nowrap justify-content-between align-items-center">
+        <div>
+            <h3 class="h5 info-box__title">Wie geht es weiter?</h3>
+            <div class="info-box__subtitle"></div>
         </div>
-      </li>
-
-      <li class="info-box__list-item">
-        <div class="info-box__list-label">Anlagen</div>
-        <div class="info-box__list-value">Bitte denken Sie daran, folgende Dokumente als Anlagen hinzuzufügen:</div>
-        <ul>
-          {% for attachment in attachments %}
-          <li>{{ attachment.text }} {{ attachment.date }}</li>
-          {% endfor %}
-        </ul>
-      </li>
-
-      <li class="info-box__list-item">
-        <div class="info-box__list-value">Hier können Sie die gesamte Kommunikation zu Ihrer Anfrage herunterladen und für Ihre Anlagen nutzen:</div>
-        <div class="d-flex justify-content-center">
-          <div class="dropdown">
-            <button id="downloadActions" type="button" class="btn btn btn-outline-dark btn-sm mt-2 dropdown-toggle"
-              data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Daten herunterladen
-            </button>
-            <div class="dropdown-menu alpha-dropdown-menu" aria-labelledby="downloadActions">
-              <a class="dropdown-item" href="{% url 'foirequest-download' foi_request.slug %}">
-                Download als ZIP
-              </a>
-              <a class="dropdown-item" href="{% url 'foirequest-pdf' foi_request.slug %}">
-                Download als PDF
-              </a>
-            </div>
-          </div>
+    </div>
+    <div class="info-box__body">
+        <ul class="info-box__list ">
+            <li class="info-box__list-item">
+                <div class="info-box__list-label">Option 1: Klage eigenständig einreichen</div>
+                <div class="info-box__list-value">
+                    Laden Sie den Entwurf herunter und nutzen Sie ggf. die Word-Version, um Anpassungen vorzunehmen. Ausgedruckt
+                    und unterschrieben können Sie die Klage direkt an das Gericht schicken und damit offiziell einreichen.
+                </div>
+            </li>
+            <li class="info-box__list-item">
+                <div class="info-box__list-label">Option 2: Anwaltliche Beratung einbeziehen</div>
+                <div class="info-box__list-value">Besprechen Sie den Entwurf mit Ihrer Anwältin oder Ihrem Anwalt.</div>
+            </li>
+            <li class="info-box__list-item info-box__list-item--has-divider">
+                <div class="info-box__list-label">Option 3: Klage FragDenStaat vorschlagen</div>
+                <div class="info-box__list-value">
+                    Sie haben selbst keine Kapazitäten die Klage alleine einzureichen, die erfragten Informationen sind aber
+                    von breitem öffentlichen Interesse? Dann schicken Sie uns gern den Klageentwurf zu.
+                </div>
+            </li>
+            <li class="info-box__list-item">
+                <div class="info-box__list-label">Anlagen</div>
+                <div class="info-box__list-value">Bitte denken Sie daran, folgende Dokumente als Anlagen hinzuzufügen:</div>
+                <ul>
+                    {% for attachment in attachments %}<li>{{ attachment.text }} {{ attachment.date }}</li>{% endfor %}
+                </ul>
+            </li>
+            <li class="info-box__list-item">
+                <div class="info-box__list-value">
+                    Hier können Sie die gesamte Kommunikation zu Ihrer Anfrage herunterladen und für Ihre Anlagen nutzen:
+                </div>
+                <div class="d-flex justify-content-center">
+                    <div class="dropdown">
+                        <button id="downloadActions"
+                                type="button"
+                                class="btn btn btn-outline-dark btn-sm mt-2 dropdown-toggle"
+                                data-bs-toggle="dropdown"
+                                aria-haspopup="true"
+                                aria-expanded="false">Daten herunterladen</button>
+                        <div class="dropdown-menu alpha-dropdown-menu"
+                             aria-labelledby="downloadActions">
+                            <a class="dropdown-item"
+                               href="{% url 'foirequest-download' foi_request.slug %}">Download als ZIP</a>
+                            <a class="dropdown-item"
+                               href="{% url 'foirequest-pdf' foi_request.slug %}">Download als PDF</a>
+                        </div>
+                    </div>
+                </div>
+            </li>
         </div>
-      </li>
-
-  </div>
-</div>
+    </div>
diff --git a/fragdenstaat_de/templates/legal_advice_builder/klageautomat_info.html b/fragdenstaat_de/templates/legal_advice_builder/klageautomat_info.html
index 609db896e..c6950b79e 100644
--- a/fragdenstaat_de/templates/legal_advice_builder/klageautomat_info.html
+++ b/fragdenstaat_de/templates/legal_advice_builder/klageautomat_info.html
@@ -1,48 +1,41 @@
 {% extends "base.html" %}
 {% load form_helper cms_tags i18n %}
-
 {% block body %}
-<div class="bg-body-tertiary">
-  <div class="container">
-    <div class="row justify-content-left">
-      <div class="col-md-8">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item"><a href="{% url 'account-show' %}">{% trans "My requests" %}</a></li>
-            <li class="breadcrumb-item"><a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a></li>
-            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
-          </ol>
-        </nav>
-      </div>
+    <div class="bg-body-tertiary">
+        <div class="container">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    <nav aria-label="breadcrumb">
+                        <ol class="breadcrumb">
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'account-show' %}">{% trans "My requests" %}</a>
+                            </li>
+                            <li class="breadcrumb-item">
+                                <a href="{% url 'foirequest-shortlink' foi_request.id %}">{{ foi_request.title|truncatechars:50 }}</a>
+                            </li>
+                            <li class="breadcrumb-item active" aria-current="page">Klageautomat</li>
+                        </ol>
+                    </nav>
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
-</div>
-
-<div class="bg-body-tertiary py-2">
-  <div class="container mb-5">
-    <div class="row justify-content-left">
-      <div class="col-md-8">
-
-        {% static_placeholder "klageautomat_info" %}
-
-        <div>
-          <form method="post">
-            {% csrf_token %}
-            <div class="text-bg-body border-gray shadow-gray p-3">
-            {% render_form form horizontal=False %}
+    <div class="bg-body-tertiary py-2">
+        <div class="container mb-5">
+            <div class="row justify-content-left">
+                <div class="col-md-8">
+                    {% static_placeholder "klageautomat_info" %}
+                    <div>
+                        <form method="post">
+                            {% csrf_token %}
+                            <div class="text-bg-body border-gray shadow-gray p-3">{% render_form form horizontal=False %}</div>
+                            <p class="text-center">
+                                <button type="submit" class="btn btn-primary my-5">Jetzt Untätigkeitsklage erstellen!</button>
+                            </p>
+                        </form>
+                    </div>
+                </div>
             </div>
-            <p class="text-center">
-              <button type="submit" class="btn btn-primary my-5">
-                Jetzt Untätigkeitsklage erstellen!
-              </button>
-            </p>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
-</div>
-
-
-
 {% endblock %}
diff --git a/fragdenstaat_de/templates/menu/menu.html b/fragdenstaat_de/templates/menu/menu.html
index 441017ba0..c072e08ad 100644
--- a/fragdenstaat_de/templates/menu/menu.html
+++ b/fragdenstaat_de/templates/menu/menu.html
@@ -1,15 +1,12 @@
 {% load menu_tags %}
-
 {% for child in children %}
-<li>
-  <a class="{% if child.selected or child.ancestor %} text-body fw-bold active{% endif %}"
-    href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">
-    {{ child.get_menu_title }}
-  </a>
-	{% if child.children %}
-	<ul>
-		{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
-	</ul>
-	{% endif %}
-</li>
-{% endfor %}
\ No newline at end of file
+    <li>
+        <a class="{% if child.selected or child.ancestor %} text-body fw-bold active{% endif %}"
+           href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
+        {% if child.children %}
+            <ul>
+                {% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
+            </ul>
+        {% endif %}
+    </li>
+{% endfor %}
diff --git a/fragdenstaat_de/templates/organization/includes/organization_item.html b/fragdenstaat_de/templates/organization/includes/organization_item.html
index f704e3938..164a61ccf 100644
--- a/fragdenstaat_de/templates/organization/includes/organization_item.html
+++ b/fragdenstaat_de/templates/organization/includes/organization_item.html
@@ -1,25 +1,21 @@
 {% load i18n easy_thumbnails_tags cms_tags %}
-
-<article id="organization-{{ object.slug }}" class="md:shadow-gray border-gray p-3 mx-auto h-100 d-flex flex-column">
-  <h4 class="mb-4">
-    <a href="{{ object.get_absolute_url }}">
-      {% if object.logo %}
-        <img src="{% thumbnail object.logo 300x0 %}"
-          class="partner-logo"
-          alt="{{ object.name }}"/>
-      {% else %}
-        {{ object.name }}
-      {% endif %}
-    </a>
-  </h4>
-
-  {% if object.description %}
-    <div class="organization-description">{{ object.description | truncatewords_html:TRUNCWORDS_COUNT | safe }}</div>
-  {% endif %}
-
-  <div class="mt-auto pt-3">
-    <a href="{{ object.get_absolute_url }}">
-      → {% trans "View organization" %}
-    </a>
-  </div>
+<article id="organization-{{ object.slug }}"
+         class="md:shadow-gray border-gray p-3 mx-auto h-100 d-flex flex-column">
+    <h4 class="mb-4">
+        <a href="{{ object.get_absolute_url }}">
+            {% if object.logo %}
+                <img src="{% thumbnail object.logo 300x0 %}"
+                     class="partner-logo"
+                     alt="{{ object.name }}" />
+            {% else %}
+                {{ object.name }}
+            {% endif %}
+        </a>
+    </h4>
+    {% if object.description %}
+        <div class="organization-description">{{ object.description | truncatewords_html:TRUNCWORDS_COUNT | safe }}</div>
+    {% endif %}
+    <div class="mt-auto pt-3">
+        <a href="{{ object.get_absolute_url }}">→ {% trans "View organization" %}</a>
+    </div>
 </article>
diff --git a/fragdenstaat_de/templates/organization/includes/user_card.html b/fragdenstaat_de/templates/organization/includes/user_card.html
index 6f6b8a493..417f93b7b 100644
--- a/fragdenstaat_de/templates/organization/includes/user_card.html
+++ b/fragdenstaat_de/templates/organization/includes/user_card.html
@@ -1,5 +1,4 @@
 {% load markup %}
-
 <div class="col-lg-4 my-3 d-flex col-md-6 col-12 my-md-5 col">
     <div class="box-card box-card-has-image-lg border-gray">
         <div>
@@ -8,7 +7,7 @@
                     <picture>
                         <img class="img-lg z-index-10"
                              src="{{ user.profile_photo.url }}"
-                             alt="{{ user.get_full_name }}"/>
+                             alt="{{ user.get_full_name }}" />
                     </picture>
                 </div>
             {% endif %}
diff --git a/fragdenstaat_de/templates/organization/organization_detail.html b/fragdenstaat_de/templates/organization/organization_detail.html
index c16730906..69beaf4b2 100644
--- a/fragdenstaat_de/templates/organization/organization_detail.html
+++ b/fragdenstaat_de/templates/organization/organization_detail.html
@@ -1,11 +1,10 @@
 {% extends "organization/organization_detail.html" %}
-
 {% load i18n %}
 {% block member_list %}
-  <h2 class="pt-3">{% trans "Organization Members" %}</h2>
-  <div class="mt-5 justify-content-center row shuffle-items">
-    {% for member in members %}
-      {% include "organization/includes/user_card.html" with user=member.user %}
-    {% endfor %}
-  </div>
+    <h2 class="pt-3">{% trans "Organization Members" %}</h2>
+    <div class="mt-5 justify-content-center row shuffle-items">
+        {% for member in members %}
+            {% include "organization/includes/user_card.html" with user=member.user %}
+        {% endfor %}
+    </div>
 {% endblock %}
diff --git a/fragdenstaat_de/templates/organization/organization_list.html b/fragdenstaat_de/templates/organization/organization_list.html
index af3727c41..bac7d4cb4 100644
--- a/fragdenstaat_de/templates/organization/organization_list.html
+++ b/fragdenstaat_de/templates/organization/organization_list.html
@@ -1,27 +1,22 @@
 {% extends "base.html" %}
-
 {% load i18n %}
 {% load cms_tags %}
-
 {% block title %}
-  {% trans "Organizations" %}
+    {% trans "Organizations" %}
 {% endblock title %}
-
 {% block body %}
-  <div class="bg-body-tertiary">
-    <div class="container py-4">
-      {% static_placeholder "organization_list_below_heading" %}
+    <div class="bg-body-tertiary">
+        <div class="container py-4">{% static_placeholder "organization_list_below_heading" %}</div>
     </div>
-  </div>
-  <div class="container py-4">
-    <div class="row shuffle-items gx-3 gy-3 pb-4">
-      {% for object in object_list %}
-        <div class="col-md-6 col-lg-4">
-          {% include "organization/includes/organization_item.html" with object=object TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+    <div class="container py-4">
+        <div class="row shuffle-items gx-3 gy-3 pb-4">
+            {% for object in object_list %}
+                <div class="col-md-6 col-lg-4">
+                    {% include "organization/includes/organization_item.html" with object=object TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
+                </div>
+            {% empty %}
+                <p>{% trans "No organizations found." %}</p>
+            {% endfor %}
         </div>
-      {% empty %}
-        <p>{% trans "No organizations found." %}</p>
-      {% endfor %}
     </div>
-  </div>
 {% endblock body %}
diff --git a/fragdenstaat_de/templates/problem/message_toolbar_item.html b/fragdenstaat_de/templates/problem/message_toolbar_item.html
index c68c671ca..04b61d262 100644
--- a/fragdenstaat_de/templates/problem/message_toolbar_item.html
+++ b/fragdenstaat_de/templates/problem/message_toolbar_item.html
@@ -1,7 +1,8 @@
 {% extends "problem/message_toolbar_item.html" %}
-
 {% block reportinfo %}
-<p>
-  Problemberichte werden von haupt- und ehrenamtlichen Moderator:innen bearbeitet. Antworten auf häufige Fragen finden Sie auch in <a href="/hilfe/faq/" target="_blank">unseren FAQ</a> oder <a href="https://forum.okfn.de/c/fragdenstaat" target="_blank" rel="noopener">im Forum</a>, in dem sich Nutzer:innen über Ihre Anfragen und Probleme austauschen.
-</p>
-{% endblock %}
\ No newline at end of file
+    <p>
+        Problemberichte werden von haupt- und ehrenamtlichen Moderator:innen bearbeitet. Antworten auf häufige Fragen finden Sie auch in <a href="/hilfe/faq/" target="_blank">unseren FAQ</a> oder <a href="https://forum.okfn.de/c/fragdenstaat"
+    target="_blank"
+    rel="noopener">im Forum</a>, in dem sich Nutzer:innen über Ihre Anfragen und Probleme austauschen.
+    </p>
+{% endblock %}
diff --git a/fragdenstaat_de/templates/snippets/meta.html b/fragdenstaat_de/templates/snippets/meta.html
index d91bc13fb..3f0b80cd1 100644
--- a/fragdenstaat_de/templates/snippets/meta.html
+++ b/fragdenstaat_de/templates/snippets/meta.html
@@ -1,18 +1,28 @@
 {% load i18n %}
 {% load static %}
-
 {# Translators: meta keywords #}
-<meta name="keywords" content="{% if keywords %}{{ keywords }}{% else %}{% trans 'Freedom of Information Requests, Freedom of Information Law, Public Body Information' %}{% endif %}" />
-
+<meta name="keywords"
+      content="{% if keywords %}{{ keywords }}{% else %}{% trans 'Freedom of Information Requests, Freedom of Information Law, Public Body Information' %}{% endif %}" />
 {% block additional_meta %}
-  <meta name="google-site-verification" content="upljx19ZJVGT73Sx1miWKLOWBKga4LQJ_hqFl0vhhJE" />
+    <meta name="google-site-verification"
+          content="upljx19ZJVGT73Sx1miWKLOWBKga4LQJ_hqFl0vhhJE" />
 {% endblock %}
-
-<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-touch-icon.png' %}">
-<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
-<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
+<link rel="apple-touch-icon"
+      sizes="180x180"
+      href="{% static 'img/favicon/apple-touch-icon.png' %}">
+<link rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="{% static 'img/favicon/favicon-32x32.png' %}">
+<link rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="{% static 'img/favicon/favicon-16x16.png' %}">
 <link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
-<link rel="mask-icon" href="{% static 'img/favicon/safari-pinned-tab.svg' %}" color="#0069d0">
+<link rel="mask-icon"
+      href="{% static 'img/favicon/safari-pinned-tab.svg' %}"
+      color="#0069d0">
 <link rel="shortcut icon" href="{% static 'img/favicon/favicon.ico' %}">
-<meta name="msapplication-config" content="{% static 'img/favicon/browserconfig.xml' %}">
+<meta name="msapplication-config"
+      content="{% static 'img/favicon/browserconfig.xml' %}">
 <meta name="theme-color" content="#ffffff">
diff --git a/fragdenstaat_de/templates/snippets/tracking.html b/fragdenstaat_de/templates/snippets/tracking.html
index e6b99a458..7db9c3a5b 100644
--- a/fragdenstaat_de/templates/snippets/tracking.html
+++ b/fragdenstaat_de/templates/snippets/tracking.html
@@ -1,3 +1,9 @@
 {% if not debug and not request.user.is_superuser %}
-  <noscript><p><img src="https://traffic.okfn.de/matomo.php?idsite=25&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <noscript>
+        <p>
+            <img src="https://traffic.okfn.de/matomo.php?idsite=25&amp;rec=1"
+                 style="border:0"
+                 alt="" />
+        </p>
+    </noscript>
 {% endif %}