diff --git a/src/Resources/views/storefront/layout/footer/footer.html.twig b/src/Resources/views/storefront/layout/footer/footer.html.twig
index 10c576f..b16a26e 100644
--- a/src/Resources/views/storefront/layout/footer/footer.html.twig
+++ b/src/Resources/views/storefront/layout/footer/footer.html.twig
@@ -1,8 +1,8 @@
 {% sw_extends '@Storefront/storefront/layout/footer/footer.html.twig' %}
+
 {% block layout_footer_inner_container %}
   <div class="inside">
     <div class="container">
-
         {% block layout_footer_navigation %}
             <div id="footerColumns"
                  class="row footer-columns"
@@ -16,208 +16,60 @@
                                  aria-expanded="true"
                                  aria-controls="collapseFooterHotline">
                                 {{ 'footer.serviceHotlineHeadline'|trans|sw_sanitize }}
-                                {% block layout_footer_navigation_hotline_icons %}
-                                    <div class="footer-column-toggle">
-                                        <span class="footer-plus-icon">
-                                            {% sw_icon 'plus' %}
-                                        </span>
-                                        <span class="footer-minus-icon">
-                                            {% sw_icon 'minus' %}
-                                        </span>
-                                    </div>
-                                {% endblock %}
-                            </div>
-                        {% endblock %}
-
-                        {% block layout_footer_navigation_hotline_content %}
-                            <div id="collapseFooterHotline"
-                                 class="footer-column-content collapse js-footer-column-content footer-contact"
-                                 aria-labelledby="collapseFooterHotlineTitle">
-                                <div class="footer-column-content-inner">
-                                    <p class="footer-contact-hotline">
-                                        {{ 'footer.serviceHotline'|trans|sw_sanitize }}
-                                    </p>
-                                </div>
-                                <div class="footer-contact-form">
-                                    {{ 'footer.serviceContactLink'|trans({
-                                        '%url%': path('frontend.cms.page', { id: config('core.basicInformation.contactPage') })
-                                    })|raw }}
-                                </div>
+                                {{ block('layout_footer_navigation_hotline_icons') }}
                             </div>
                         {% endblock %}
+                        {{ block('layout_footer_navigation_hotline_content') }}
                     </div>
                 {% endblock %}
-
                 {% block layout_footer_navigation_logo %}
-                  <div class="col-md-6 footer-column js-footer-column footer-column-logo">
-                    <div class="footer-column-logo-content">
-                      <img src="{{ asset('bundles/wgsh/logo_wgs.png', 'asset') }}" alt="WG Schriesheim Logo">
+                    <div class="col-md-6 footer-column js-footer-column footer-column-logo">
+                        <div class="footer-column-logo-content">
+                            <img src="{{ asset('bundles/wgsh/logo_wgs.png', 'asset') }}" alt="WG Schriesheim Logo">
+                        </div>
                     </div>
-                  </div>
-                {% endblock %}
-
-                {% block layout_footer_navigation_columns %}
-                    {% for root in page.footer.navigation.tree %}
-                        {% block layout_footer_navigation_column %}
-                            <div class="col-md-3 footer-column js-footer-column">
-                                {% block layout_footer_navigation_information_headline %}
-                                    <div class="footer-column-headline footer-headline">
-
-                                        {% if root.category.type == 'folder' %}
-                                            {{ root.category.translated.name }}
-                                        {% else %}
-                                            <a href="{{ category_url(root.category) }}"
-                                               {% if category_linknewtab(root.category) %}target="_blank"{% endif %}
-                                               title="{{ root.category.translated.name }}">
-                                                {{ root.category.translated.name }}
-                                            </a>
-                                        {% endif %}
-                                    </div>
-                                {% endblock %}
-
-                                {% block layout_footer_navigation_information_content %}
-                                    <div id="collapseFooter{{ loop.index }}"
-                                         class="footer-column-content">
-                                        <div class="footer-column-content-inner">
-                                            {% block layout_footer_navigation_information_links %}
-                                                <ul class="list-unstyled">
-                                                    {% for treeItem in root.children %}
-                                                        {% set category = treeItem.category %}
-                                                        {% set name = category.translated.name %}
-
-                                                        {# @deprecated tag:v6.5.0 - Use "category.translated.externalLink" directly or category_url function instead. #}
-                                                        {% set externalLink = category.translated.externalLink %}
-
-                                                        {% block layout_footer_navigation_information_link_item %}
-                                                            <li class="footer-link-item">
-                                                                {% block layout_footer_navigation_information_link %}
-                                                                    {% if category.type == 'folder' %}
-                                                                        <div>{{ name }}</div>
-                                                                    {% else %}
-                                                                        <a class="footer-link"
-                                                                           href="{{ category_url(category) }}"
-                                                                           {% if category_linknewtab(category) %}target="_blank"{% endif %}
-                                                                           title="{{ name }}">
-                                                                            {{ name }}
-                                                                        </a>
-                                                                    {% endif %}
-                                                                {% endblock %}
-                                                            </li>
-                                                        {% endblock %}
-                                                    {% endfor %}
-                                                </ul>
-                                            {% endblock %}
-                                        </div>
-                                    </div>
-                                {% endblock %}
-                            </div>
-                        {% endblock %}
-                    {% endfor %}
                 {% endblock %}
+                {{ block('layout_footer_navigation_columns') }}
             </div>
         {% endblock %}
-
     </div>
   </div>
-
     {% block layout_footer_bottom %}
         <div class="footer-bottom">
-        {% block layout_footer_payment_shipping_logos %}
-            <div class="footer-payment-label"><span>{{ 'footer.weAcceptPaymentMethods'|trans|sw_sanitize }}</span></div>
-            <div class="footer-logos">
-                {% block layout_footer_payment_logos %}
-                    {% for paymentMethod in page.salesChannelPaymentMethods %}
-                        {% block layout_footer_payment_logo %}
-                            {% if paymentMethod.media %}
-                                <div class="footer-logo is-payment">
-                                    {% sw_thumbnails 'footer-payment-image-thumbnails' with {
-                                        media: paymentMethod.media,
-                                        sizes: {
-                                            'default': '100px'
-                                        },
-                                        attributes: {
-                                            'class': 'img-fluid footer-logo-image',
-                                            'alt': (paymentMethod.media.translated.alt ?: paymentMethod.translated.name),
-                                            'title': (paymentMethod.media.translated.title ?: paymentMethod.translated.name)
-                                        }
-                                    } %}
-                                </div>
-                            {% endif %}
-                        {% endblock %}
-                    {% endfor %}
-                {% endblock %}
-
-                {% block layout_footer_shipping_logos %}
-                    {% for shippingMethod in page.salesChannelShippingMethods %}
-                        {% block layout_footer_shipping_logo %}
-                            {% if shippingMethod.media %}
-                                <div class="footer-logo is-shipping">
-                                    {% sw_thumbnails 'footer-shipping-image-thumbnails' with {
-                                        media: shippingMethod.media,
-                                        sizes: {
-                                            'default': '100px'
-                                        },
-                                        attributes: {
-                                            'class': 'img-fluid footer-logo-image',
-                                            'alt': (shippingMethod.media.translated.alt ?: shippingMethod.translated.name),
-                                            'title': (shippingMethod.media.translated.title ?: shippingMethod.translated.name)
-                                        }
-                                    } %}
-                                </div>
-                            {% endif %}
-                        {% endblock %}
-                    {% endfor %}
-                {% endblock %}
-            </div>
-        {% endblock %}
-
-            {% block layout_footer_service_menu %}
-                <div class="container">
-                    {% block layout_footer_service_menu_content %}
-                        {% apply spaceless %}
-                            <ul class="footer-service-menu-list list-unstyled">
-                                {% for serviceMenuItem in page.header.serviceMenu %}
-                                    {% block layout_footer_service_menu_item %}
-                                        <li class="footer-service-menu-item">
-                                            <a class="footer-service-menu-link"
-                                               href="{{ category_url(serviceMenuItem) }}"
-                                               {% if category_linknewtab(serviceMenuItem) %}target="_blank"{% endif %}
-                                               title="{{ serviceMenuItem.translated.name }}">
-                                                {{ serviceMenuItem.translated.name }}
-                                            </a>
-                                        </li>
-                                    {% endblock %}
-                                {% endfor %}
-                            </ul>
-                        {% endapply %}
-                    {% endblock %}
-                </div>
+            {% block layout_footer_payment_shipping_logos %}
+                <div class="footer-payment-label"><span>{{ 'footer.weAcceptPaymentMethods'|trans|sw_sanitize }}</span></div>
+                {{ parent() }}
             {% endblock %}
 
-            {% block layout_footer_vat %}
-                <div class="footer-vat">
-                    {% if context.taxState == "gross" %}
-                        <p>
-                            {{ "footer.includeVat"|trans({
-                                '%url%': path('frontend.cms.page',{ id: config('core.basicInformation.shippingPaymentInfoPage') })
-                            })|raw }}
-                        </p>
-                    {% else %}
-                        <p>
-                            {{ "footer.excludeVat"|trans({
-                                '%url%': path('frontend.cms.page',{ id: config('core.basicInformation.shippingPaymentInfoPage') })
-                            })|raw }}
-                        </p>
-                    {% endif %}
-                </div>
-            {% endblock %}
-
-            {% block layout_footer_copyright %}
-                {#<div class="footer-copyright">
-                    {% sw_icon 'shopware' style {'size':'xs'} %}
-                    {{ "footer.copyrightInfo"|trans|sw_sanitize }}
-                </div>#}
-            {% endblock %}
+            {{ block('layout_footer_service_menu') }}
+            {{ block('layout_footer_vat') }}
         </div>
     {% endblock %}
 {% endblock %}
+
+
+{% block layout_footer_navigation_column %}
+    <div class="col-md-3 footer-column js-footer-column">
+        {% block layout_footer_navigation_information_headline %}
+            <div class="footer-column-headline footer-headline">
+                {% if root.category.type == 'folder' %}
+                    {{ root.category.translated.name }}
+                {% else %}
+                    <a href="{{ category_url(root.category) }}"
+                       {% if category_linknewtab(root.category) %}target="_blank"{% endif %}
+                       title="{{ root.category.translated.name }}">
+                        {{ root.category.translated.name }}
+                    </a>
+                {% endif %}
+            </div>
+        {% endblock %}
+        {% block layout_footer_navigation_information_content %}
+            <div id="collapseFooter{{ loop.index }}"
+                 class="footer-column-content">
+                <div class="footer-column-content-inner">
+                    {{ block('layout_footer_navigation_information_links') }}
+                </div>
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}