diff --git a/src/Resources/views/storefront/layout/footer/footer.html.twig b/src/Resources/views/storefront/layout/footer/footer.html.twig
index b16a26e..cff684b 100644
--- a/src/Resources/views/storefront/layout/footer/footer.html.twig
+++ b/src/Resources/views/storefront/layout/footer/footer.html.twig
@@ -12,7 +12,7 @@
                         {% block layout_footer_navigation_hotline_headline %}
                             <div class="footer-column-headline footer-headline js-footer-column-headline js-collapse-footer-column-trigger"
                                  id="collapseFooterHotlineTitle"
-                                 data-target="#collapseFooterHotline"
+                                 {{ dataBsTargetAttr }}="#collapseFooterHotline"
                                  aria-expanded="true"
                                  aria-controls="collapseFooterHotline">
                                 {{ 'footer.serviceHotlineHeadline'|trans|sw_sanitize }}
diff --git a/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig b/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
index fbbcf22..8b326f6 100644
--- a/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
+++ b/src/Resources/views/storefront/layout/header/actions/cart-widget.html.twig
@@ -5,7 +5,7 @@
         {% sw_icon 'bag' %}
     </span>
     {% if page.cart.lineItems|length > 0 %}
-        <span class="badge badge-primary header-cart-badge">{{ page.cart.lineItems|length }}</span>
+        <span class="badge {{ bgClass }}-primary header-cart-badge">{{ page.cart.lineItems|length }}</span>
     {% endif %}
     <span class="header-cart-total">
         {{ page.cart.price.positionPrice|currency }}{{ "general.star"|trans|sw_sanitize }}
diff --git a/src/Resources/views/storefront/page/checkout/confirm/index.html.twig b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
index 990e4d9..3d7b211 100644
--- a/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
+++ b/src/Resources/views/storefront/page/checkout/confirm/index.html.twig
@@ -5,7 +5,7 @@
 
 {% block page_checkout_confirm_tos_control_label %}
     <label for="tos"
-           class="checkout-confirm-tos-label custom-control-label">
+           class="checkout-confirm-tos-label {{ formCheckLabelClass }}">
         {{ "checkout.confirmTerms"|trans({
             '%url%': path('frontend.cms.page',{ id: config('core.basicInformation.tosPage'), }),
             '%revUrl%': path('frontend.cms.page',{ id: config('core.basicInformation.revocationPage') })
diff --git a/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig b/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig
index ffb544a..7b48d01 100644
--- a/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig
+++ b/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig
@@ -28,7 +28,7 @@
           <a class="product-detail-tax-link"
              href="{{ path('frontend.cms.page',{ id: config('core.basicInformation.shippingPaymentInfoPage') }) }}"
              title="{{ taxText }}"
-             data-toggle="modal"
+             {{ dataBsToggleAttr }}="modal"
              data-url="{{ path('frontend.cms.page',{ id: config('core.basicInformation.shippingPaymentInfoPage') }) }}">
             {{ taxText }}
           </a>
diff --git a/src/Resources/views/storefront/page/product-detail/tabs.html.twig b/src/Resources/views/storefront/page/product-detail/tabs.html.twig
index 7bc61b4..7892a85 100644
--- a/src/Resources/views/storefront/page/product-detail/tabs.html.twig
+++ b/src/Resources/views/storefront/page/product-detail/tabs.html.twig
@@ -4,7 +4,7 @@
     <li class="nav-item">
         <a class="nav-link {% if (ratingSuccess != 1) and (ratingSuccess != -1) %}active{% endif %} product-detail-tab-navigation-link"
            id="description-tab"
-           data-toggle="tab"
+           {{ dataBsToggleAttr }}="tab"
            data-offcanvas-tabs="true"
            href="#description-tab-pane"
            role="tab"