From 162c69f065581ef3c20185fd8832906fc96b2a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 00:42:15 +0200
Subject: [PATCH 01/17] Initial changes for bs5 migration

---
 _dev/css/abstracts/_index.scss                            | 8 +++++---
 _dev/css/abstracts/maps/_index.scss                       | 0
 _dev/css/abstracts/variables/bootstrap/_options.scss      | 1 +
 .../_partials/miniatures/_partials/product-form.tpl       | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 _dev/css/abstracts/maps/_index.scss

diff --git a/_dev/css/abstracts/_index.scss b/_dev/css/abstracts/_index.scss
index d6f7cbff..a3ef10de 100644
--- a/_dev/css/abstracts/_index.scss
+++ b/_dev/css/abstracts/_index.scss
@@ -1,10 +1,12 @@
 @import "~bootstrap/scss/functions";
 
-@import "functions/index";
-@import "variables/index";
-@import "mixins/index";
+@import "functions";
+@import "variables";
+@import "mixins";
 
 @import "~bootstrap/scss/variables";
 @import "~bootstrap/scss/variables-dark";
 @import "~bootstrap/scss/maps";
 @import "~bootstrap/scss/mixins";
+
+@import "maps";
diff --git a/_dev/css/abstracts/maps/_index.scss b/_dev/css/abstracts/maps/_index.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/_dev/css/abstracts/variables/bootstrap/_options.scss b/_dev/css/abstracts/variables/bootstrap/_options.scss
index 4505a53a..a906f183 100644
--- a/_dev/css/abstracts/variables/bootstrap/_options.scss
+++ b/_dev/css/abstracts/variables/bootstrap/_options.scss
@@ -1 +1,2 @@
 $enable-responsive-font-sizes: true;
+$enable-dark-mode: false;
diff --git a/templates/catalog/_partials/miniatures/_partials/product-form.tpl b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
index 717cb5b1..0eb86256 100644
--- a/templates/catalog/_partials/miniatures/_partials/product-form.tpl
+++ b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
@@ -1,6 +1,8 @@
 <div class="product-miniature__actions">
     {if $product.add_to_cart_url && ($product.quantity > 0 || $product.allow_oosp) && !$configuration.is_catalog}
-        <form class="product-miniature__form" action="{$product.add_to_cart_url}" method="post">
+        <form class="product-miniature__form d-grid"
+              action="{$product.add_to_cart_url}"
+              method="post">
           <input type="hidden" name="id_product" value="{$product.id}">
           <input
             type="hidden"

From 3c5af931bd0e64ed255804f85c741970ee697631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 01:24:35 +0200
Subject: [PATCH 02/17] Migration to new bs5 utils classes

---
 .../views/templates/widget/contactform.tpl           |  2 +-
 .../views/templates/hook/empty-product-comment.tpl   |  2 +-
 .../views/templates/hook/post-comment-modal.tpl      |  2 +-
 .../views/templates/hook/product-additional-info.tpl |  2 +-
 .../hook/product-comment-item-prototype.tpl          | 12 ++++++------
 .../views/templates/hook/product-comments-list.tpl   | 10 +++++-----
 .../templates/front/mailalerts-account-line.tpl      |  2 +-
 .../templates/hook/ps_emailsubscription-column.tpl   |  2 +-
 .../views/templates/front/catalog/active-filters.tpl |  2 +-
 .../views/templates/front/catalog/facets.tpl         |  4 ++--
 .../views/templates/hook/hookDisplayFooter.tpl       |  2 +-
 templates/_partials/form-fields.tpl                  |  2 +-
 templates/_partials/password-policy-template.tpl     |  4 ++--
 .../miniatures/_partials/product-prices.tpl          |  4 ++--
 .../catalog/_partials/miniatures/pack-product.tpl    |  2 +-
 templates/catalog/_partials/product-add-to-cart.tpl  |  2 +-
 .../catalog/_partials/product-customization.tpl      |  6 +++---
 templates/catalog/_partials/product-details.tpl      |  6 +++---
 templates/catalog/_partials/product-prices.tpl       |  2 +-
 templates/catalog/_partials/products-top.tpl         |  4 ++--
 templates/catalog/_partials/products.tpl             |  2 +-
 templates/checkout/_partials/address-form.tpl        |  4 ++--
 .../checkout/_partials/address-selector-block.tpl    |  4 ++--
 .../_partials/cart-detailed-product-line.tpl         |  4 ++--
 templates/checkout/_partials/cart-voucher.tpl        |  2 +-
 templates/checkout/_partials/customer-form.tpl       |  2 +-
 templates/checkout/_partials/header.tpl              |  2 +-
 templates/checkout/_partials/login-form.tpl          |  2 +-
 templates/checkout/_partials/steps/addresses.tpl     |  2 +-
 templates/checkout/_partials/steps/checkout-step.tpl |  4 ++--
 .../_partials/steps/personal-information.tpl         |  2 +-
 templates/checkout/_partials/steps/shipping.tpl      |  4 ++--
 templates/checkout/cart.tpl                          |  2 +-
 templates/checkout/order-confirmation.tpl            |  2 +-
 templates/cms/stores.tpl                             |  6 +++---
 templates/components/featured-products.tpl           |  4 ++--
 templates/customer/_partials/block-address.tpl       |  4 ++--
 .../customer/_partials/order-detail-no-return.tpl    |  2 +-
 templates/customer/_partials/order-detail-return.tpl |  2 +-
 templates/customer/discount.tpl                      |  2 +-
 templates/customer/history.tpl                       |  2 +-
 templates/customer/order-detail.tpl                  |  2 +-
 templates/customer/order-follow.tpl                  |  2 +-
 templates/customer/order-slip.tpl                    |  4 ++--
 templates/customer/page.tpl                          |  2 +-
 45 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index b1ed2dd5..702a5809 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -113,7 +113,7 @@
 
         </section>
 
-        <footer class="form-footer text-right">
+        <footer class="form-footer text-end">
           <style>
             input[name=url] {
               display: none !important;
diff --git a/modules/productcomments/views/templates/hook/empty-product-comment.tpl b/modules/productcomments/views/templates/hook/empty-product-comment.tpl
index 7f0e5a20..9c262c1a 100644
--- a/modules/productcomments/views/templates/hook/empty-product-comment.tpl
+++ b/modules/productcomments/views/templates/hook/empty-product-comment.tpl
@@ -27,7 +27,7 @@
   {if $post_allowed}
     <div class="text-center">
       <button class="btn btn-primary js-post-product-comment">
-        <i class="material-icons btn-icon mr-1">edit</i>
+        <i class="material-icons btn-icon me-1">edit</i>
         {l s='Be the first to write your review' d='Modules.Productcomments.Shop'}
       </button>
     </div>
diff --git a/modules/productcomments/views/templates/hook/post-comment-modal.tpl b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
index 46ba9385..7811cc5a 100644
--- a/modules/productcomments/views/templates/hook/post-comment-modal.tpl
+++ b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
@@ -43,7 +43,7 @@
               {foreach from=$criterions item='criterion'}
                 <li>
                   <div class="criterion-rating d-flex">
-                    <label class="mb-0 mr-1">{$criterion.name|escape:'html':'UTF-8'}:</label>
+                    <label class="mb-0 me-1">{$criterion.name|escape:'html':'UTF-8'}:</label>
                     <div
                       class="grade-stars"
                       data-grade="3"
diff --git a/modules/productcomments/views/templates/hook/product-additional-info.tpl b/modules/productcomments/views/templates/hook/product-additional-info.tpl
index 67273a45..b9c62837 100644
--- a/modules/productcomments/views/templates/hook/product-additional-info.tpl
+++ b/modules/productcomments/views/templates/hook/product-additional-info.tpl
@@ -36,7 +36,7 @@
       {include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade}
       <div class="additional-links">
         {if $post_allowed}
-          <a class="btn btn-text js-post-product-comment ml-2" href="#product-comments-list-header">
+          <a class="btn btn-text js-post-product-comment ms-2" href="#product-comments-list-header">
             <i class="material-icons btn-icon">edit</i>
             {l s='Write your review' d='Modules.Productcomments.Shop'}
           </a>
diff --git a/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl b/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
index 5b9d76fa..3104ebfb 100644
--- a/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
+++ b/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
@@ -28,10 +28,10 @@
     <div class="font-weight-bold">
       @CUSTOMER_NAME@
     </div>
-    {* <div class="text-muted font-sm ml-2">
+    {* <div class="text-muted font-sm ms-2">
       @COMMENT_DATE@
     </div> *}
-    <div class="grade-stars flex-shrink-0 flex-grow-0 ml-auto"></div>
+    <div class="grade-stars flex-shrink-0 flex-grow-0 ms-auto"></div>
   </div>
 
   <div class="comment-content">
@@ -39,19 +39,19 @@
     <p class="font-sm">@COMMENT_COMMENT@</p>
     <div class="d-flex">
       {if $usefulness_enabled}
-        <div class="mr-2">
+        <div class="me-2">
           <a href="#" role="button" class="btn btn-text btn-sm d-inline-flex align-items-center font-lg js-useful-review">
             <i class="material-icons text-reset font-reset thumb_up"></i>
-            <span class="js-useful-review-value font-sm ml-1">@COMMENT_USEFUL_ADVICES@</span>
+            <span class="js-useful-review-value font-sm ms-1">@COMMENT_USEFUL_ADVICES@</span>
           </a>
           <a href="#" role="button" class="btn btn-text btn-sm d-inline-flex align-items-center font-lg js-not-useful-review">
             <i class="material-icons text-reset font-reset thumb_down"></i>
-            <span class="js-not-useful-review-value font-sm ml-1">@COMMENT_NOT_USEFUL_ADVICES@</span>
+            <span class="js-not-useful-review-value font-sm ms-1">@COMMENT_NOT_USEFUL_ADVICES@</span>
           </a>
         </div>
       {/if}
 
-      <div class="ml-auto">
+      <div class="ms-auto">
         <a href="#" role="button" class="btn btn-text btn-sm d-inline-flex align-items-center font-lg js-report-abuse" title="{l s='Report abuse' d='Modules.Productcomments.Shop'}">
           <i class="material-icons text-reset font-reset outlined_flag"></i>
         </a>
diff --git a/modules/productcomments/views/templates/hook/product-comments-list.tpl b/modules/productcomments/views/templates/hook/product-comments-list.tpl
index 6c3376f9..85973566 100644
--- a/modules/productcomments/views/templates/hook/product-comments-list.tpl
+++ b/modules/productcomments/views/templates/hook/product-comments-list.tpl
@@ -29,11 +29,11 @@
 
 <div class="mb-4">
   <div class="d-flex my-4" id="product-comments-list-header">
-    <div class="comments-nb h3 d-flex align-items-center mr-3 mb-0">
-      <i class="material-icons mr-2">chat</i>
+    <div class="comments-nb h3 d-flex align-items-center me-3 mb-0">
+      <i class="material-icons me-2">chat</i>
       {l s='Comments' d='Modules.Productcomments.Shop'} ({$nb_comments})
     </div>
-    <div class="ml-auto">
+    <div class="ms-auto">
       {include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade}
     </div>
   </div>
@@ -51,11 +51,11 @@
   </div>
 
   <div class="flex-column flex-sm-row d-flex align-items-center" id="product-comments-list-footer">
-    <div id="product-comments-list-pagination" class="comments-pagination ml-sm-auto order-sm-1"></div>
+    <div id="product-comments-list-pagination" class="comments-pagination ms-sm-auto order-sm-1"></div>
     {if $post_allowed && $nb_comments != 0}
       <div class="my-sm-2 mt-3">
         <button class="btn btn-primary js-post-product-comment">
-          <i class="material-icons btn-icon mr-1">edit</i>
+          <i class="material-icons btn-icon me-1">edit</i>
           {l s='Write your review' d='Modules.Productcomments.Shop'}
         </button>
       </div>
diff --git a/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl b/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl
index e3cc9b32..c142763c 100644
--- a/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl
+++ b/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl
@@ -24,7 +24,7 @@
 *}
 
 <div class="card overflow-hidden">
-  <div class="row no-gutters flex-nowrap align-items-center">
+  <div class="row g-0 flex-nowrap align-items-center">
     <div class="col-auto">
       <a href="{$mailAlert.link}">
         <img src="{$mailAlert.cover_url}" alt=""/>
diff --git a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
index 7a4dd7fb..e39ae98e 100644
--- a/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
+++ b/modules/ps_emailsubscription/views/templates/hook/ps_emailsubscription-column.tpl
@@ -29,7 +29,7 @@
       <p id="block-newsletter-label" class="col-12">{l s='Get our latest news and special sales' d='Shop.Theme.Global'}</p>
       <div class="col-12 mb-1">
         <input
-          class="btn btn-primary float-right"
+          class="btn btn-primary float-end"
           name="submitNewsletter"
           type="submit"
           value="{l s='OK' d='Shop.Theme.Actions'}"
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/active-filters.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/active-filters.tpl
index 39bb79ce..0db6b871 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/active-filters.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/active-filters.tpl
@@ -36,7 +36,7 @@
             {block name='active_filters_item'}
               <li class="col flex-grow-0 flex-shrink-0 p-1">
                 <a class="text-nowrap btn btn-outline-secondary btn-sm js-search-link d-flex align-items-center" href="{$filter.nextEncodedFacetsURL}" rel="nofollow">
-                  {l s='%1$s:' d='Shop.Theme.Catalog' sprintf=[$filter.facetLabel]} {$filter.label} <i class="material-icons font-reset ml-1 align-middle">&#xE14C;</i>
+                  {l s='%1$s:' d='Shop.Theme.Catalog' sprintf=[$filter.facetLabel]} {$filter.label} <i class="material-icons font-reset ms-1 align-middle">&#xE14C;</i>
                 </a>
               </li>
             {/block}
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index 59953320..fcdba1f0 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -37,7 +37,7 @@
             <div class="clear-all-wrapper card-body">
               <button data-search-url="{$clear_all_link}"
                 class="btn btn-sm btn-block btn-outline-secondary btn-sm js-search-filters-clear-all">
-                <i class="material-icons font-reset mr-1 align-middle">&#xE14C;</i>
+                <i class="material-icons font-reset me-1 align-middle">&#xE14C;</i>
                 {l s='Clear all' d='Shop.Theme.Actions'}
               </button>
             </div>
@@ -143,7 +143,7 @@
                               data-action="range-from"
                               >
                           </div>
-                          <div class="px-2 ml-auto search-filters__input-group">
+                          <div class="px-2 ms-auto search-filters__input-group">
                             <input
                               class="js-input-range-slider form-control form-control-sm text-center search-filters__input"
                               type="text"
diff --git a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
index e32a2897..80a08f1c 100644
--- a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
+++ b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
@@ -27,7 +27,7 @@
   <h3 class="hidden-sm-down">{l s='Information' d='Modules.Legalcompliance.Shop'}</h3>
   <div class="title clearfix hidden-md-up" data-target="#footer_eu_about_us_list" data-toggle="collapse">
     <span class="h3">{l s='Information' d='Modules.Legalcompliance.Shop'}</span>
-    <span class="float-right">
+    <span class="float-end">
       <span class="navbar-toggler collapse-icons">
         <i class="add">add</i>
         <i class="remove">remove</i>
diff --git a/templates/_partials/form-fields.tpl b/templates/_partials/form-fields.tpl
index 3840bd38..ced77e53 100644
--- a/templates/_partials/form-fields.tpl
+++ b/templates/_partials/form-fields.tpl
@@ -48,7 +48,7 @@
   <div class="form-group js-input-column">
     {if $field.type == 'checkbox' || $field.type == 'radio-buttons'}
       {if $field.type == 'radio-buttons'}
-        <div class="form-label label mr-3">{$field.label}</div>
+        <div class="form-label label me-3">{$field.label}</div>
       {/if}
     {else}
       <label class="form-label {if $field.required}required{/if}" for="f-{$field.name}_{$uniqId}">
diff --git a/templates/_partials/password-policy-template.tpl b/templates/_partials/password-policy-template.tpl
index 03a00585..8ca1844b 100644
--- a/templates/_partials/password-policy-template.tpl
+++ b/templates/_partials/password-policy-template.tpl
@@ -17,11 +17,11 @@
     <div class="js-password-strength-text password-strength-text"></div>
     <div class="password-requirements">
       <p class="js-password-requirements-length password-requirements-length font-sm d-flex align-items-center my-2" data-translation="{l s='Enter a password between %s and %s characters' d='Shop.Theme.Customeraccount'}">
-        <i class="material-icons mr-1 font-size-lg">check_circle</i>
+        <i class="material-icons me-1 font-size-lg">check_circle</i>
         <span></span>
       </p>
       <p class="js-password-requirements-score password-requirements-score font-sm d-flex align-items-center my-2" data-translation="{l s='The minimum score must be: %s' d='Shop.Theme.Customeraccount'}">
-        <i class="material-icons mr-1 font-size-lg">check_circle</i>
+        <i class="material-icons me-1 font-size-lg">check_circle</i>
         <span></span>
       </p>
     </div>
diff --git a/templates/catalog/_partials/miniatures/_partials/product-prices.tpl b/templates/catalog/_partials/miniatures/_partials/product-prices.tpl
index 01ea9df5..5018d470 100644
--- a/templates/catalog/_partials/miniatures/_partials/product-prices.tpl
+++ b/templates/catalog/_partials/miniatures/_partials/product-prices.tpl
@@ -1,9 +1,9 @@
 {block name='product_price_and_shipping'}
   {if $product.show_price}
-    <div class="product-miniature__pricing text-right">
+    <div class="product-miniature__pricing text-end">
       {if $product.has_discount}
         {hook h='displayProductPriceBlock' product=$product type="old_price"}
-        <span class="price price--regular mr-1" aria-label="{l s='Regular price' d='Shop.Theme.Catalog'}">{$product.regular_price}</span>
+        <span class="price price--regular me-1" aria-label="{l s='Regular price' d='Shop.Theme.Catalog'}">{$product.regular_price}</span>
       {/if}
 
       {hook h='displayProductPriceBlock' product=$product type="before_price"}
diff --git a/templates/catalog/_partials/miniatures/pack-product.tpl b/templates/catalog/_partials/miniatures/pack-product.tpl
index ca8dfbdf..8c2e7b7a 100644
--- a/templates/catalog/_partials/miniatures/pack-product.tpl
+++ b/templates/catalog/_partials/miniatures/pack-product.tpl
@@ -24,7 +24,7 @@
  *}
 {block name='pack_miniature_item'}
   <div class="card overflow-hidden">
-    <div class="row no-gutters flex-nowrap">
+    <div class="row g-0 flex-nowrap">
       <div class="col-4 col-md-3 col-xl-2">
         <a href="{$product.url}" title="{$product.name}">
           {images_block webpEnabled=$webpEnabled}
diff --git a/templates/catalog/_partials/product-add-to-cart.tpl b/templates/catalog/_partials/product-add-to-cart.tpl
index acadc8b8..e332cee0 100644
--- a/templates/catalog/_partials/product-add-to-cart.tpl
+++ b/templates/catalog/_partials/product-add-to-cart.tpl
@@ -28,7 +28,7 @@
     {block name='product_quantity'}
       <div class="product-quantity row mb-1 mx-n1 mt-n2 align-items-center">
         <div class="qty col-12 col-sm-auto mx-auto mt-2 px-1">
-          <div class="js-product-qty-spinner row no-gutters">
+          <div class="js-product-qty-spinner row g-0">
             <div class="col-auto">
               <a href="#" class="js-custom-qty-btn-down">
                 -
diff --git a/templates/catalog/_partials/product-customization.tpl b/templates/catalog/_partials/product-customization.tpl
index 9ad4f7dc..64a7d4f3 100644
--- a/templates/catalog/_partials/product-customization.tpl
+++ b/templates/catalog/_partials/product-customization.tpl
@@ -40,7 +40,7 @@
                   <label class="customization-label">{$field.label}</label>
                   {if $field.type == 'text'}
                     <textarea placeholder="{l s='Your message here' d='Shop.Forms.Help'}" class="product-message" maxlength="250" {if $field.required} required {/if} name="{$field.input_name}"></textarea>
-                    <small class="float-right">{l s='250 char. max' d='Shop.Forms.Help'}</small>
+                    <small class="float-end">{l s='250 char. max' d='Shop.Forms.Help'}</small>
                     {if $field.text !== ''}
                         <h6 class="customization-message">{l s='Your customization:' d='Shop.Theme.Catalog'}
                             <label>{$field.text}</label>
@@ -58,13 +58,13 @@
                       <button class="btn btn-primary">{l s='Choose file' d='Shop.Theme.Actions'}</button>
                     </span>
                     {assign var=authExtensions value=' .'|implode:constant('ImageManager::EXTENSIONS_SUPPORTED')}
-                    <small class="float-xs-right">.{$authExtensions}</small>
+                    <small class="float-end">.{$authExtensions}</small>
                   {/if}
                 </li>
               {/foreach}
             </ul>
             <div class="clearfix">
-              <button class="btn btn-primary float-right" type="submit" name="submitCustomizedData">{l s='Save Customization' d='Shop.Theme.Actions'}</button>
+              <button class="btn btn-primary float-end" type="submit" name="submitCustomizedData">{l s='Save Customization' d='Shop.Theme.Actions'}</button>
             </div>
           </form>
         {/block}
diff --git a/templates/catalog/_partials/product-details.tpl b/templates/catalog/_partials/product-details.tpl
index c01ddfff..34632513 100644
--- a/templates/catalog/_partials/product-details.tpl
+++ b/templates/catalog/_partials/product-details.tpl
@@ -56,9 +56,9 @@
     {if $product.grouped_features}
       <section class="product-features my-3">
         <p class="h6">{l s='Data sheet' d='Shop.Theme.Catalog'}</p>
-        <dl class="row no-gutters mb-0">
+        <dl class="row g-0 mb-0">
           {foreach from=$product.grouped_features item=feature}
-            <dt class="col-4 pr-3 {if !$feature@last}pb-2 mb-2 border-bottom{/if}">{$feature.name}</dt>
+            <dt class="col-4 pe-3 {if !$feature@last}pb-2 mb-2 border-bottom{/if}">{$feature.name}</dt>
             <dd class="col-8 {if !$feature@last}pb-2 mb-2 border-bottom{/if}">{$feature.value|escape:'htmlall'|nl2br nofilter}</dd>
           {/foreach}
         </dl>
@@ -73,7 +73,7 @@
         <p class="h6">{l s='Specific References' d='Shop.Theme.Catalog'}</p>
           <dl class="row">
             {foreach from=$product.specific_references item=reference key=key}
-              <dt class="col-4 pr-3 {if !$reference@last}pb-2 mb-2 border-bottom{/if}">{$key}</dt>
+              <dt class="col-4 pe-3 {if !$reference@last}pb-2 mb-2 border-bottom{/if}">{$key}</dt>
               <dd class="col-8 {if !$reference@last}pb-2 mb-2 border-bottom{/if}">{$reference}</dd>
             {/foreach}
           </dl>
diff --git a/templates/catalog/_partials/product-prices.tpl b/templates/catalog/_partials/product-prices.tpl
index fd88a992..dc90b9cf 100644
--- a/templates/catalog/_partials/product-prices.tpl
+++ b/templates/catalog/_partials/product-prices.tpl
@@ -48,7 +48,7 @@
           </span>
           {block name='product_discount'}
             {if $product.has_discount}
-              <span class="ml-2 price price--regular">{$product.regular_price}</span>
+              <span class="ms-2 price price--regular">{$product.regular_price}</span>
             {/if}
           {/block}
           {hook h='displayProductPriceBlock' product=$product type="old_price"}
diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
index f45b6a75..e3b29359 100644
--- a/templates/catalog/_partials/products-top.tpl
+++ b/templates/catalog/_partials/products-top.tpl
@@ -35,7 +35,7 @@
     {/block}
   </div>
 
-  <div class="col-sm-auto col-12 mt-2 d-md-none ml-auto">
+  <div class="col-sm-auto col-12 mt-2 d-md-none ms-auto">
     {if !empty($listing.rendered_facets)}
       <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
         {l s='Filter' d='Shop.Theme.Actions'}
@@ -46,7 +46,7 @@
     {/if}
   </div>
 
-  <div class="col-auto d-none d-lg-block ml-auto mt-2">
+  <div class="col-auto d-none d-lg-block ms-auto mt-2">
     <ul class="display-toggle d-flex align-items-center mx-n1 m-0">
       <li class="display-toggle__elem px-1">
         <a href="#" data-toggle-listing data-display-type="grid" class="display-toggle__link d-inline-block {if $listingDisplayType == 'grid'}active{/if}">
diff --git a/templates/catalog/_partials/products.tpl b/templates/catalog/_partials/products.tpl
index 19e13aa9..eae7fc60 100644
--- a/templates/catalog/_partials/products.tpl
+++ b/templates/catalog/_partials/products.tpl
@@ -30,7 +30,7 @@
     {include file='_partials/pagination.tpl' pagination=$listing.pagination}
   {/block}
 
-  <div class="hidden-md-up text-xs-right up">
+  <div class="hidden-md-up text-end up">
     <a href="#header" class="btn btn-secondary">
       {l s='Back to top' d='Shop.Theme.Actions'}
     </a>
diff --git a/templates/checkout/_partials/address-form.tpl b/templates/checkout/_partials/address-form.tpl
index 102b16b0..68c162bf 100644
--- a/templates/checkout/_partials/address-form.tpl
+++ b/templates/checkout/_partials/address-form.tpl
@@ -31,14 +31,14 @@
 {block name='form_buttons'}
   {if !$form_has_continue_button}
     <div class="d-flex align-items-center justify-content-end">
-      <a class="js-cancel-address cancel-address btn btn-link mr-auto" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
+      <a class="js-cancel-address cancel-address btn btn-link me-auto" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
       <button type="submit" class="btn btn-primary">{l s='Save' d='Shop.Theme.Actions'}</button>
     </div>
 
   {else}
     <div class="d-flex align-items-center justify-content-end">
       {if $customer.addresses|count > 0}
-        <a class="js-cancel-address cancel-address btn btn-link mr-auto" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
+        <a class="js-cancel-address cancel-address btn btn-link me-auto" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
       {/if}
       <button type="submit" class="continue btn btn-primary" name="confirm-addresses" value="1">
           {l s='Continue' d='Shop.Theme.Actions'}
diff --git a/templates/checkout/_partials/address-selector-block.tpl b/templates/checkout/_partials/address-selector-block.tpl
index b7a3d223..0cb8b5dc 100644
--- a/templates/checkout/_partials/address-selector-block.tpl
+++ b/templates/checkout/_partials/address-selector-block.tpl
@@ -41,11 +41,11 @@
 
             <a class="edit-address js-edit-address d-flex justify-content-center align-items-center" data-link-action="edit-address"
               href="{url entity='order' params=['id_address' => $address.id, 'editAddress' => $type, 'token' => $token]}">
-              <i class="material-icons mr-1">&#xE254;</i>{l s='Edit' d='Shop.Theme.Actions'}
+              <i class="material-icons me-1">&#xE254;</i>{l s='Edit' d='Shop.Theme.Actions'}
             </a>
             <a class="delete-address js-delete-address d-flex justify-content-center align-items-center" data-link-action="delete-address"
               href="{url entity='order' params=['id_address' => $address.id, 'deleteAddress' => true, 'token' => $token]}">
-              <i class="material-icons mr-1">&#xE872;</i>{l s='Delete' d='Shop.Theme.Actions'}
+              <i class="material-icons me-1">&#xE872;</i>{l s='Delete' d='Shop.Theme.Actions'}
             </a>
           </div>
 
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 6248130e..1f2bcea6 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -55,7 +55,7 @@
       <div class="product-line-info product-price{if $product.has_discount} has-discount{/if}">
         <div class="current-price">
           {if $product.has_discount}
-            <span class="price price--regular mr-1">{$product.regular_price}</span>
+            <span class="price price--regular me-1">{$product.regular_price}</span>
           {/if}
           <span
             class="current-price-display price{if $product.has_discount} current-price-discount{/if}">{$product.price}</span>
@@ -117,7 +117,7 @@
       {if !empty($product.is_gift)}
         <span class="gift-quantity">{$product.quantity}</span>
       {else}
-          <div class="js-custom-cart-qty-spinner row no-gutters">
+          <div class="js-custom-cart-qty-spinner row g-0">
               <div class="col-auto">
                   <a href="#" class="js-custom-qty-btn-down">
                       -
diff --git a/templates/checkout/_partials/cart-voucher.tpl b/templates/checkout/_partials/cart-voucher.tpl
index 9deea9f6..a9188593 100644
--- a/templates/checkout/_partials/cart-voucher.tpl
+++ b/templates/checkout/_partials/cart-voucher.tpl
@@ -39,7 +39,7 @@
                             href="{$voucher.delete_url}"
                             data-link-action="remove-voucher"
                             data-id-discount="{$voucher.id_cart_rule}"
-                            class="text-danger ml-1 js-voucher-delete">
+                            class="text-danger ms-1 js-voucher-delete">
                           <span class="material-icons font-reset btn-icon">delete</span>
                         </a>
                       {/if}
diff --git a/templates/checkout/_partials/customer-form.tpl b/templates/checkout/_partials/customer-form.tpl
index 81b31646..0eff5f92 100644
--- a/templates/checkout/_partials/customer-form.tpl
+++ b/templates/checkout/_partials/customer-form.tpl
@@ -45,7 +45,7 @@
 {/block}
 
 {block "form_buttons"}
-  <div class="text-right">
+  <div class="text-end">
     <button
       class="continue btn btn-primary d-none d-md-inline-block"
       name="continue"
diff --git a/templates/checkout/_partials/header.tpl b/templates/checkout/_partials/header.tpl
index 6e65c48f..10766545 100644
--- a/templates/checkout/_partials/header.tpl
+++ b/templates/checkout/_partials/header.tpl
@@ -43,7 +43,7 @@
             {/images_block}
           </a>
         </div>
-        <div class="col d-none d-md-block text-right">
+        <div class="col d-none d-md-block text-end">
           {hook h='displayNav1'}
         </div>
       </div>
diff --git a/templates/checkout/_partials/login-form.tpl b/templates/checkout/_partials/login-form.tpl
index bc1e36d5..e5b7c005 100644
--- a/templates/checkout/_partials/login-form.tpl
+++ b/templates/checkout/_partials/login-form.tpl
@@ -25,7 +25,7 @@
 {extends file='customer/_partials/login-form.tpl'}
 
 {block name='form_buttons'}
-  <div class="text-right">
+  <div class="text-end">
     <button
       class="continue btn btn-primary d-none d-md-inline-block"
       name="continue"
diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl
index 999e2088..145f1ded 100644
--- a/templates/checkout/_partials/steps/addresses.tpl
+++ b/templates/checkout/_partials/steps/addresses.tpl
@@ -123,7 +123,7 @@
       {/if}
 
       {if !$form_has_continue_button}
-        <div class="text-right">
+        <div class="text-end">
           <button type="submit" class="btn btn-primary continue d-none d-md-inline-block" name="confirm-addresses" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
diff --git a/templates/checkout/_partials/steps/checkout-step.tpl b/templates/checkout/_partials/steps/checkout-step.tpl
index 0f749ebc..84b85bd0 100644
--- a/templates/checkout/_partials/steps/checkout-step.tpl
+++ b/templates/checkout/_partials/steps/checkout-step.tpl
@@ -51,10 +51,10 @@
         {if $step_is_reachable}
           <a
             href="#"
-            class="ml-auto checkout-step__edit-btn step-edit js-step-edit text-muted btn btn-sm btn-link py-0 stretched-link"
+            class="ms-auto checkout-step__edit-btn step-edit js-step-edit text-muted btn btn-sm btn-link py-0 stretched-link"
             data-target="#content-{$identifier}">
             <span class="d-inline-flex align-items-center">
-              <span class="material-icons font-sm mr-1 btn-icon">mode_edit</span>
+              <span class="material-icons font-sm me-1 btn-icon">mode_edit</span>
               {l s='Edit' d='Shop.Theme.Actions'}
             </span>
           </a>
diff --git a/templates/checkout/_partials/steps/personal-information.tpl b/templates/checkout/_partials/steps/personal-information.tpl
index 7e9d26b0..e147ea21 100644
--- a/templates/checkout/_partials/steps/personal-information.tpl
+++ b/templates/checkout/_partials/steps/personal-information.tpl
@@ -32,7 +32,7 @@
       <p><small>{l s='If you sign out now, your cart will be emptied.' d='Shop.Theme.Checkout'}</small></p>
     {/if}
 
-    <div class="text-right">
+    <div class="text-end">
       <form method="GET" action="{$urls.pages.order}">
         <button
           class="continue btn btn-primary d-none d-md-inline-block"
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 2d486a23..31038308 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -66,7 +66,7 @@
 
                               </div>
                               <div class="col-sm-auto col-12 checkout-option__col checkout-option__col--price mt-sm-0 mt-1">
-                                <div class="checkout-option__price price text-right">
+                                <div class="checkout-option__price price text-end">
                                   {$carrier.price}
                                 </div>
                               </div>
@@ -112,7 +112,7 @@
 
           </div>
         </div>
-        <div class="text-right mt-3">
+        <div class="text-end mt-3">
           <button type="submit" class="continue btn btn-primary d-none d-md-inline-block" name="confirmDeliveryOption" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
diff --git a/templates/checkout/cart.tpl b/templates/checkout/cart.tpl
index 98903721..81115c35 100644
--- a/templates/checkout/cart.tpl
+++ b/templates/checkout/cart.tpl
@@ -45,7 +45,7 @@
         {block name='continue_shopping'}
           <div class="my-3">
             <a class="btn btn-outline-primary" href="{$urls.pages.index}">
-              <span class="material-icons btn-icon mr-1">keyboard_arrow_left</span>
+              <span class="material-icons btn-icon me-1">keyboard_arrow_left</span>
               {l s='Continue shopping' d='Shop.Theme.Actions'}
             </a>
           </div>
diff --git a/templates/checkout/order-confirmation.tpl b/templates/checkout/order-confirmation.tpl
index 466ab4a0..f0fb6faa 100644
--- a/templates/checkout/order-confirmation.tpl
+++ b/templates/checkout/order-confirmation.tpl
@@ -46,7 +46,7 @@
     {/block}
   </section>
 
-  <div class="row card-group no-gutters my-4">
+  <div class="row card-group g-0 my-4">
     {block name='order_details'}
       <div class="col-sm-6 col-12 card">
         <div class="card-header">
diff --git a/templates/cms/stores.tpl b/templates/cms/stores.tpl
index 1295b59f..c521a2e3 100644
--- a/templates/cms/stores.tpl
+++ b/templates/cms/stores.tpl
@@ -114,7 +114,7 @@
             <ul class="card-block mb-0 row">
               {if $store.phone}
                 <li class="col-md-4 d-flex align-items-center mt-1">
-                  <span class="material-icons mr-2 font-reset">
+                  <span class="material-icons me-2 font-reset">
                     call
                   </span>
                   <a href="tel:{$store.phone}">{$store.phone}</a>
@@ -122,7 +122,7 @@
               {/if}
               {if $store.fax}
                 <li class="col-md-4 d-flex align-items-center mt-1">
-                  <span class="material-icons mr-2 font-reset">
+                  <span class="material-icons me-2 font-reset">
                     local_printshop
                   </span>
                   <span>{$store.fax}</span>
@@ -130,7 +130,7 @@
               {/if}
               {if $store.email}
                 <li class="col-md-4 d-flex align-items-center mt-1">
-                  <span class="material-icons mr-2 font-reset">
+                  <span class="material-icons me-2 font-reset">
                     mail
                   </span>
                   <a href="mailto:{$store.email}">
diff --git a/templates/components/featured-products.tpl b/templates/components/featured-products.tpl
index cd6197b7..84c53aa4 100644
--- a/templates/components/featured-products.tpl
+++ b/templates/components/featured-products.tpl
@@ -8,7 +8,7 @@
             {$smarty.block.child}
           </p>
         {/block}
-        <div class="featured-products__navigation d-flex flex-grow-0 flex-shrink-0 ml-auto">
+        <div class="featured-products__navigation d-flex flex-grow-0 flex-shrink-0 ms-auto">
           <div class="swiper-button-prev swiper-button-custom position-static">
             <span class="sr-only">{l s='Previous' d='Shop.Theme.Actions'}</span>
             <span class="material-icons">keyboard_arrow_left</span>
@@ -49,7 +49,7 @@
     </div>
 
     {block name='featured_products_footer' hide}
-      <div class="featured-products__footer mt-4 text-right">
+      <div class="featured-products__footer mt-4 text-end">
         {$smarty.block.child}
       </div>
     {/block}
diff --git a/templates/customer/_partials/block-address.tpl b/templates/customer/_partials/block-address.tpl
index fec508c6..5c5aa693 100644
--- a/templates/customer/_partials/block-address.tpl
+++ b/templates/customer/_partials/block-address.tpl
@@ -32,11 +32,11 @@
     {block name='address_block_item_actions'}
       <div class="address__footer small card-footer">
         <a class="d-flex align-items-center justify-content-center" href="{url entity=address id=$address.id}" data-link-action="edit-address">
-          <i class="material-icons mr-1 font-reset">&#xE254;</i>
+          <i class="material-icons me-1 font-reset">&#xE254;</i>
           <span>{l s='Update' d='Shop.Theme.Actions'}</span>
         </a>
         <a class="d-flex align-items-center justify-content-center" href="{url entity=address id=$address.id params=['delete' => 1, 'token' => $token]}" data-link-action="delete-address">
-          <i class="material-icons mr-1 font-reset">&#xE872;</i>
+          <i class="material-icons me-1 font-reset">&#xE872;</i>
           <span>{l s='Delete' d='Shop.Theme.Actions'}</span>
         </a>
       </div>
diff --git a/templates/customer/_partials/order-detail-no-return.tpl b/templates/customer/_partials/order-detail-no-return.tpl
index d47aba3d..512ad6be 100644
--- a/templates/customer/_partials/order-detail-no-return.tpl
+++ b/templates/customer/_partials/order-detail-no-return.tpl
@@ -28,7 +28,7 @@
     {include file="customer/_partials/product-table.tpl" products=$order.products}
   </div>
 
-  <div class="row card-group no-gutters my-4">
+  <div class="row card-group g-0 my-4">
     {block name='order_details'}
       <div class="col-sm-6 col-12 card mb-sm-0 mb-4">
         <div class="card-header">
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 7d0f03d4..755640c9 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -28,7 +28,7 @@
     {include file="customer/_partials/product-table.tpl" products=$order.products}
   </div>
 
-  <div class="row card-group no-gutters my-4">
+  <div class="row card-group g-0 my-4">
     {block name='order_details'}
       <div class="col-sm-6 col-12 card  mb-sm-0 mb-4">
         <div class="card-header">
diff --git a/templates/customer/discount.tpl b/templates/customer/discount.tpl
index ecf743da..b5990721 100644
--- a/templates/customer/discount.tpl
+++ b/templates/customer/discount.tpl
@@ -47,7 +47,7 @@
           <tr>
             <th scope="row" class="align-middle">{$cart_rule.code}</th>
             <td class="align-middle">{$cart_rule.name}</td>
-            <td class="text-xs-right">{$cart_rule.quantity_for_user}</td>
+            <td class="text-end">{$cart_rule.quantity_for_user}</td>
             <td class="align-middle">
               <span class="text-primary font-weight-bold text-lowercase align-middle">
                 {$cart_rule.value}
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index c0f2fdd7..10b06cff 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -52,7 +52,7 @@
                 {$order.details.order_date}
               </span>
             </td>
-            <td class="text-xs-right align-middle">
+            <td class="text-end align-middle">
               <span class="text-primary font-weight-bold text-lowercase">
                 {$order.totals.total.value}
               </span>
diff --git a/templates/customer/order-detail.tpl b/templates/customer/order-detail.tpl
index 251f3b8b..a1035020 100644
--- a/templates/customer/order-detail.tpl
+++ b/templates/customer/order-detail.tpl
@@ -65,7 +65,7 @@
       </ul>
 
       {if $order.details.reorder_url}
-        <div class="mt-2 text-right">
+        <div class="mt-2 text-end">
           <a href="{$order.details.reorder_url}" class="btn btn-outline-primary">{l s='Reorder' d='Shop.Theme.Actions'}</a>
         </div>
       {/if}
diff --git a/templates/customer/order-follow.tpl b/templates/customer/order-follow.tpl
index 172adfc3..d04a6749 100644
--- a/templates/customer/order-follow.tpl
+++ b/templates/customer/order-follow.tpl
@@ -57,7 +57,7 @@
             <td class="text-sm-center align-middle">
               {if $return.print_url}
                 <a href="{$return.print_url}" class="btn btn-primary btn-sm">
-                  <span class="material-icons btn-icon ml-1">file_download</span>
+                  <span class="material-icons btn-icon ms-1">file_download</span>
                   {l s='Print out' d='Shop.Theme.Actions'}
                 </a>
               {else}
diff --git a/templates/customer/order-slip.tpl b/templates/customer/order-slip.tpl
index 55dfa974..03c495c5 100644
--- a/templates/customer/order-slip.tpl
+++ b/templates/customer/order-slip.tpl
@@ -49,7 +49,7 @@
             <td class="align-middle">{$slip.credit_slip_date}</td>
             <td class="align-middle text-sm-center">
               <a href="{$slip.url}" class="btn btn-primary btn-sm">
-                <span class="material-icons btn-icon ml-1">file_download</span>
+                <span class="material-icons btn-icon ms-1">file_download</span>
                 {l s='Download' d='Shop.Theme.Catalog'}
               </a>
             </td>
@@ -79,7 +79,7 @@
           </div>
           <div class="card-footer">
             <a href="{$slip.url}" class="btn btn-primary btn-sm btn-block">
-              <span class="material-icons btn-icon ml-1">file_download</span>
+              <span class="material-icons btn-icon ms-1">file_download</span>
               {l s='View credit slip' d='Shop.Theme.Customeraccount'}
             </a>
           </div>
diff --git a/templates/customer/page.tpl b/templates/customer/page.tpl
index b5f433a6..38c5a60b 100644
--- a/templates/customer/page.tpl
+++ b/templates/customer/page.tpl
@@ -39,7 +39,7 @@
     <div class="col-lg-3 col-12">
      {include file='customer/customer-links.tpl'}
     </div>
-    <div class="pl-lg-5 col-lg-9 col-12">
+    <div class="ps-lg-5 col-lg-9 col-12">
       <section id="content" class="{block name='pageContentClass'}page-content {/block}page-content--{$page.page_name}">
         {$smarty.capture.acc_title nofilter}
 

From de19801488c50ae7e9117fc41e5b270cfca39d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 01:31:12 +0200
Subject: [PATCH 03/17] removed bs5 styles classes adjustment

---
 modules/contactform/views/templates/widget/contactform.tpl  | 2 +-
 .../productcomments/views/templates/hook/confirm-modal.tpl  | 4 ++--
 .../views/templates/hook/post-comment-modal.tpl             | 6 +++---
 .../ps_emailalerts/views/templates/hook/product-modal.tpl   | 4 ++--
 .../views/templates/front/catalog/facets.tpl                | 2 +-
 templates/_partials/modal-filters.tpl                       | 2 +-
 templates/_partials/modal-search.tpl                        | 2 +-
 .../catalog/_partials/miniatures/_partials/product-form.tpl | 6 +++---
 templates/catalog/_partials/product-add-to-cart.tpl         | 2 +-
 templates/catalog/_partials/products-top.tpl                | 2 +-
 templates/catalog/_partials/quickview.tpl                   | 2 +-
 templates/checkout/_partials/cart-detailed-product-line.tpl | 2 +-
 templates/checkout/_partials/customer-form.tpl              | 2 +-
 templates/checkout/_partials/footer.tpl                     | 2 +-
 templates/checkout/_partials/login-form.tpl                 | 2 +-
 templates/checkout/_partials/steps/addresses.tpl            | 2 +-
 templates/checkout/_partials/steps/payment.tpl              | 2 +-
 templates/checkout/_partials/steps/personal-information.tpl | 2 +-
 templates/checkout/_partials/steps/shipping.tpl             | 2 +-
 templates/components/modal.tpl                              | 2 +-
 .../customer/_partials/account-transformation-form.tpl      | 2 +-
 templates/customer/_partials/address-form.tpl               | 2 +-
 templates/customer/_partials/customer-form.tpl              | 2 +-
 templates/customer/_partials/login-form.tpl                 | 2 +-
 templates/customer/_partials/order-detail-return.tpl        | 2 +-
 templates/customer/_partials/order-details-return-modal.tpl | 4 ++--
 templates/customer/_partials/order-details-return-table.tpl | 2 +-
 templates/customer/_partials/order-messages.tpl             | 2 +-
 templates/customer/authentication.tpl                       | 2 +-
 templates/customer/guest-login.tpl                          | 2 +-
 templates/customer/history.tpl                              | 4 ++--
 templates/customer/order-follow.tpl                         | 4 ++--
 templates/customer/order-return.tpl                         | 2 +-
 templates/customer/order-slip.tpl                           | 2 +-
 templates/customer/password-email.tpl                       | 2 +-
 templates/customer/password-new.tpl                         | 2 +-
 36 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index 702a5809..7343c7c4 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -122,7 +122,7 @@
           <input type="text" name="url" value=""/>
           <input type="hidden" name="token" value="{$token}" />
           <input class="btn btn-primary d-none d-md-inline-block" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
-          <input class="btn btn-primary btn-block d-block d-md-none" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
+          <input class="btn btn-primary d-block text-center w-100 d-block d-md-none" type="submit" name="submitMessage" value="{l s='Send' d='Shop.Theme.Actions'}">
         </footer>
       {/if}
     </div>
diff --git a/modules/productcomments/views/templates/hook/confirm-modal.tpl b/modules/productcomments/views/templates/hook/confirm-modal.tpl
index d2dd1c62..0522cb7c 100644
--- a/modules/productcomments/views/templates/hook/confirm-modal.tpl
+++ b/modules/productcomments/views/templates/hook/confirm-modal.tpl
@@ -57,10 +57,10 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary confirm-button btn-block" data-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
+        <button type="button" class="btn btn-primary confirm-button d-block text-center w-100" data-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
           {l s='Yes' d='Modules.Productcomments.Shop'}
         </button>
-        <button type="button" class="btn btn-text refuse-button btn-block" data-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
+        <button type="button" class="btn btn-text refuse-button d-block text-center w-100" data-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
           {l s='No' d='Modules.Productcomments.Shop'}
         </button>
       </div>
diff --git a/modules/productcomments/views/templates/hook/post-comment-modal.tpl b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
index 7811cc5a..a964343e 100644
--- a/modules/productcomments/views/templates/hook/post-comment-modal.tpl
+++ b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
@@ -32,7 +32,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title h5">{l s='Write your review' d='Modules.Productcomments.Shop'}</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+        <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
@@ -73,10 +73,10 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button type="submit" class="btn btn-primary btn-block">
+          <button type="submit" class="btn btn-primary d-block text-center w-100">
             {l s='Send' d='Modules.Productcomments.Shop'}
           </button>
-          <button type="button" class="btn btn-text btn-block" data-dismiss="modal" aria-label="{l s='Cancel' d='Modules.Productcomments.Shop'}">
+          <button type="button" class="btn btn-text d-block text-center w-100" data-dismiss="modal" aria-label="{l s='Cancel' d='Modules.Productcomments.Shop'}">
             {l s='Cancel' d='Modules.Productcomments.Shop'}
           </button>
         </div>
diff --git a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
index a3db6008..425f564c 100644
--- a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
+++ b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
@@ -10,7 +10,7 @@
           <h5 class="modal-title">{l s='Notify me when available' d='Modules.Emailalerts.Shop'}</h5>
         {/block}
         {block name='modal_close'}
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         {/block}
@@ -46,7 +46,7 @@
     {/block}
     {block name='modal_footer'}
       <div class="modal-footer {block name='modal_footer_extra_class'}{/block}">
-        <button class="btn btn-primary btn-block js-mailalert-submit" type="submit">
+        <button class="btn btn-primary d-block text-center w-100 js-mailalert-submit" type="submit">
           {l s='Send' d='Shop.Theme.Actions'}
         </button>
       </div>
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index fcdba1f0..f9d7d37e 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -36,7 +36,7 @@
           {if $activeFilters|count}
             <div class="clear-all-wrapper card-body">
               <button data-search-url="{$clear_all_link}"
-                class="btn btn-sm btn-block btn-outline-secondary btn-sm js-search-filters-clear-all">
+                class="btn btn-sm d-block text-center w-100 btn-outline-secondary btn-sm js-search-filters-clear-all">
                 <i class="material-icons font-reset me-1 align-middle">&#xE14C;</i>
                 {l s='Clear all' d='Shop.Theme.Actions'}
               </button>
diff --git a/templates/_partials/modal-filters.tpl b/templates/_partials/modal-filters.tpl
index aa435c75..5809584c 100644
--- a/templates/_partials/modal-filters.tpl
+++ b/templates/_partials/modal-filters.tpl
@@ -10,7 +10,7 @@
 {/block}
 
 {block name='modal_footer'}
-  <button type="button" class="btn btn-block btn-primary" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="btn d-block text-center w-100 btn-primary" data-dismiss="modal" aria-label="Close">
     {l s='Show results' d='Shop.Istheme'}
   </button>
 {/block}
diff --git a/templates/_partials/modal-search.tpl b/templates/_partials/modal-search.tpl
index 48bf7d8c..e261473f 100644
--- a/templates/_partials/modal-search.tpl
+++ b/templates/_partials/modal-search.tpl
@@ -4,7 +4,7 @@
 {block name='modal_extra_class'}modal-fullscreen search-modal{/block}
 {block name='modal_header'}{/block}
 {block name='modal_body'}
-  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
   <div id="_mobile_search_from">
diff --git a/templates/catalog/_partials/miniatures/_partials/product-form.tpl b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
index 0eb86256..f9b78e22 100644
--- a/templates/catalog/_partials/miniatures/_partials/product-form.tpl
+++ b/templates/catalog/_partials/miniatures/_partials/product-form.tpl
@@ -1,6 +1,6 @@
 <div class="product-miniature__actions">
     {if $product.add_to_cart_url && ($product.quantity > 0 || $product.allow_oosp) && !$configuration.is_catalog}
-        <form class="product-miniature__form d-grid"
+        <form class="product-miniature__form"
               action="{$product.add_to_cart_url}"
               method="post">
           <input type="hidden" name="id_product" value="{$product.id}">
@@ -11,7 +11,7 @@
             class="form-control input-qty"
           >
           <button
-            class="btn btn-primary btn-block add-to-cart"
+            class="btn btn-primary d-block text-center w-100 add-to-cart"
             data-button-action="add-to-cart"
             type="submit"
             {if !$product.add_to_cart_url}
@@ -23,7 +23,7 @@
       </form>
     {else}
         <a href="{$product.canonical_url}"
-           class="btn btn-secondary btn-block"
+           class="btn btn-secondary d-block text-center w-100"
         > {l s='View' d='Shop.Theme.Actions'}
         </a>
     {/if}
diff --git a/templates/catalog/_partials/product-add-to-cart.tpl b/templates/catalog/_partials/product-add-to-cart.tpl
index e332cee0..4ad37ead 100644
--- a/templates/catalog/_partials/product-add-to-cart.tpl
+++ b/templates/catalog/_partials/product-add-to-cart.tpl
@@ -66,7 +66,7 @@
 
         <div class="add col mt-2 px-1 js-add-to-cart-btn-wrapper">
           <button
-            class="btn btn-primary add-to-cart btn-block"
+            class="btn btn-primary add-to-cart d-block text-center w-100"
             data-button-action="add-to-cart"
             type="submit"
             {if !$product.add_to_cart_url}
diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
index e3b29359..a2d0180f 100644
--- a/templates/catalog/_partials/products-top.tpl
+++ b/templates/catalog/_partials/products-top.tpl
@@ -40,7 +40,7 @@
       <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
-      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary btn-block d-sm-none">
+      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
     {/if}
diff --git a/templates/catalog/_partials/quickview.tpl b/templates/catalog/_partials/quickview.tpl
index 52b6b69d..3bfb692b 100644
--- a/templates/catalog/_partials/quickview.tpl
+++ b/templates/catalog/_partials/quickview.tpl
@@ -28,7 +28,7 @@
      <div class="modal-header">
       <h1 class="h3 modal-title">{$product.name}</h1>
 
-       <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+       <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
          <span aria-hidden="true">&times;</span>
        </button>
      </div>
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 1f2bcea6..84552c6f 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -79,7 +79,7 @@
                   <div class="modal-content">
                     <div class="modal-header">
                       <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
-                      <button type="button" class="close" data-dismiss="modal"
+                      <button type="button" class="btn-close" data-dismiss="modal"
                         aria-label="{l s='Close' d='Shop.Theme.Global'}">
                         <span aria-hidden="true">&times;</span>
                       </button>
diff --git a/templates/checkout/_partials/customer-form.tpl b/templates/checkout/_partials/customer-form.tpl
index 0eff5f92..fdd84bb8 100644
--- a/templates/checkout/_partials/customer-form.tpl
+++ b/templates/checkout/_partials/customer-form.tpl
@@ -56,7 +56,7 @@
         {l s='Continue' d='Shop.Theme.Actions'}
     </button>
     <button
-      class="continue btn btn-primary btn-block d-block d-md-none"
+      class="continue btn btn-primary text-center w-100 d-block d-md-none"
       name="continue"
       data-link-action="register-new-customer"
       type="submit"
diff --git a/templates/checkout/_partials/footer.tpl b/templates/checkout/_partials/footer.tpl
index 3c363ffd..f9955114 100644
--- a/templates/checkout/_partials/footer.tpl
+++ b/templates/checkout/_partials/footer.tpl
@@ -27,7 +27,7 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+        <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
diff --git a/templates/checkout/_partials/login-form.tpl b/templates/checkout/_partials/login-form.tpl
index e5b7c005..f2eba394 100644
--- a/templates/checkout/_partials/login-form.tpl
+++ b/templates/checkout/_partials/login-form.tpl
@@ -36,7 +36,7 @@
       {l s='Continue' d='Shop.Theme.Actions'}
     </button>
     <button
-      class="continue btn btn-primary btn-block d-block d-md-none"
+      class="continue btn btn-primary text-center w-100 d-block d-md-none"
       name="continue"
       data-link-action="sign-in"
       type="submit"
diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl
index 145f1ded..4bd26ff4 100644
--- a/templates/checkout/_partials/steps/addresses.tpl
+++ b/templates/checkout/_partials/steps/addresses.tpl
@@ -127,7 +127,7 @@
           <button type="submit" class="btn btn-primary continue d-none d-md-inline-block" name="confirm-addresses" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
-          <button type="submit" class="btn btn-primary continue btn-block d-block d-md-none" name="confirm-addresses" value="1">
+          <button type="submit" class="btn btn-primary continue text-center w-100 d-block d-md-none" name="confirm-addresses" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
           <input type="hidden" id="not-valid-addresses" class="js-not-valid-addresses" value="{$not_valid_addresses}">
diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl
index 50861f05..56ef821b 100644
--- a/templates/checkout/_partials/steps/payment.tpl
+++ b/templates/checkout/_partials/steps/payment.tpl
@@ -112,7 +112,7 @@
         <button type="submit" class="btn btn-primary btn-lg d-none d-md-inline-block {if !$selected_payment_option} disabled {/if}">
           {l s='Place order' d='Shop.Theme.Checkout'}
         </button>
-        <button type="submit" class="btn btn-primary btn-lg btn-block d-block d-md-none {if !$selected_payment_option} disabled {/if}">
+        <button type="submit" class="btn btn-primary btn-lg text-center w-100 d-block d-md-none {if !$selected_payment_option} disabled {/if}">
           {l s='Place order' d='Shop.Theme.Checkout'}
         </button>
       </div>
diff --git a/templates/checkout/_partials/steps/personal-information.tpl b/templates/checkout/_partials/steps/personal-information.tpl
index e147ea21..3be569d3 100644
--- a/templates/checkout/_partials/steps/personal-information.tpl
+++ b/templates/checkout/_partials/steps/personal-information.tpl
@@ -43,7 +43,7 @@
           {l s='Continue' d='Shop.Theme.Actions'}
         </button>
         <button
-          class="continue btn btn-primary btn-block d-block d-md-none"
+          class="continue btn btn-primary text-center w-100 d-block d-md-none"
           name="controller"
           type="submit"
           value="order"
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 31038308..14dd0640 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -116,7 +116,7 @@
           <button type="submit" class="continue btn btn-primary d-none d-md-inline-block" name="confirmDeliveryOption" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
-          <button type="submit" class="continue btn btn-primary btn-block d-block d-md-none" name="confirmDeliveryOption" value="1">
+          <button type="submit" class="continue btn btn-primary text-center w-100 d-block d-md-none" name="confirmDeliveryOption" value="1">
             {l s='Continue' d='Shop.Theme.Actions'}
           </button>
         </div>
diff --git a/templates/components/modal.tpl b/templates/components/modal.tpl
index 4c986871..dad671ba 100644
--- a/templates/components/modal.tpl
+++ b/templates/components/modal.tpl
@@ -13,7 +13,7 @@
                 <h5 class="modal-title">{$smarty.block.child}</h5>
               {/block}
               {block name='modal_close'}
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
                   <span aria-hidden="true">&times;</span>
                 </button>
               {/block}
diff --git a/templates/customer/_partials/account-transformation-form.tpl b/templates/customer/_partials/account-transformation-form.tpl
index 87342b71..6638a159 100644
--- a/templates/customer/_partials/account-transformation-form.tpl
+++ b/templates/customer/_partials/account-transformation-form.tpl
@@ -29,7 +29,7 @@
             <button class="btn btn-primary d-none d-md-inline-block" type="submit">
               {l s='Create account' d='Shop.Theme.Actions'}
             </button>
-            <button class="btn btn-primary btn-block d-block d-md-none" type="submit">
+            <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit">
               {l s='Create account' d='Shop.Theme.Actions'}
             </button>
           </div>
diff --git a/templates/customer/_partials/address-form.tpl b/templates/customer/_partials/address-form.tpl
index 3a0545b0..53d2358e 100644
--- a/templates/customer/_partials/address-form.tpl
+++ b/templates/customer/_partials/address-form.tpl
@@ -54,7 +54,7 @@
           <button class="btn btn-primary form-control-submit d-none d-md-inline-block" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
-          <button class="btn btn-primary form-control-submit btn-block d-block d-md-none" type="submit">
+          <button class="btn btn-primary form-control-submit text-center w-100 d-block d-md-none" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/customer-form.tpl b/templates/customer/_partials/customer-form.tpl
index 91afefab..a3f4f6d8 100644
--- a/templates/customer/_partials/customer-form.tpl
+++ b/templates/customer/_partials/customer-form.tpl
@@ -54,7 +54,7 @@
           <button class="btn btn-primary form-control-submit d-none d-md-inline-block" data-link-action="save-customer" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
-          <button class="btn btn-primary form-control-submit btn-block d-block d-md-none" data-link-action="save-customer" type="submit">
+          <button class="btn btn-primary form-control-submit text-center w-100 d-block d-md-none" data-link-action="save-customer" type="submit">
             {l s='Save' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/login-form.tpl b/templates/customer/_partials/login-form.tpl
index 74787a68..63bb28b9 100644
--- a/templates/customer/_partials/login-form.tpl
+++ b/templates/customer/_partials/login-form.tpl
@@ -52,7 +52,7 @@
           <button id="submit-login" class="btn btn-primary d-none d-md-inline-block" data-link-action="sign-in" type="submit" class="form-control-submit">
             {l s='Sign in' d='Shop.Theme.Actions'}
           </button>
-          <button id="submit-login" class="btn btn-primary btn-block d-block d-md-none" data-link-action="sign-in" type="submit" class="form-control-submit">
+          <button id="submit-login" class="btn btn-primary text-center w-100 d-block d-md-none" data-link-action="sign-in" type="submit" class="form-control-submit">
             {l s='Sign in' d='Shop.Theme.Actions'}
           </button>
         {/block}
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 755640c9..8993e548 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -82,7 +82,7 @@
       <button class="btn btn-primary d-none d-md-inline-block" data-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
-      <button class="btn btn-primary btn-block d-block d-md-none" data-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
     </div>
diff --git a/templates/customer/_partials/order-details-return-modal.tpl b/templates/customer/_partials/order-details-return-modal.tpl
index e5405b8d..8ecd68e8 100644
--- a/templates/customer/_partials/order-details-return-modal.tpl
+++ b/templates/customer/_partials/order-details-return-modal.tpl
@@ -13,7 +13,7 @@
           <h5 class="modal-title">{l s='Merchandise return' d='Shop.Theme.Customeraccount'}</h5>
         {/block}
         {block name='modal_close'}
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         {/block}
@@ -47,7 +47,7 @@
         <button class="form-control-submit btn btn-primary d-none d-md-inline-block" type="submit" name="submitReturnMerchandise">
           {l s='Request a return' d='Shop.Theme.Customeraccount'}
         </button>
-        <button class="form-control-submit btn btn-primary btn-block d-block d-md-none" type="submit" name="submitReturnMerchandise">
+        <button class="form-control-submit btn btn-primary text-center w-100 d-block d-md-none" type="submit" name="submitReturnMerchandise">
           {l s='Request a return' d='Shop.Theme.Customeraccount'}
         </button>
       </div>
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index 695ddebc..80fc83e6 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -114,7 +114,7 @@
                 <div class="modal-dialog" role="document">
                   <div class="modal-content">
                     <div class="modal-header">
-                      <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+                      <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
                         <span aria-hidden="true">&times;</span>
                       </button>
                       <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
diff --git a/templates/customer/_partials/order-messages.tpl b/templates/customer/_partials/order-messages.tpl
index 261cd3a8..416f5cb9 100644
--- a/templates/customer/_partials/order-messages.tpl
+++ b/templates/customer/_partials/order-messages.tpl
@@ -73,7 +73,7 @@
 
         <footer class="form-footer text-center mt-3">
           <input type="hidden" name="id_order" value="{$order.details.id}">
-          <button type="submit" name="submitMessage" class="btn btn-primary d-block btn-block d-md-none form-control-submit">
+          <button type="submit" name="submitMessage" class="btn btn-primary d-block text-center w-100 d-md-none form-control-submit">
             {l s='Send' d='Shop.Theme.Actions'}
           </button>
           <button type="submit" name="submitMessage" class="btn btn-primary form-control-submit d-none d-md-inline-block">
diff --git a/templates/customer/authentication.tpl b/templates/customer/authentication.tpl
index a4aa5d60..275a61fc 100644
--- a/templates/customer/authentication.tpl
+++ b/templates/customer/authentication.tpl
@@ -61,7 +61,7 @@
             <a href="{$urls.pages.register}" class="btn btn-primary d-none d-md-inline-block">
               {l s='I want to create an account' d='Shop.Istheme'}
             </a>
-            <a href="{$urls.pages.register}" class="btn btn-primary btn-block d-block d-md-none">
+            <a href="{$urls.pages.register}" class="btn btn-primary text-center w-100 d-block d-md-none">
               {l s='I want to create an account' d='Shop.Istheme'}
             </a>
           </div>
diff --git a/templates/customer/guest-login.tpl b/templates/customer/guest-login.tpl
index 6561c0ac..cd9fae33 100644
--- a/templates/customer/guest-login.tpl
+++ b/templates/customer/guest-login.tpl
@@ -75,7 +75,7 @@
       <button class="btn btn-primary d-none d-md-inline-block" type="submit">
         {l s='Send' d='Shop.Theme.Actions'}
       </button>
-      <button class="btn btn-primary btn-block d-block d-md-none" type="submit">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit">
         {l s='Send' d='Shop.Theme.Actions'}
       </button>
     </footer>
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index 10b06cff..18d742ba 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -105,13 +105,13 @@
           <div class="card-footer">
             <div class="row mt-n2">
               <div class="col-sm-6 mt-2">
-                <a class="view-order-details-link btn btn-primary btn-block btn-sm" href="{$order.details.details_url}" data-link-action="view-order-details">
+                <a class="view-order-details-link btn btn-primary d-block  text-center w-100 btn-sm" href="{$order.details.details_url}" data-link-action="view-order-details">
                   {l s='Details' d='Shop.Theme.Customeraccount'}
                 </a>
               </div>
               {if $order.details.reorder_url}
                 <div class="col-sm-6 mt-2">
-                  <a class="reorder-link btn btn-light btn-block btn-sm" href="{$order.details.reorder_url}" data-link-action="view-order-details">
+                  <a class="reorder-link btn btn-light d-block  text-center w-100 btn-sm" href="{$order.details.reorder_url}" data-link-action="view-order-details">
                     {l s='Reorder' d='Shop.Theme.Actions'}
                   </a>
                 </div>
diff --git a/templates/customer/order-follow.tpl b/templates/customer/order-follow.tpl
index d04a6749..dc876f14 100644
--- a/templates/customer/order-follow.tpl
+++ b/templates/customer/order-follow.tpl
@@ -98,13 +98,13 @@
           <div class="card-footer">
             <div class="row mt-n2">
               <div class="col-sm-6 mt-2">
-                <a class="btn btn-primary btn-block btn-sm" href="{$return.return_url}">
+                <a class="btn btn-primary d-block  text-center w-100 btn-sm" href="{$return.return_url}">
                   {l s='Details' d='Shop.Theme.Customeraccount'}
                 </a>
               </div>
               {if $return.print_url}
                 <div class="col-sm-6 mt-2">
-                  <a class="btn btn-light btn-block btn-sm" href="{$return.print_url}">
+                  <a class="btn btn-light d-block  text-center w-100 btn-sm" href="{$return.print_url}">
                   {l s='Print out' d='Shop.Theme.Actions'}
                   </a>
                 </div>
diff --git a/templates/customer/order-return.tpl b/templates/customer/order-return.tpl
index 70bc9874..2838eab9 100644
--- a/templates/customer/order-return.tpl
+++ b/templates/customer/order-return.tpl
@@ -63,7 +63,7 @@
                     <div class="modal-dialog" role="document">
                       <div class="modal-content">
                         <div class="modal-header">
-                          <button type="button" class="close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
+                          <button type="button" class="btn-close" data-dismiss="modal" aria-label="{l s='Close' d='Shop.Theme.Global'}">
                             <span aria-hidden="true">&times;</span>
                           </button>
                           <h4 class="modal-title">{l s='Product customization' d='Shop.Theme.Catalog'}</h4>
diff --git a/templates/customer/order-slip.tpl b/templates/customer/order-slip.tpl
index 03c495c5..902c7ce8 100644
--- a/templates/customer/order-slip.tpl
+++ b/templates/customer/order-slip.tpl
@@ -78,7 +78,7 @@
             </ul>
           </div>
           <div class="card-footer">
-            <a href="{$slip.url}" class="btn btn-primary btn-sm btn-block">
+            <a href="{$slip.url}" class="btn btn-primary btn-sm d-block  text-center w-100">
               <span class="material-icons btn-icon ms-1">file_download</span>
               {l s='View credit slip' d='Shop.Theme.Customeraccount'}
             </a>
diff --git a/templates/customer/password-email.tpl b/templates/customer/password-email.tpl
index 3c779836..b80241d2 100644
--- a/templates/customer/password-email.tpl
+++ b/templates/customer/password-email.tpl
@@ -53,7 +53,7 @@
           <button class="form-control-submit btn btn-primary d-none d-md-inline-block" name="submit" type="submit">
             {l s='Send reset link' d='Shop.Theme.Actions'}
           </button>
-          <button class="form-control-submit btn btn-primary btn-block d-block d-md-none" name="submit" type="submit">
+          <button class="form-control-submit btn btn-primary text-center w-100 d-block d-md-none" name="submit" type="submit">
             {l s='Send reset link' d='Shop.Theme.Actions'}
           </button>
         </div>
diff --git a/templates/customer/password-new.tpl b/templates/customer/password-new.tpl
index 2c326f7a..47f053e4 100644
--- a/templates/customer/password-new.tpl
+++ b/templates/customer/password-new.tpl
@@ -64,7 +64,7 @@
         <button class="btn btn-primary d-none d-md-inline-block" type="submit" name="submit">
           {l s='Change Password' d='Shop.Theme.Actions'}
         </button>
-        <button class="btn btn-primary btn-block d-block d-md-none" type="submit" name="submit">
+        <button class="btn btn-primary text-center w-100 d-block d-md-none" type="submit" name="submit">
           {l s='Change Password' d='Shop.Theme.Actions'}
         </button>
       </div>

From 1e3568279dec37272811b9c24f03913257ab14ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 01:39:35 +0200
Subject: [PATCH 04/17] bs toogle data attribute modification, screen readers
 fixes

---
 .../ps_brandlist/views/templates/_partials/brand_form.tpl | 2 +-
 .../views/templates/hook/ps_categorytree.tpl              | 2 +-
 modules/ps_contactinfo/ps_contactinfo.tpl                 | 2 +-
 .../ps_customeraccountlinks/ps_customeraccountlinks.tpl   | 2 +-
 modules/ps_emailalerts/views/templates/hook/product.tpl   | 2 +-
 .../views/templates/front/catalog/facets.tpl              | 2 +-
 .../views/templates/hook/hookDisplayFooter.tpl            | 2 +-
 .../ps_linklist/views/templates/hook/linkblock-column.tpl | 2 +-
 modules/ps_linklist/views/templates/hook/linkblock.tpl    | 2 +-
 modules/ps_mainmenu/ps_mainmenu.tpl                       | 2 +-
 .../views/templates/hook/ps_sharebuttons.tpl              | 2 +-
 modules/ps_socialfollow/ps_socialfollow.tpl               | 2 +-
 .../views/templates/_partials/supplier_form.tpl           | 2 +-
 templates/_partials/header.tpl                            | 2 +-
 templates/_partials/page-loader.tpl                       | 2 +-
 templates/_partials/pagination.tpl                        | 4 ++--
 templates/catalog/_partials/product-cover-thumbnails.tpl  | 6 +++---
 templates/catalog/_partials/product-images-modal.tpl      | 4 ++--
 templates/catalog/_partials/product-tabs.tpl              | 8 ++++----
 templates/catalog/_partials/product-variants.tpl          | 2 +-
 templates/catalog/_partials/products-top.tpl              | 4 ++--
 .../checkout/_partials/cart-detailed-product-line.tpl     | 2 +-
 templates/checkout/_partials/cart-detailed.tpl            | 2 +-
 .../checkout/_partials/steps/personal-information.tpl     | 4 ++--
 templates/cms/stores.tpl                                  | 2 +-
 templates/components/featured-products.tpl                | 4 ++--
 templates/customer/_partials/order-detail-return.tpl      | 4 ++--
 .../customer/_partials/order-details-return-table.tpl     | 2 +-
 templates/customer/order-return.tpl                       | 2 +-
 29 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/modules/ps_brandlist/views/templates/_partials/brand_form.tpl b/modules/ps_brandlist/views/templates/_partials/brand_form.tpl
index 24e483fd..239d9c07 100644
--- a/modules/ps_brandlist/views/templates/_partials/brand_form.tpl
+++ b/modules/ps_brandlist/views/templates/_partials/brand_form.tpl
@@ -27,7 +27,7 @@
   <button
     class="btn-unstyle select-title"
     rel="nofollow"
-    data-toggle="dropdown"
+    data-bs-toggle="dropdown"
     aria-haspopup="true"
     aria-expanded="false">
     {l s='All brands' d='Shop.Theme.Catalog'}
diff --git a/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl b/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
index 339916a5..1d38a726 100644
--- a/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
+++ b/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
@@ -34,7 +34,7 @@
               <a href="{$node.link}" class="stretched-link text-reset list-group-item-action-dropdown-link">
                 {$node.name}
               </a>
-              <a href="#exCollapsingNavbar{$node.id}" class="icon-collapse list-group-item-collapse text-reset" data-toggle="collapse">
+              <a href="#exCollapsingNavbar{$node.id}" class="icon-collapse list-group-item-collapse text-reset" data-bs-toggle="collapse">
                 <i class="material-icons d-block">&#xE313;</i>
               </a>
             </div>
diff --git a/modules/ps_contactinfo/ps_contactinfo.tpl b/modules/ps_contactinfo/ps_contactinfo.tpl
index bcbe054b..60d50ce3 100644
--- a/modules/ps_contactinfo/ps_contactinfo.tpl
+++ b/modules/ps_contactinfo/ps_contactinfo.tpl
@@ -27,7 +27,7 @@
 
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Store information' d='Shop.Theme.Global'}</span>
-    <a href="#footer_contact_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
+    <a href="#footer_contact_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-bs-toggle="collapse">
       <i class="material-icons d-block"></i>
     </a>
   </div>
diff --git a/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl b/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl
index 0756b454..4c0054fc 100644
--- a/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl
+++ b/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl
@@ -27,7 +27,7 @@
 
   <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
     <span class="h4 mb-0">{l s='Your account' d='Shop.Theme.Customeraccount'}</span>
-    <a href="#footer_account_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
+    <a href="#footer_account_list" class="icon-collapse stretched-link text-reset d-block d-md-none" data-bs-toggle="collapse">
       <i class="material-icons d-block"></i>
     </a>
   </div>
diff --git a/modules/ps_emailalerts/views/templates/hook/product.tpl b/modules/ps_emailalerts/views/templates/hook/product.tpl
index 94877b45..8802d306 100644
--- a/modules/ps_emailalerts/views/templates/hook/product.tpl
+++ b/modules/ps_emailalerts/views/templates/hook/product.tpl
@@ -23,7 +23,7 @@
 * International Registered Trademark & Property of PrestaShop SA
 *}
 
-<a href="#" rel="nofollow" data-toggle="modal" data-target="#email-alert-modal" class="btn btn-primary js-mailalert-modal-btn">
+<a href="#" rel="nofollow" data-bs-toggle="modal" data-target="#email-alert-modal" class="btn btn-primary js-mailalert-modal-btn">
     {l s='Notify me when available' d='Modules.Emailalerts.Shop'}
 </a>
 
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index f9d7d37e..f20dfd64 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -54,7 +54,7 @@
             <div class="search-filters__header d-flex justify-content-between align-items-center mb-0 h5 position-relative">
               <span class="search-filters__title mb-0">{$facet.label}</span>
               {if $facet.widgetType != 'slider'}
-                <a href="#facet_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block" data-toggle="collapse"
+                <a href="#facet_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block" data-bs-toggle="collapse"
                   {if !$_collapse} aria-expanded="true" {/if}>
                   <span class="material-icons">&#xE313;</span>
                 </a>
diff --git a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
index 80a08f1c..3cda1f4e 100644
--- a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
+++ b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
@@ -25,7 +25,7 @@
 
 <div class="col-md-2 links wrapper">
   <h3 class="hidden-sm-down">{l s='Information' d='Modules.Legalcompliance.Shop'}</h3>
-  <div class="title clearfix hidden-md-up" data-target="#footer_eu_about_us_list" data-toggle="collapse">
+  <div class="title clearfix hidden-md-up" data-target="#footer_eu_about_us_list" data-bs-toggle="collapse">
     <span class="h3">{l s='Information' d='Modules.Legalcompliance.Shop'}</span>
     <span class="float-end">
       <span class="navbar-toggler collapse-icons">
diff --git a/modules/ps_linklist/views/templates/hook/linkblock-column.tpl b/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
index d6f261f5..dfd754c1 100644
--- a/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
+++ b/modules/ps_linklist/views/templates/hook/linkblock-column.tpl
@@ -3,7 +3,7 @@
     {assign var=_expand_id value=10|mt_rand:100000}
     <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
       <span class="h4 mb-0">{$linkBlock.title}</span>
-      <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
+      <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-bs-toggle="collapse">
         <i class="material-icons d-block"></i>
       </a>
     </div>
diff --git a/modules/ps_linklist/views/templates/hook/linkblock.tpl b/modules/ps_linklist/views/templates/hook/linkblock.tpl
index f96907b2..66ee64e6 100644
--- a/modules/ps_linklist/views/templates/hook/linkblock.tpl
+++ b/modules/ps_linklist/views/templates/hook/linkblock.tpl
@@ -28,7 +28,7 @@
       {assign var=_expand_id value=10|mt_rand:100000}
       <div class="d-flex align-items-center mb-3 justify-content-between position-relative">
         <span class="h4 mb-0">{$linkBlock.title}</span>
-        <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-toggle="collapse">
+        <a href="#footer_sub_menu_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block d-md-none" data-bs-toggle="collapse">
           <i class="material-icons d-block"></i>
         </a>
       </div>
diff --git a/modules/ps_mainmenu/ps_mainmenu.tpl b/modules/ps_mainmenu/ps_mainmenu.tpl
index a6b8dff4..cab23050 100644
--- a/modules/ps_mainmenu/ps_mainmenu.tpl
+++ b/modules/ps_mainmenu/ps_mainmenu.tpl
@@ -25,7 +25,7 @@
             {* Cannot use page identifier as we can have the same page several times *}
             {assign var=_expand_id value=10|mt_rand:100000}
             <span class="d-block d-md-none">
-                <span data-target="#top_sub_menu_{$_expand_id}" data-toggle="collapse"
+                <span data-target="#top_sub_menu_{$_expand_id}" data-bs-toggle="collapse"
                       class="d-block navbar-toggler icon-collapse">
                   <i class="material-icons">&#xE313;</i>
                 </span>
diff --git a/modules/ps_sharebuttons/views/templates/hook/ps_sharebuttons.tpl b/modules/ps_sharebuttons/views/templates/hook/ps_sharebuttons.tpl
index b286b945..e91afa48 100644
--- a/modules/ps_sharebuttons/views/templates/hook/ps_sharebuttons.tpl
+++ b/modules/ps_sharebuttons/views/templates/hook/ps_sharebuttons.tpl
@@ -37,7 +37,7 @@
               rel="noopener noreferrer"
               class="btn btn-light p-2 rounded-circle btn-lg">
               <span class="icon icon-{$social_share_link.class} d-block"></span>
-              <div class="sr-only">
+              <div class="visually-hidden">
                 {$social_share_link.label}
               </div>
             </a>
diff --git a/modules/ps_socialfollow/ps_socialfollow.tpl b/modules/ps_socialfollow/ps_socialfollow.tpl
index 739f01ed..a12b94d2 100644
--- a/modules/ps_socialfollow/ps_socialfollow.tpl
+++ b/modules/ps_socialfollow/ps_socialfollow.tpl
@@ -30,7 +30,7 @@
         <li class="col flex-grow-0 flex-shrink-0 mb-2">
           <a href="{$social_link.url}" rel="noopener noreferrer" title="{$social_link.label}" target="_blank" class="btn btn-light p-2 rounded-circle btn-lg">
             <span class="icon icon-{$social_link.class} d-block"></span>
-            <div class="sr-only">
+            <div class="visually-hidden">
               {$social_link.label}
             </div>
           </a>
diff --git a/modules/ps_supplierlist/views/templates/_partials/supplier_form.tpl b/modules/ps_supplierlist/views/templates/_partials/supplier_form.tpl
index bfc6441d..eba8e3af 100644
--- a/modules/ps_supplierlist/views/templates/_partials/supplier_form.tpl
+++ b/modules/ps_supplierlist/views/templates/_partials/supplier_form.tpl
@@ -27,7 +27,7 @@
   <button
     class="btn-unstyle select-title"
     rel="nofollow"
-    data-toggle="dropdown"
+    data-bs-toggle="dropdown"
     aria-haspopup="true"
     aria-expanded="false">
     {l s='All suppliers' d='Shop.Theme.Catalog'}
diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
index e89f782d..cfe177ee 100644
--- a/templates/_partials/header.tpl
+++ b/templates/_partials/header.tpl
@@ -54,7 +54,7 @@
                                     class="header-top__link"
                                     rel="nofollow"
                                     href="#"
-                                    data-toggle="modal"
+                                    data-bs-toggle="modal"
                                     data-target="#mobile_top_menu_wrapper"
                             >
                                 <div class="header-top__icon-container">
diff --git a/templates/_partials/page-loader.tpl b/templates/_partials/page-loader.tpl
index 26d8e820..67b290bf 100644
--- a/templates/_partials/page-loader.tpl
+++ b/templates/_partials/page-loader.tpl
@@ -1,3 +1,3 @@
 <div class="page-loader">
-  <div class="spinner-border text-primary" role="status"><span class="sr-only">{l s='Loading...' d='Shop.Theme.Global'}</span></div>
+  <div class="spinner-border text-primary" role="status"><span class="visually-hidden">{l s='Loading...' d='Shop.Theme.Global'}</span></div>
 </div>
diff --git a/templates/_partials/pagination.tpl b/templates/_partials/pagination.tpl
index 680953a6..3829e9a4 100644
--- a/templates/_partials/pagination.tpl
+++ b/templates/_partials/pagination.tpl
@@ -46,10 +46,10 @@
               >
                 {if $page.type === 'previous'}
                   <span class="material-icons font-reset align-middle">keyboard_arrow_left</span>
-                  <span class="sr-only">{l s='Previous' d='Shop.Theme.Actions'}</span>
+                  <span class="visually-hidden">{l s='Previous' d='Shop.Theme.Actions'}</span>
                 {elseif $page.type === 'next'}
                   <span class="material-icons font-reset align-middle">keyboard_arrow_right</span>
-                  <span class="sr-only">{l s='Next' d='Shop.Theme.Actions'}</span>
+                  <span class="visually-hidden">{l s='Next' d='Shop.Theme.Actions'}</span>
                 {else}
                   {$page.page}
                 {/if}
diff --git a/templates/catalog/_partials/product-cover-thumbnails.tpl b/templates/catalog/_partials/product-cover-thumbnails.tpl
index 3b90e2e0..6e8a9f25 100644
--- a/templates/catalog/_partials/product-cover-thumbnails.tpl
+++ b/templates/catalog/_partials/product-cover-thumbnails.tpl
@@ -99,11 +99,11 @@
                 </div>
 
                 <div class="swiper-button-prev swiper-button-custom">
-                  <span class="sr-only">{l s='Previous' d='Shop.Theme.Actions'}</span>
+                  <span class="visually-hidden">{l s='Previous' d='Shop.Theme.Actions'}</span>
                   <span class="material-icons">keyboard_arrow_left</span>
                 </div>
                 <div class="swiper-button-next swiper-button-custom">
-                  <span class="sr-only">{l s='Next' d='Shop.Theme.Actions'}</span>
+                  <span class="visually-hidden">{l s='Next' d='Shop.Theme.Actions'}</span>
                   <span class="material-icons">keyboard_arrow_right</span>
                 </div>
               </div>
@@ -124,7 +124,7 @@
             {/images_block}
           {/if}
 
-          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle hidden-sm-down" data-toggle="modal" data-target="#product-modal">
+          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle hidden-sm-down" data-bs-toggle="modal" data-target="#product-modal">
             <span class="material-icons font-reset line-height-reset">zoom_in</span>
           </a>
 
diff --git a/templates/catalog/_partials/product-images-modal.tpl b/templates/catalog/_partials/product-images-modal.tpl
index ce51b686..cf6b7e6d 100644
--- a/templates/catalog/_partials/product-images-modal.tpl
+++ b/templates/catalog/_partials/product-images-modal.tpl
@@ -89,11 +89,11 @@
 
           {if $product.images|count > 1}
             <div class="swiper-button-prev swiper-button-custom">
-              <span class="sr-only">{l s='Previous' d='Shop.Theme.Actions'}</span>
+              <span class="visually-hidden">{l s='Previous' d='Shop.Theme.Actions'}</span>
               <span class="material-icons">keyboard_arrow_left</span>
             </div>
             <div class="swiper-button-next swiper-button-custom">
-              <span class="sr-only">{l s='Next' d='Shop.Theme.Actions'}</span>
+              <span class="visually-hidden">{l s='Next' d='Shop.Theme.Actions'}</span>
               <span class="material-icons">keyboard_arrow_right</span>
             </div>
           {/if}
diff --git a/templates/catalog/_partials/product-tabs.tpl b/templates/catalog/_partials/product-tabs.tpl
index 29bde39d..fff61f90 100644
--- a/templates/catalog/_partials/product-tabs.tpl
+++ b/templates/catalog/_partials/product-tabs.tpl
@@ -6,7 +6,7 @@
           <li class="nav-item">
             <a
               class="nav-link"
-              data-toggle="tab"
+              data-bs-toggle="tab"
               href="#description"
               role="tab"
               aria-controls="description"
@@ -16,7 +16,7 @@
         <li class="nav-item">
           <a
             class="nav-link"
-            data-toggle="tab"
+            data-bs-toggle="tab"
             href="#product-details"
             role="tab"
             aria-controls="product-details"
@@ -26,7 +26,7 @@
           <li class="nav-item">
             <a
               class="nav-link"
-              data-toggle="tab"
+              data-bs-toggle="tab"
               href="#attachments"
               role="tab"
               aria-controls="attachments">{l s='Attachments' d='Shop.Theme.Catalog'}</a>
@@ -36,7 +36,7 @@
           <li class="nav-item">
             <a
               class="nav-link"
-              data-toggle="tab"
+              data-bs-toggle="tab"
               href="#extra-{$extraKey}"
               role="tab"
               aria-controls="extra-{$extraKey}">{$extra.title}</a>
diff --git a/templates/catalog/_partials/product-variants.tpl b/templates/catalog/_partials/product-variants.tpl
index 7992dca8..5b24744f 100644
--- a/templates/catalog/_partials/product-variants.tpl
+++ b/templates/catalog/_partials/product-variants.tpl
@@ -54,7 +54,7 @@
                       {/if}
                     >
                     </span>
-                    <span class="sr-only">
+                    <span class="visually-hidden">
                       {$group_attribute.name}
                     </span>
                 </label>
diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
index a2d0180f..6e3e1c18 100644
--- a/templates/catalog/_partials/products-top.tpl
+++ b/templates/catalog/_partials/products-top.tpl
@@ -37,10 +37,10 @@
 
   <div class="col-sm-auto col-12 mt-2 d-md-none ms-auto">
     {if !empty($listing.rendered_facets)}
-      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
+      <button data-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
-      <button data-target="#mobile_filters" data-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
+      <button data-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
     {/if}
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 84552c6f..4d7bc466 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -71,7 +71,7 @@
         {block name='cart_detailed_product_line_customization'}
           <div class="mt-3">
             {foreach from=$product.customizations item="customization"}
-              <a href="#" data-toggle="modal"
+              <a href="#" data-bs-toggle="modal"
                 data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
               <div class="modal fade customization-modal js-customization-modal" id="product-customizations-modal-{$customization.id_customization}"
                 tabindex="-1" role="dialog" aria-hidden="true">
diff --git a/templates/checkout/_partials/cart-detailed.tpl b/templates/checkout/_partials/cart-detailed.tpl
index 06550c4f..a694c608 100644
--- a/templates/checkout/_partials/cart-detailed.tpl
+++ b/templates/checkout/_partials/cart-detailed.tpl
@@ -24,7 +24,7 @@
  *}
 {block name='cart_detailed_product'}
   <div class="cart-overview card-body js-cart position-relative" data-refresh-url="{url entity='cart' params=['ajax' => true, 'action' => 'refresh']}">
-  <div class="cart-loader"><div class="spinner-border text-primary" role="status"><span class="sr-only">{l s='Loading...' d='Shop.Theme.Global'}</span></div></div>
+  <div class="cart-loader"><div class="spinner-border text-primary" role="status"><span class="visually-hidden">{l s='Loading...' d='Shop.Theme.Global'}</span></div></div>
     {if $cart.products}
       <div class="cart-items">
         {foreach from=$cart.products item=product}
diff --git a/templates/checkout/_partials/steps/personal-information.tpl b/templates/checkout/_partials/steps/personal-information.tpl
index 3be569d3..fdbf84e4 100644
--- a/templates/checkout/_partials/steps/personal-information.tpl
+++ b/templates/checkout/_partials/steps/personal-information.tpl
@@ -60,7 +60,7 @@
         <li class="nav-item">
           <a
             class="nav-link {if !$show_login_form}active{/if}"
-            data-toggle="tab"
+            data-bs-toggle="tab"
             href="#checkout-guest-form"
             role="tab"
             aria-controls="checkout-guest-form"
@@ -78,7 +78,7 @@
           <a
             class="nav-link {if $show_login_form}active{/if}"
             data-link-action="show-login-form"
-            data-toggle="tab"
+            data-bs-toggle="tab"
             href="#checkout-login-form"
             role="tab"
             aria-controls="checkout-login-form"
diff --git a/templates/cms/stores.tpl b/templates/cms/stores.tpl
index c521a2e3..bce630a9 100644
--- a/templates/cms/stores.tpl
+++ b/templates/cms/stores.tpl
@@ -96,7 +96,7 @@
             {if $store.note || $store.phone || $store.fax || $store.email}
               <div class="col-12">
                 <div class="pt-3 mt-4 border-top text-center">
-                  <a data-toggle="collapse" class="icon-collapse d-inline-flex" href="#about-{$store.id}" aria-expanded="false" aria-controls="about-{$store.id}">
+                  <a data-bs-toggle="collapse" class="icon-collapse d-inline-flex" href="#about-{$store.id}" aria-expanded="false" aria-controls="about-{$store.id}">
                     {l s='About and Contact' d='Shop.Theme.Global'}
                     <span class="material-icons"></span>
                   </a>
diff --git a/templates/components/featured-products.tpl b/templates/components/featured-products.tpl
index 84c53aa4..fd4237b1 100644
--- a/templates/components/featured-products.tpl
+++ b/templates/components/featured-products.tpl
@@ -10,11 +10,11 @@
         {/block}
         <div class="featured-products__navigation d-flex flex-grow-0 flex-shrink-0 ms-auto">
           <div class="swiper-button-prev swiper-button-custom position-static">
-            <span class="sr-only">{l s='Previous' d='Shop.Theme.Actions'}</span>
+            <span class="visually-hidden">{l s='Previous' d='Shop.Theme.Actions'}</span>
             <span class="material-icons">keyboard_arrow_left</span>
           </div>
           <div class="swiper-button-next swiper-button-custom position-static">
-            <span class="sr-only">{l s='Next' d='Shop.Theme.Actions'}</span>
+            <span class="visually-hidden">{l s='Next' d='Shop.Theme.Actions'}</span>
             <span class="material-icons">keyboard_arrow_right</span>
           </div>
         </div>
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 8993e548..663b8d6e 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -79,10 +79,10 @@
     </p>
 
     <div class="text-center">
-      <button class="btn btn-primary d-none d-md-inline-block" data-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary d-none d-md-inline-block" data-bs-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
-      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-bs-toggle="modal" data-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
     </div>
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index 80fc83e6..ece0b98b 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -107,7 +107,7 @@
         {if $product.customizations}
           {foreach from=$product.customizations item="customization"}
             <div class="customization">
-              <a href="#" data-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
+              <a href="#" data-bs-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
             </div>
             <div id="_desktop_product_customization_modal_wrapper_{$customization.id_customization}">
               <div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}" tabindex="-1" role="dialog" aria-hidden="true">
diff --git a/templates/customer/order-return.tpl b/templates/customer/order-return.tpl
index 2838eab9..a228d499 100644
--- a/templates/customer/order-return.tpl
+++ b/templates/customer/order-return.tpl
@@ -57,7 +57,7 @@
               {if $product.customizations}
                 {foreach from=$product.customizations item="customization"}
                   <div class="customization">
-                    <a href="#" data-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
+                    <a href="#" data-bs-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
                   </div>
                   <div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}" tabindex="-1" role="dialog" aria-hidden="true">
                     <div class="modal-dialog" role="document">

From a775b69c780701329fbb0d4c0231db356b380dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 01:58:38 +0200
Subject: [PATCH 05/17] changed primary color, disabled link decoration

---
 _dev/css/abstracts/variables/bootstrap/_colors.scss     | 2 +-
 _dev/css/abstracts/variables/bootstrap/_typography.scss | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/_dev/css/abstracts/variables/bootstrap/_colors.scss b/_dev/css/abstracts/variables/bootstrap/_colors.scss
index 3ef3427c..f73d992a 100644
--- a/_dev/css/abstracts/variables/bootstrap/_colors.scss
+++ b/_dev/css/abstracts/variables/bootstrap/_colors.scss
@@ -23,7 +23,7 @@ $green:   #28a745;
 $teal:    #20c997;
 $cyan:    #17a2b8;
 
-$primary:       $blue;
+$primary:       $gray-900;
 $secondary:     $gray-600;
 $success:       $green;
 $info:          $cyan;
diff --git a/_dev/css/abstracts/variables/bootstrap/_typography.scss b/_dev/css/abstracts/variables/bootstrap/_typography.scss
index 3423a8c7..97cf05c4 100644
--- a/_dev/css/abstracts/variables/bootstrap/_typography.scss
+++ b/_dev/css/abstracts/variables/bootstrap/_typography.scss
@@ -37,3 +37,5 @@ $headings-margin-bottom:      rem-calc(20px);
 $headings-font-weight:        700;
 $headings-line-height:        1.2;
 $headings-color:              $gray-900;
+
+$link-decoration:             none;

From 74ce0ff9d5e1a5727410ff49f0f78ab51d46a3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 02:03:45 +0200
Subject: [PATCH 06/17] bs5 display utils migration

---
 modules/ps_facetedsearch/ps_facetedsearch.tpl             | 4 ++--
 .../views/templates/hook/hookDisplayFooter.tpl            | 4 ++--
 modules/ps_rssfeed/views/templates/hook/ps_rssfeed.tpl    | 2 +-
 .../_partials/miniatures/_partials/product-variants.tpl   | 2 +-
 templates/catalog/_partials/product-cover-thumbnails.tpl  | 2 +-
 templates/catalog/_partials/products.tpl                  | 2 +-
 templates/catalog/listing/product-list.tpl                | 2 +-
 templates/cms/stores.tpl                                  | 2 +-
 templates/customer/discount.tpl                           | 4 ++--
 templates/customer/history.tpl                            | 8 ++++----
 templates/customer/order-detail.tpl                       | 6 +++---
 templates/customer/order-follow.tpl                       | 4 ++--
 templates/customer/order-slip.tpl                         | 4 ++--
 13 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/modules/ps_facetedsearch/ps_facetedsearch.tpl b/modules/ps_facetedsearch/ps_facetedsearch.tpl
index 3676fc67..d274b6c3 100644
--- a/modules/ps_facetedsearch/ps_facetedsearch.tpl
+++ b/modules/ps_facetedsearch/ps_facetedsearch.tpl
@@ -23,8 +23,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 {if isset($listing.rendered_facets)}
-  <div id="search_filters_wrapper" class="hidden-sm-down">
-    <div id="search_filter_controls" class="hidden-md-up">
+  <div id="search_filters_wrapper" class="d-none d-md-block">
+    <div id="search_filter_controls" class="d-md-none">
         <span id="_mobile_search_filters_clear_all"></span>
         <button class="btn btn-secondary ok">
           <i class="material-icons rtl-no-flip">&#xE876;</i>
diff --git a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
index 3cda1f4e..2c0ee38a 100644
--- a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
+++ b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
@@ -24,8 +24,8 @@
  *}
 
 <div class="col-md-2 links wrapper">
-  <h3 class="hidden-sm-down">{l s='Information' d='Modules.Legalcompliance.Shop'}</h3>
-  <div class="title clearfix hidden-md-up" data-target="#footer_eu_about_us_list" data-bs-toggle="collapse">
+  <h3 class="d-none d-md-block">{l s='Information' d='Modules.Legalcompliance.Shop'}</h3>
+  <div class="title clearfix d-md-none" data-target="#footer_eu_about_us_list" data-bs-toggle="collapse">
     <span class="h3">{l s='Information' d='Modules.Legalcompliance.Shop'}</span>
     <span class="float-end">
       <span class="navbar-toggler collapse-icons">
diff --git a/modules/ps_rssfeed/views/templates/hook/ps_rssfeed.tpl b/modules/ps_rssfeed/views/templates/hook/ps_rssfeed.tpl
index 7f6d64c9..02346045 100644
--- a/modules/ps_rssfeed/views/templates/hook/ps_rssfeed.tpl
+++ b/modules/ps_rssfeed/views/templates/hook/ps_rssfeed.tpl
@@ -24,7 +24,7 @@
  *}
 
 <div class="block-contact col-md-2 links wrapper">
-  <h3 class="h3 hidden-sm-down">{$title}</h3>
+  <h3 class="h3 d-none d-md-block">{$title}</h3>
   <div>
     {if $rss_links}
       <ul>
diff --git a/templates/catalog/_partials/miniatures/_partials/product-variants.tpl b/templates/catalog/_partials/miniatures/_partials/product-variants.tpl
index 5c04e48d..e8f3fb96 100644
--- a/templates/catalog/_partials/miniatures/_partials/product-variants.tpl
+++ b/templates/catalog/_partials/miniatures/_partials/product-variants.tpl
@@ -1,4 +1,4 @@
-<div class="product-miniature__information {if !$product.main_variants} product-miniature__information--no-variants{/if} hidden-sm-down">
+<div class="product-miniature__information {if !$product.main_variants} product-miniature__information--no-variants{/if} d-none d-md-block">
   {block name='product_variants'}
     {if $product.main_variants}
       {include file='catalog/_partials/variant-links.tpl' variants=$product.main_variants}
diff --git a/templates/catalog/_partials/product-cover-thumbnails.tpl b/templates/catalog/_partials/product-cover-thumbnails.tpl
index 6e8a9f25..71299e18 100644
--- a/templates/catalog/_partials/product-cover-thumbnails.tpl
+++ b/templates/catalog/_partials/product-cover-thumbnails.tpl
@@ -124,7 +124,7 @@
             {/images_block}
           {/if}
 
-          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle hidden-sm-down" data-bs-toggle="modal" data-target="#product-modal">
+          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle d-none d-md-block" data-bs-toggle="modal" data-target="#product-modal">
             <span class="material-icons font-reset line-height-reset">zoom_in</span>
           </a>
 
diff --git a/templates/catalog/_partials/products.tpl b/templates/catalog/_partials/products.tpl
index eae7fc60..6bcb4a83 100644
--- a/templates/catalog/_partials/products.tpl
+++ b/templates/catalog/_partials/products.tpl
@@ -30,7 +30,7 @@
     {include file='_partials/pagination.tpl' pagination=$listing.pagination}
   {/block}
 
-  <div class="hidden-md-up text-end up">
+  <div class="d-md-none text-end up">
     <a href="#header" class="btn btn-secondary">
       {l s='Back to top' d='Shop.Theme.Actions'}
     </a>
diff --git a/templates/catalog/listing/product-list.tpl b/templates/catalog/listing/product-list.tpl
index f7ed9b03..80afc7ae 100644
--- a/templates/catalog/listing/product-list.tpl
+++ b/templates/catalog/listing/product-list.tpl
@@ -55,7 +55,7 @@
         </div>
 
         {block name='product_list_active_filters'}
-          <div id="" class="hidden-sm-down">
+          <div id="" class="d-none d-md-block">
             {$listing.rendered_active_filters nofilter}
           </div>
         {/block}
diff --git a/templates/cms/stores.tpl b/templates/cms/stores.tpl
index bce630a9..4713abbf 100644
--- a/templates/cms/stores.tpl
+++ b/templates/cms/stores.tpl
@@ -35,7 +35,7 @@
       <article id="store-{$store.id}" class="store-item card mb-4">
         <div class="card-body">
           <div class="row align-items-center">
-            <div class="col-auto store-picture hidden-sm-down">
+            <div class="col-auto store-picture d-none d-md-block">
               <img
                 src="{$store.image.bySize.stores_default.url}"
                 {if !empty($store.image.legend)}
diff --git a/templates/customer/discount.tpl b/templates/customer/discount.tpl
index b5990721..2985df35 100644
--- a/templates/customer/discount.tpl
+++ b/templates/customer/discount.tpl
@@ -30,7 +30,7 @@
 
 {block name='page_content'}
   {if $cart_rules}
-    <table class="table table-striped table-bordered hidden-sm-down">
+    <table class="table table-striped table-bordered d-none d-md-block">
       <thead class="thead-default">
         <tr>
           <th>{l s='Code' d='Shop.Theme.Checkout'}</th>
@@ -64,7 +64,7 @@
         {/foreach}
       </tbody>
     </table>
-    <div class="cart-rules hidden-md-up">
+    <div class="cart-rules d-md-none">
       {foreach from=$cart_rules item=cart_rule}
         <div class="card mb-5">
           <div class="card-header">
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index 18d742ba..0c3821ff 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -32,14 +32,14 @@
   <h6>{l s='Here are the orders you\'ve placed since your account was created.' d='Shop.Theme.Customeraccount'}</h6>
 
   {if $orders}
-    <table class="table table-striped table-bordered hidden-sm-down">
+    <table class="table table-striped table-bordered d-none d-md-block">
       <thead class="thead-default">
         <tr>
           <th>{l s='Order reference' d='Shop.Theme.Checkout'}</th>
           <th>{l s='Date' d='Shop.Theme.Checkout'}</th>
           <th>{l s='Total price' d='Shop.Theme.Checkout'}</th>
-          <th class="hidden-md-down">{l s='Payment' d='Shop.Theme.Checkout'}</th>
-          <th class="hidden-md-down">{l s='Status' d='Shop.Theme.Checkout'}</th>
+          <th>{l s='Payment' d='Shop.Theme.Checkout'}</th>
+          <th>{l s='Status' d='Shop.Theme.Checkout'}</th>
           <th>&nbsp;</th>
         </tr>
       </thead>
@@ -57,7 +57,7 @@
                 {$order.totals.total.value}
               </span>
             </td>
-            <td class="hidden-md-down align-middle">{$order.details.payment}</td>
+            <td class="align-middle">{$order.details.payment}</td>
             <td class="align-middle">
               <span
                 class="label label-pill badge {if Tools::getBrightness($order.history.current.color) < 128}text-white{/if}"
diff --git a/templates/customer/order-detail.tpl b/templates/customer/order-detail.tpl
index a1035020..cbfbf400 100644
--- a/templates/customer/order-detail.tpl
+++ b/templates/customer/order-detail.tpl
@@ -76,7 +76,7 @@
     <section id="order-history" class="my-4">
       <div class="d-none d-md-block">
         <h3 class="h4">{l s='Follow your order\'s status step-by-step' d='Shop.Theme.Customeraccount'}</h3>
-        <table class="table table-striped table-bordered hidden-xs-down">
+        <table class="table table-striped table-bordered">
           <thead class="thead-default">
             <tr>
               <th>{l s='Date' d='Shop.Theme.Global'}</th>
@@ -170,7 +170,7 @@
   {block name='order_carriers'}
     {if $order.shipping}
       <div class="mb-4">
-        <table class="table table-striped table-bordered hidden-sm-down">
+        <table class="table table-striped table-bordered d-none d-md-block">
           <thead class="thead-default">
             <tr>
               <th>{l s='Date' d='Shop.Theme.Global'}</th>
@@ -192,7 +192,7 @@
             {/foreach}
           </tbody>
         </table>
-        <div class="hidden-md-up shipping-lines">
+        <div class="d-md-none shipping-lines">
           <div class="card">
             <div class="card-header">
               <h4 class="h5 mb-0 card-title">
diff --git a/templates/customer/order-follow.tpl b/templates/customer/order-follow.tpl
index dc876f14..1c5480b5 100644
--- a/templates/customer/order-follow.tpl
+++ b/templates/customer/order-follow.tpl
@@ -33,7 +33,7 @@
 
   {if $ordersReturn && count($ordersReturn)}
 
-    <table class="table table-striped table-bordered hidden-sm-down">
+    <table class="table table-striped table-bordered d-none d-md-block">
       <thead class="thead-default">
         <tr>
           <th>{l s='Order' d='Shop.Theme.Customeraccount'}</th>
@@ -68,7 +68,7 @@
         {/foreach}
       </tbody>
     </table>
-    <div class="order-returns hidden-md-up">
+    <div class="order-returns d-md-none">
       {foreach from=$ordersReturn item=return}
         <div class="card">
 
diff --git a/templates/customer/order-slip.tpl b/templates/customer/order-slip.tpl
index 902c7ce8..d462f3bd 100644
--- a/templates/customer/order-slip.tpl
+++ b/templates/customer/order-slip.tpl
@@ -32,7 +32,7 @@
   <h6>{l s='Credit slips you have received after canceled orders.' d='Shop.Theme.Customeraccount'}</h6>
 
   {if $credit_slips}
-    <table class="table table-striped table-bordered hidden-sm-down">
+    <table class="table table-striped table-bordered d-none d-md-block">
       <thead class="thead-default">
         <tr>
           <th>{l s='Order' d='Shop.Theme.Customeraccount'}</th>
@@ -57,7 +57,7 @@
         {/foreach}
       </tbody>
     </table>
-    <div class="credit-slips hidden-md-up">
+    <div class="credit-slips d-md-none">
       {foreach from=$credit_slips item=slip}
         <div class="card mb-5">
           <div class="card-header">

From 1182d5c38674c15f3cf36a3f02de9bdef849585b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 02:07:53 +0200
Subject: [PATCH 07/17] removed not used template

---
 .../views/templates/hook/slider.tpl           | 59 -------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 modules/ps_imageslider/views/templates/hook/slider.tpl

diff --git a/modules/ps_imageslider/views/templates/hook/slider.tpl b/modules/ps_imageslider/views/templates/hook/slider.tpl
deleted file mode 100644
index 75b16e92..00000000
--- a/modules/ps_imageslider/views/templates/hook/slider.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author    PrestaShop SA and Contributors <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- *}
-
-{if $homeslider.slides}
-  <div id="carousel" data-ride="carousel" class="carousel slide" data-interval="{$homeslider.speed}" data-wrap="{(string)$homeslider.wrap}" data-pause="{$homeslider.pause}" data-touch="true">
-    <ol class="carousel-indicators">
-      {foreach from=$homeslider.slides item=slide key=idxSlide name='homeslider'}
-      <li data-target="#carousel" data-slide-to="{$idxSlide}"{if $idxSlide == 0} class="active"{/if}></li>
-      {/foreach}
-    </ol>
-    <ul class="carousel-inner" role="listbox">
-      {foreach from=$homeslider.slides item=slide name='homeslider'}
-        <li class="carousel-item {if $smarty.foreach.homeslider.first}active{/if}" role="option" aria-hidden="{if $smarty.foreach.homeslider.first}false{else}true{/if}">
-          <a href="{$slide.url}">
-            <figure>
-              <img src="{$slide.image_url}" alt="{$slide.legend|escape}" loading="lazy">
-              {if $slide.title || $slide.description}
-                <figcaption class="caption">
-                  <h2 class="display-1 text-uppercase">{$slide.title}</h2>
-                  <div class="caption-description">{$slide.description nofilter}</div>
-                </figcaption>
-              {/if}
-            </figure>
-          </a>
-        </li>
-      {/foreach}
-    </ul>
-    <div class="direction" aria-label="{l s='Carousel buttons' d='Shop.Theme.Global'}">
-      <a class="left carousel-control" href="#carousel" role="button" data-slide="prev" aria-label="{l s='Previous' d='Shop.Theme.Global'}">
-        {l s='Previous' d='Shop.Theme.Global'}
-      </a>
-      <a class="right carousel-control" href="#carousel" role="button" data-slide="next" aria-label="{l s='Next' d='Shop.Theme.Global'}">
-        {l s='Next' d='Shop.Theme.Global'}
-      </a>
-    </div>
-  </div>
-{/if}

From eaa89c9f35ea7a65d94ae65a64533a0acec0380d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 02:08:14 +0200
Subject: [PATCH 08/17] bs5 data attributes fixes

---
 modules/ps_emailalerts/views/templates/hook/product.tpl       | 2 +-
 .../views/templates/hook/hookDisplayFooter.tpl                | 2 +-
 modules/ps_mainmenu/ps_mainmenu.tpl                           | 2 +-
 templates/_partials/header.tpl                                | 2 +-
 templates/catalog/_partials/product-cover-thumbnails.tpl      | 2 +-
 templates/catalog/_partials/products-top.tpl                  | 4 ++--
 templates/checkout/_partials/cart-detailed-product-line.tpl   | 2 +-
 templates/checkout/_partials/steps/checkout-step.tpl          | 2 +-
 templates/customer/_partials/order-detail-return.tpl          | 4 ++--
 templates/customer/_partials/order-details-return-table.tpl   | 2 +-
 templates/customer/order-return.tpl                           | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/ps_emailalerts/views/templates/hook/product.tpl b/modules/ps_emailalerts/views/templates/hook/product.tpl
index 8802d306..0c0b6bab 100644
--- a/modules/ps_emailalerts/views/templates/hook/product.tpl
+++ b/modules/ps_emailalerts/views/templates/hook/product.tpl
@@ -23,7 +23,7 @@
 * International Registered Trademark & Property of PrestaShop SA
 *}
 
-<a href="#" rel="nofollow" data-bs-toggle="modal" data-target="#email-alert-modal" class="btn btn-primary js-mailalert-modal-btn">
+<a href="#" rel="nofollow" data-bs-toggle="modal" data-bs-target="#email-alert-modal" class="btn btn-primary js-mailalert-modal-btn">
     {l s='Notify me when available' d='Modules.Emailalerts.Shop'}
 </a>
 
diff --git a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
index 2c0ee38a..aae4b572 100644
--- a/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
+++ b/modules/ps_legalcompliance/views/templates/hook/hookDisplayFooter.tpl
@@ -25,7 +25,7 @@
 
 <div class="col-md-2 links wrapper">
   <h3 class="d-none d-md-block">{l s='Information' d='Modules.Legalcompliance.Shop'}</h3>
-  <div class="title clearfix d-md-none" data-target="#footer_eu_about_us_list" data-bs-toggle="collapse">
+  <div class="title clearfix d-md-none" data-bs-target="#footer_eu_about_us_list" data-bs-toggle="collapse">
     <span class="h3">{l s='Information' d='Modules.Legalcompliance.Shop'}</span>
     <span class="float-end">
       <span class="navbar-toggler collapse-icons">
diff --git a/modules/ps_mainmenu/ps_mainmenu.tpl b/modules/ps_mainmenu/ps_mainmenu.tpl
index cab23050..136f0b13 100644
--- a/modules/ps_mainmenu/ps_mainmenu.tpl
+++ b/modules/ps_mainmenu/ps_mainmenu.tpl
@@ -25,7 +25,7 @@
             {* Cannot use page identifier as we can have the same page several times *}
             {assign var=_expand_id value=10|mt_rand:100000}
             <span class="d-block d-md-none">
-                <span data-target="#top_sub_menu_{$_expand_id}" data-bs-toggle="collapse"
+                <span data-bs-target="#top_sub_menu_{$_expand_id}" data-bs-toggle="collapse"
                       class="d-block navbar-toggler icon-collapse">
                   <i class="material-icons">&#xE313;</i>
                 </span>
diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl
index cfe177ee..b10cb7c4 100644
--- a/templates/_partials/header.tpl
+++ b/templates/_partials/header.tpl
@@ -55,7 +55,7 @@
                                     rel="nofollow"
                                     href="#"
                                     data-bs-toggle="modal"
-                                    data-target="#mobile_top_menu_wrapper"
+                                    data-bs-target="#mobile_top_menu_wrapper"
                             >
                                 <div class="header-top__icon-container">
                                     <span class="header-top__icon material-icons">menu</span>
diff --git a/templates/catalog/_partials/product-cover-thumbnails.tpl b/templates/catalog/_partials/product-cover-thumbnails.tpl
index 71299e18..340c9963 100644
--- a/templates/catalog/_partials/product-cover-thumbnails.tpl
+++ b/templates/catalog/_partials/product-cover-thumbnails.tpl
@@ -124,7 +124,7 @@
             {/images_block}
           {/if}
 
-          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle d-none d-md-block" data-bs-toggle="modal" data-target="#product-modal">
+          <a class="product-main-images__modal-trigger-layer btn btn-light shadow rounded-circle d-none d-md-block" data-bs-toggle="modal" data-bs-target="#product-modal">
             <span class="material-icons font-reset line-height-reset">zoom_in</span>
           </a>
 
diff --git a/templates/catalog/_partials/products-top.tpl b/templates/catalog/_partials/products-top.tpl
index 6e3e1c18..95d9a3e6 100644
--- a/templates/catalog/_partials/products-top.tpl
+++ b/templates/catalog/_partials/products-top.tpl
@@ -37,10 +37,10 @@
 
   <div class="col-sm-auto col-12 mt-2 d-md-none ms-auto">
     {if !empty($listing.rendered_facets)}
-      <button data-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
+      <button data-bs-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-sm-inline-block d-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
-      <button data-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
+      <button data-bs-target="#mobile_filters" data-bs-toggle="modal" class="btn btn-secondary d-block text-center w-100 d-sm-none">
         {l s='Filter' d='Shop.Theme.Actions'}
       </button>
     {/if}
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 4d7bc466..25a85bab 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -72,7 +72,7 @@
           <div class="mt-3">
             {foreach from=$product.customizations item="customization"}
               <a href="#" data-bs-toggle="modal"
-                data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
+                data-bs-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
               <div class="modal fade customization-modal js-customization-modal" id="product-customizations-modal-{$customization.id_customization}"
                 tabindex="-1" role="dialog" aria-hidden="true">
                 <div class="modal-dialog" role="document">
diff --git a/templates/checkout/_partials/steps/checkout-step.tpl b/templates/checkout/_partials/steps/checkout-step.tpl
index 84b85bd0..4fc0956d 100644
--- a/templates/checkout/_partials/steps/checkout-step.tpl
+++ b/templates/checkout/_partials/steps/checkout-step.tpl
@@ -52,7 +52,7 @@
           <a
             href="#"
             class="ms-auto checkout-step__edit-btn step-edit js-step-edit text-muted btn btn-sm btn-link py-0 stretched-link"
-            data-target="#content-{$identifier}">
+            data-bs-target="#content-{$identifier}">
             <span class="d-inline-flex align-items-center">
               <span class="material-icons font-sm me-1 btn-icon">mode_edit</span>
               {l s='Edit' d='Shop.Theme.Actions'}
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 663b8d6e..0f17c6a2 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -79,10 +79,10 @@
     </p>
 
     <div class="text-center">
-      <button class="btn btn-primary d-none d-md-inline-block" data-bs-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary d-none d-md-inline-block" data-bs-toggle="modal" data-bs-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
-      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-bs-toggle="modal" data-target="#order-return-modal">
+      <button class="btn btn-primary text-center w-100 d-block d-md-none" data-bs-toggle="modal" data-bs-target="#order-return-modal">
         {l s='Request a return' d='Shop.Theme.Customeraccount'}
       </button>
     </div>
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index ece0b98b..e90821c3 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -107,7 +107,7 @@
         {if $product.customizations}
           {foreach from=$product.customizations item="customization"}
             <div class="customization">
-              <a href="#" data-bs-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
+              <a href="#" data-bs-toggle="modal" data-bs-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
             </div>
             <div id="_desktop_product_customization_modal_wrapper_{$customization.id_customization}">
               <div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}" tabindex="-1" role="dialog" aria-hidden="true">
diff --git a/templates/customer/order-return.tpl b/templates/customer/order-return.tpl
index a228d499..b8be697d 100644
--- a/templates/customer/order-return.tpl
+++ b/templates/customer/order-return.tpl
@@ -57,7 +57,7 @@
               {if $product.customizations}
                 {foreach from=$product.customizations item="customization"}
                   <div class="customization">
-                    <a href="#" data-bs-toggle="modal" data-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
+                    <a href="#" data-bs-toggle="modal" data-bs-target="#product-customizations-modal-{$customization.id_customization}">{l s='Product customization' d='Shop.Theme.Catalog'}</a>
                   </div>
                   <div class="modal fade customization-modal" id="product-customizations-modal-{$customization.id_customization}" tabindex="-1" role="dialog" aria-hidden="true">
                     <div class="modal-dialog" role="document">

From f5fc9364ab25e2e0d09450c281aa6110a435a710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 12:29:31 +0200
Subject: [PATCH 09/17] Form initial changes

---
 _dev/js/theme/components/form.js              |  14 +-
 .../views/templates/widget/contactform.tpl    |  12 +-
 .../templates/hook/post-comment-modal.tpl     |   6 +-
 .../hook/product-comment-item-prototype.tpl   |   2 +-
 .../views/templates/hook/product-modal.tpl    |   2 +-
 .../templates/hook/displayGDPRConsent.tpl     |   2 +-
 templates/_partials/form-fields.tpl           | 236 +++++++++++-------
 .../_partials/cart-detailed-product-line.tpl  |   2 +-
 .../_partials/cart-summary-product-line.tpl   |   4 +-
 templates/checkout/_partials/cart-voucher.tpl |   2 +-
 .../checkout/_partials/customer-form.tpl      |   2 +-
 .../checkout/_partials/steps/shipping.tpl     |   4 +-
 .../_partials/account-transformation-form.tpl |   2 +-
 .../_partials/order-details-return-modal.tpl  |   2 +-
 .../_partials/order-details-return-table.tpl  |   2 +-
 .../customer/_partials/order-messages.tpl     |   4 +-
 .../customer/_partials/product-table-line.tpl |   2 +-
 templates/customer/discount.tpl               |   2 +-
 templates/customer/guest-login.tpl            |   4 +-
 templates/customer/history.tpl                |   2 +-
 templates/customer/password-email.tpl         |   2 +-
 templates/customer/password-new.tpl           |   4 +-
 22 files changed, 177 insertions(+), 137 deletions(-)

diff --git a/_dev/js/theme/components/form.js b/_dev/js/theme/components/form.js
index 2be7dde0..2134e7d1 100644
--- a/_dev/js/theme/components/form.js
+++ b/_dev/js/theme/components/form.js
@@ -19,20 +19,10 @@ const supportedValidity = () => {
 
 export default class Form {
   static init() {
-    Form.parentFocus();
     Form.togglePasswordVisibility();
     Form.formValidation();
   }
 
-  static parentFocus() {
-    $('.js-child-focus').on('focus', ({ target }) => {
-      $(target).closest('.js-parent-focus').addClass('focus');
-    });
-    $('.js-child-focus').on('focusout', ({ target }) => {
-      $(target).closest('.js-parent-focus').removeClass('focus');
-    });
-  }
-
   static togglePasswordVisibility() {
     $('[data-action="show-password"]').on('click', (e) => {
       e.preventDefault();
@@ -40,8 +30,8 @@ export default class Form {
 
       const $btn = $(e.currentTarget);
       const $input = $btn
-        .closest('.input-group')
-        .children('input.js-visible-password');
+        .closest('.js-parent-focus')
+        .find('.js-visible-password');
 
       if ($input.attr('type') === 'password') {
         $input.attr('type', 'text');
diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index 7343c7c4..3df717bb 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -46,7 +46,7 @@
       {if !$notifications || $notifications.nw_error}
         <section class="form-fields">
 
-          <div class="form-group">
+          <div class="mb-3">
             <label class="form-control-label">{l s='Subject' d='Shop.Forms.Labels'}</label>
             <select name="id_contact" class="custom-select">
               {foreach from=$contact.contacts item=contact_elt}
@@ -55,7 +55,7 @@
             </select>
           </div>
 
-          <div class="form-group">
+          <div class="mb-3">
             <label class="form-control-label">{l s='Email address' d='Shop.Forms.Labels'}</label>
             <input
               class="form-control"
@@ -67,7 +67,7 @@
           </div>
 
           {if $contact.orders}
-            <div class="form-group">
+            <div class="mb-3">
               <label class="form-control-label">{l s='Order reference' d='Shop.Forms.Labels'}</label>
               <select name="id_order" class="custom-select">
                 <option value="">{l s='Select reference' d='Shop.Forms.Help'}</option>
@@ -82,7 +82,7 @@
           {/if}
 
           {if $contact.allow_file_upload}
-            <div class="form-group">
+            <div class="mb-3">
               <label class="form-control-label">{l s='Attachment' d='Shop.Forms.Labels'}</label>
 
               <div class="custom-file">
@@ -95,7 +95,7 @@
             </div>
           {/if}
 
-          <div class="form-group">
+          <div class="mb-3">
             <label class="form-control-label">{l s='Message' d='Shop.Forms.Labels'}</label>
             <textarea
               class="form-control"
@@ -106,7 +106,7 @@
           </div>
 
           {if isset($id_module)}
-            <div class="form-group">
+            <div class="mb-3">
               {hook h='displayGDPRConsent' id_module=$id_module}
             </div>
           {/if}
diff --git a/modules/productcomments/views/templates/hook/post-comment-modal.tpl b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
index a964343e..8dfc383e 100644
--- a/modules/productcomments/views/templates/hook/post-comment-modal.tpl
+++ b/modules/productcomments/views/templates/hook/post-comment-modal.tpl
@@ -55,19 +55,19 @@
             </ul>
           {/if}
 
-          <div class="form-group">
+          <div class="mb-3">
             <label for="comment_title" class="form-label required">{l s='Title' d='Modules.Productcomments.Shop'}</label>
             <input class="form-control" id="comment_title" name="comment_title" type="text" value=""/>
           </div>
 
           {if !$logged}
-            <div class="form-group">
+            <div class="mb-3">
               <label class="form-label required" for="customer_name">{l s='Your name' d='Modules.Productcomments.Shop'}</label>
               <input class="form-control" id="customer_name" name="customer_name" type="text" value=""/>
             </div>
           {/if}
 
-          <div class="form-group">
+          <div class="mb-3">
             <label class="form-label required" for="comment_content">{l s='Review' d='Modules.Productcomments.Shop'}</label>
             <textarea class="form-control" rows="4" id="comment_content" name="comment_content"></textarea>
           </div>
diff --git a/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl b/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
index 3104ebfb..703bcca1 100644
--- a/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
+++ b/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
@@ -25,7 +25,7 @@
 
 <div class="product-comment-list-item pb-4 mb-4 border-bottom" data-product-comment-id="@COMMENT_ID@" data-product-id="@PRODUCT_ID@">
   <div class="d-flex mb-2 align-items-center">
-    <div class="font-weight-bold">
+    <div class="fw-bold">
       @CUSTOMER_NAME@
     </div>
     {* <div class="text-muted font-sm ms-2">
diff --git a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
index 425f564c..03cc6188 100644
--- a/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
+++ b/modules/ps_emailalerts/views/templates/hook/product-modal.tpl
@@ -22,7 +22,7 @@
         <p>
           {l s='Sign up and get notification when product will be available again.' d='Shop.Theme.Catalog'}
         </p>
-        <div class="form-group">
+        <div class="mb-3">
           <input
             class="form-control js-mailalert-email"
             type="email"
diff --git a/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
index c5333b7d..c461d357 100644
--- a/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
+++ b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
@@ -17,7 +17,7 @@
  * International Registered Trademark & Property of PrestaShop SA
  *}
 
-<div id="gdpr_consent" class="gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'} form-group">
+<div id="gdpr_consent" class="gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'} mb-3">
     <span class="custom-control custom-checkbox">
         <input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="custom-control-input psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
         <label class="custom-control-label" for="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
diff --git a/templates/_partials/form-fields.tpl b/templates/_partials/form-fields.tpl
index ced77e53..ede81cb9 100644
--- a/templates/_partials/form-fields.tpl
+++ b/templates/_partials/form-fields.tpl
@@ -45,59 +45,62 @@
 {else}
   {assign var=uniqId value=10|mt_rand:100000}
 
-  <div class="form-group js-input-column">
-    {if $field.type == 'checkbox' || $field.type == 'radio-buttons'}
-      {if $field.type == 'radio-buttons'}
-        <div class="form-label label me-3">{$field.label}</div>
-      {/if}
-    {else}
-      <label class="form-label {if $field.required}required{/if}" for="f-{$field.name}_{$uniqId}">
-        {$field.label}
-        {block name='form_field_comment'}
-          {if (!$field.required && !in_array($field.type, ['radio-buttons', 'checkbox']))}
-            <small class="text-muted">({l s='Optional' d='Shop.Forms.Labels'})</small>
-          {/if}
-        {/block}
-      </label>
+  <div class="mb-3 js-input-column">
+    {if $field.type == 'radio-buttons'}
+      <div class="form-label fw-medium me-3">{$field.label}</div>
     {/if}
 
-
     {if $field.type === 'select'}
 
-      {block name='form_field_item_select'}
-        <select class="custom-select wide{if !empty($field.errors)} is-invalid{/if}" name="{$field.name}"
-          id="f-{$field.name}_{$uniqId}" {if $field.required} required{/if}>
-          <option value disabled selected>{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
-          {foreach from=$field.availableValues item="label" key="value"}
-            <option value="{$value}" {if $value eq $field.value} selected {/if}>{$label}</option>
-          {/foreach}
-        </select>
-      {/block}
+      <div class="form-floating">
+        {block name='form_field_item_select'}
+          <select class="form-select wide{if !empty($field.errors)} is-invalid{/if}" name="{$field.name}"
+            id="f-{$field.name}_{$uniqId}" {if $field.required} required{/if}>
+            <option value disabled selected>{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
+            {foreach from=$field.availableValues item="label" key="value"}
+              <option value="{$value}" {if $value eq $field.value} selected {/if}>{$label}</option>
+            {/foreach}
+          </select>
+        {/block}
+        <label for="f-{$field.name}_{$uniqId}">
+          {$form.label}
+        </label>
+      </div>
 
     {elseif $field.type === 'countrySelect'}
-
-      {block name='form_field_item_country'}
-        <select class="custom-select js-country wide{if !empty($field.errors)} is-invalid{/if}" name="{$field.name}"
-          id="f-{$field.name}_{$uniqId}" {if $field.required}required{/if}>
-          <option value disabled selected>{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
-          {foreach from=$field.availableValues item="label" key="value"}
-            <option value="{$value}" {if $value eq $field.value} selected {/if}>{$label}</option>
-          {/foreach}
-        </select>
-      {/block}
+      <div class="form-floating">
+        {block name='form_field_item_country'}
+          <select class="form-select js-country {if !empty($field.errors)} is-invalid{/if}" name="{$field.name}"
+            id="f-{$field.name}_{$uniqId}" {if $field.required}required{/if}>
+            <option value disabled selected>{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
+            {foreach from=$field.availableValues item="label" key="value"}
+              <option value="{$value}" {if $value eq $field.value} selected {/if}>{$label}</option>
+            {/foreach}
+          </select>
+        {/block}
+        <label for="f-{$field.name}_{$uniqId}">
+            {$field.label}
+        </label>
+      </div>
 
     {elseif $field.type === 'radio-buttons'}
 
       {block name='form_field_item_radio'}
         {foreach from=$field.availableValues item="label" key="value" name="radiolist"}
-          <div class="custom-control custom-radio custom-control-inline">
-            <input name="{$field.name}" type="radio" value="{$value}"
-              class="custom-control-input {if !empty($field.errors)} is-invalid{/if}"
-              id="f-{$field.name}_{$uniqId}-{$smarty.foreach.radiolist.iteration}" {if $field.required}required{/if}
-              {if $value eq $field.value} checked {/if}>
-
-            <label class="custom-control-label"
-              for="f-{$field.name}_{$uniqId}-{$smarty.foreach.radiolist.iteration}">{$label}</label>
+          <div class="form-check form-check-inline">
+            <input
+              class="form-check-input"
+              name="{$field.name}"
+              type="radio"
+              value="{$value}"
+              id="f-{$field.name}_{$uniqId}-{$smarty.foreach.radiolist.iteration}"
+              {if $field.required}required{/if}
+              {if $value eq $field.value} checked {/if}
+            >
+            <label class="form-check-label"
+                   for="f-{$field.name}_{$uniqId}-{$smarty.foreach.radiolist.iteration}">
+                {$label|unescape:'html' nofilter}
+            </label>
           </div>
         {/foreach}
 
@@ -106,30 +109,49 @@
     {elseif $field.type === 'checkbox'}
 
       {block name='form_field_item_checkbox'}
-        <div class="custom-control custom-checkbox">
-          <input name="{$field.name}" type="checkbox" value="1" id="f-{$field.name}_{$uniqId}"
-            class="custom-control-input{if !empty($field.errors)} is-invalid{/if}" {if $field.value} checked="checked"
-            {/if}{if $field.required} required{/if}>
-          <label class="custom-control-label" for="f-{$field.name}_{$uniqId}">{$field.label|unescape:'html' nofilter}</label>
+        <div class="form-check">
+          <input
+            class="form-check-input {if !empty($field.errors)} is-invalid{/if}"
+            name="{$field.name}"
+            type="checkbox"
+            value="1"
+            id="f-{$field.name}_{$uniqId}"
+            {if $field.value}
+              checked="checked"
+            {/if}
+            {if $field.required} required{/if}
+          >
+          <label class="form-check-label"
+                 for="f-{$field.name}_{$uniqId}">
+              {$field.label|unescape:'html' nofilter}
+          </label>
         </div>
       {/block}
 
     {elseif $field.type === 'date'}
 
       {block name='form_field_item_date'}
-        <input
-          name="{$field.name}"
-          class="form-control{if !empty($field.errors)} is-invalid{/if}"
-          type="date"
-          value="{$field.value|default}"
-          placeholder="{if isset($field.availableValues.placeholder)}{$field.availableValues.placeholder}{/if}"
-          id="f-{$field.name}_{$uniqId}" {if isset($autocomplete[$field.name])} autocomplete="{$autocomplete[$field.name]}"
-          {/if}>
-        {if isset($field.availableValues.comment)}
-          <span class="form-text text-muted">
+        <div class="form-floating">
+          <input
+            name="{$field.name}"
+            class="form-control {if !empty($field.errors)} is-invalid{/if}"
+            type="date"
+            value="{$field.value|default}"
+            placeholder="{if isset($field.availableValues.placeholder)}{$field.availableValues.placeholder}{/if}"
+            id="f-{$field.name}_{$uniqId}"
+            {if isset($autocomplete[$field.name])}
+              autocomplete="{$autocomplete[$field.name]}"
+            {/if}
+          >
+            <label for="f-{$field.name}_{$uniqId}">
+                {$field.label}{if $field.required}*{/if}
+            </label>
+            {if isset($field.availableValues.comment)}
+              <span class="form-text">
             {$field.availableValues.comment}
-          </span>
-        {/if}
+            </span>
+            {/if}
+        </div>
       {/block}
 
     {elseif $field.type === 'birthday'}
@@ -158,24 +180,43 @@
 
       {block name='form_field_item_password'}
         <div class="input-group js-parent-focus">
-          <input
-            class="form-control js-child-focus js-visible-password{if !empty($field.errors)} is-invalid{/if}"
-            name="{$field.name}"
-            id="f-{$field.name}_{$uniqId}"
-            type="password"
-            value=""
-            {if isset($configuration.password_policy.minimum_length)}data-minlength="{$configuration.password_policy.minimum_length}"{/if}
-            {if isset($configuration.password_policy.maximum_length)}data-maxlength="{$configuration.password_policy.maximum_length}"{/if}
-            {if isset($configuration.password_policy.minimum_score)}data-minscore="{$configuration.password_policy.minimum_score}"{/if}
-            pattern=".{literal}{{/literal}{$configuration.password_policy.minimum_length},{literal}}{/literal}"
-            {if isset($autocomplete[$field.name])}autocomplete="{$autocomplete[$field.name]}" {/if}
-            {if $field.required}required{/if}>
-          <span class="input-group-append">
-            <button class="btn btn-primary" type="button" data-action="show-password"
-              data-text-show="<span class='material-icons d-block'>visibility</span>" data-text-hide="<span class='material-icons d-block'>visibility_off</span>">
-              <span class="material-icons d-block">visibility</span>
-            </button>
-          </span>
+          <div class="form-floating">
+            <input
+              class="form-control js-child-focus js-visible-password{if !empty($field.errors)} is-invalid{/if}"
+              name="{$field.name}"
+              id="f-{$field.name}_{$uniqId}"
+              type="password"
+              value=""
+              pattern=".{literal}{{/literal}{$configuration.password_policy.minimum_length},{literal}}{/literal}"
+              {if isset($field.availableValues.placeholder)}
+                placeholder="{$field.availableValues.placeholder}"
+              {else}
+                placeholder="{$field.label}"
+              {/if}
+              {if isset($configuration.password_policy.minimum_length)}
+                data-minlength="{$configuration.password_policy.minimum_length}"
+              {/if}
+              {if isset($configuration.password_policy.maximum_length)}
+                data-maxlength="{$configuration.password_policy.maximum_length}"
+              {/if}
+              {if isset($configuration.password_policy.minimum_score)}
+                data-minscore="{$configuration.password_policy.minimum_score}"
+              {/if}
+              {if isset($autocomplete[$field.name])}
+                autocomplete="{$autocomplete[$field.name]}"
+              {/if}
+              {if $field.required}
+                required
+              {/if}
+            >
+            <label for="f-{$field.name}_{$uniqId}">
+                {$field.label}{if $field.required}*{/if}
+            </label>
+          </div>
+          <button class="btn btn-primary" type="button" data-action="show-password"
+            data-text-show="<span class='material-icons d-block'>visibility</span>" data-text-hide="<span class='material-icons d-block'>visibility_off</span>">
+            <span class="material-icons d-block">visibility</span>
+          </button>
         </div>
         {include file='_partials/form-errors.tpl' errors=$field.errors required=$field.required label=$field.label}
       {/block}
@@ -189,22 +230,31 @@
     {else}
 
       {block name='form_field_item_other'}
-        <input
-          class="form-control{if !empty($field.errors)} is-invalid{/if}"
-          name="{$field.name}"
-          type="{if $field.name === "phone"}tel{else}{$field.type}{/if}"
-          value="{$field.value|default}"
-          id="f-{$field.name}_{$uniqId}"
-          {if isset($field.availableValues.placeholder)}placeholder="{$field.availableValues.placeholder}" {/if}
-          {if $field.maxLength}maxlength="{$field.maxLength}" {/if}
-          {if $field.required}required{/if}
-          {if isset($autocomplete[$field.name])} autocomplete="{$autocomplete[$field.name]}" {/if}
-          pattern="^[^\s]+(\s+[^\s]+)*$">
-        {if isset($field.availableValues.comment)}
-          <small class="form-text text-muted">
-            {$field.availableValues.comment}
-          </small>
-        {/if}
+        <div class="form-floating">
+          <input
+            class="form-control{if !empty($field.errors)} is-invalid{/if}"
+            name="{$field.name}"
+            type="{if $field.name === "phone"}tel{else}{$field.type}{/if}"
+            value="{$field.value|default}"
+            id="f-{$field.name}_{$uniqId}"
+            {if isset($field.availableValues.placeholder)}
+              placeholder="{$field.availableValues.placeholder}"
+            {else}
+              placeholder="{$field.label}"
+            {/if}
+            {if $field.maxLength}maxlength="{$field.maxLength}" {/if}
+            {if $field.required}required{/if}
+            {if isset($autocomplete[$field.name])} autocomplete="{$autocomplete[$field.name]}" {/if}
+            pattern="^[^\s]+(\s+[^\s]+)*$">
+          <label for="f-{$field.name}_{$uniqId}">
+              {$field.label}{if $field.required}*{/if}
+          </label>
+          {if isset($field.availableValues.comment)}
+            <small class="form-text">
+                {$field.availableValues.comment}
+            </small>
+          {/if}
+        </div>
       {/block}
 
     {/if}
diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index 25a85bab..e8bdd2d5 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -46,7 +46,7 @@
           {foreach from=$product.attributes key="attribute" item="value"}
             <li class="text-muted small">
               <span>{$attribute}:</span>
-              <span class="font-weight-bold">{$value}</span>
+              <span class="fw-bold">{$value}</span>
             </li>
           {/foreach}
         </ul>
diff --git a/templates/checkout/_partials/cart-summary-product-line.tpl b/templates/checkout/_partials/cart-summary-product-line.tpl
index d1e6a926..dae1d303 100644
--- a/templates/checkout/_partials/cart-summary-product-line.tpl
+++ b/templates/checkout/_partials/cart-summary-product-line.tpl
@@ -46,12 +46,12 @@
       <ul class="mb-2">
         <li class="text-muted small">
           <span>{l s='Quantity' d='Shop.Theme.Catalog'}:</span>
-          <span class="font-weight-bold">{$product.quantity}</span>
+          <span class="fw-bold">{$product.quantity}</span>
         </li>
         {foreach from=$product.attributes key="attribute" item="value"}
           <li class="text-muted small">
             <span>{$attribute}:</span>
-            <span class="font-weight-bold">{$value}</span>
+            <span class="fw-bold">{$value}</span>
           </li>
         {/foreach}
       </ul>
diff --git a/templates/checkout/_partials/cart-voucher.tpl b/templates/checkout/_partials/cart-voucher.tpl
index a9188593..a8d56569 100644
--- a/templates/checkout/_partials/cart-voucher.tpl
+++ b/templates/checkout/_partials/cart-voucher.tpl
@@ -88,7 +88,7 @@
             {foreach from=$cart.discounts item=discount}
               <li class="cart-summary-line">
                 <span class="label">
-                  <a href="#" class="js-code font-weight-bold" data-code="{$discount.code}">
+                  <a href="#" class="js-code fw-bold" data-code="{$discount.code}">
                     {$discount.code}
                   </a>
                     - {$discount.name}
diff --git a/templates/checkout/_partials/customer-form.tpl b/templates/checkout/_partials/customer-form.tpl
index fdd84bb8..f1d4af37 100644
--- a/templates/checkout/_partials/customer-form.tpl
+++ b/templates/checkout/_partials/customer-form.tpl
@@ -27,7 +27,7 @@
 {block "form_field"}
   {if $field.name === 'password' and $guest_allowed}
       <p class="form-informations">
-        <span class="font-weight-bold form-informations-title">
+        <span class="fw-bold form-informations-title">
           {l s='Create an account' d='Shop.Theme.Checkout'}
         </span>
         <span class="font-italic form-informations-option">
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 14dd0640..40a2302e 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -88,7 +88,7 @@
             </div>
 
             {if $recyclablePackAllowed}
-              <div class="form-group my-3">
+              <div class="mb-3 my-3">
                 <div class="custom-control custom-checkbox">
                   <input class="custom-control-input" type="checkbox" id="input_recyclable" name="recyclable" value="1" {if $recyclable} checked {/if}>
                   <label class="custom-control-label" for="input_recyclable">{l s='I would like to receive my order in recycled packaging.' d='Shop.Theme.Checkout'}</label>
@@ -97,7 +97,7 @@
             {/if}
 
             {if $gift.allowed}
-              <div class="form-group my-3">
+              <div class="mb-3 my-3">
                 <div class="custom-control custom-checkbox">
                   <input class="custom-control-input js-gift-checkbox" type="checkbox" id="input_gift" name="gift" value="1" {if $gift.isGift} checked {/if}>
                   <label class="custom-control-label" for="input_gift">{$gift.label}</label>
diff --git a/templates/customer/_partials/account-transformation-form.tpl b/templates/customer/_partials/account-transformation-form.tpl
index 6638a159..3869a4b8 100644
--- a/templates/customer/_partials/account-transformation-form.tpl
+++ b/templates/customer/_partials/account-transformation-form.tpl
@@ -16,7 +16,7 @@
         <li> - {l s='Easier merchandise return' d='Shop.Theme.Customeraccount'}</li>
       </ul>
       <form method="post" class="mb-0">
-        <div class="form-group">
+        <div class="mb-3">
           <label class="form-label required" for="field-email">
             {l s='Set your password:' d='Shop.Forms.Labels'}
           </label>
diff --git a/templates/customer/_partials/order-details-return-modal.tpl b/templates/customer/_partials/order-details-return-modal.tpl
index 8ecd68e8..1fd5885b 100644
--- a/templates/customer/_partials/order-details-return-modal.tpl
+++ b/templates/customer/_partials/order-details-return-modal.tpl
@@ -34,7 +34,7 @@
           <label for="returnText" class="form-control-label">
             {l s='Reason for the return' d='Shop.Theme.Customeraccount'}
           </label>
-          <div class="form-group">
+          <div class="mb-3">
             <textarea cols="67" rows="3" name="returnText" id="returnText" class="form-control"></textarea>
           </div>
         </section>
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index e90821c3..b4023d58 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -91,7 +91,7 @@
           <ul class="product-line__attributes mb-0">
             {foreach from=$product.attributes key="attribute" item="value"}
               <li class="product-line__attribute text-muted small">
-                <span>{$attribute}</span>: <span class="font-weight-bold">{$value}</span>
+                <span>{$attribute}</span>: <span class="fw-bold">{$value}</span>
               </li>
             {/foreach}
           </ul>
diff --git a/templates/customer/_partials/order-messages.tpl b/templates/customer/_partials/order-messages.tpl
index 416f5cb9..4c87cf98 100644
--- a/templates/customer/_partials/order-messages.tpl
+++ b/templates/customer/_partials/order-messages.tpl
@@ -55,7 +55,7 @@
         <section class="form-fields">
           <p>{l s='If you would like to add a comment about your order, please write it in the field below.' d='Shop.Theme.Customeraccount'}</p>
 
-          <div class="form-group">
+          <div class="mb-3">
             <label class="form-control-label">{l s='Product' d='Shop.Forms.Labels'}</label>
             <select name="id_product" class="custom-select" data-role="product">
               <option value="0">{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
@@ -65,7 +65,7 @@
             </select>
           </div>
 
-          <div class="form-group">
+          <div class="mb-3">
             <textarea rows="4" name="msgText" class="form-control" data-role="msg-text"></textarea>
           </div>
 
diff --git a/templates/customer/_partials/product-table-line.tpl b/templates/customer/_partials/product-table-line.tpl
index 8a1cb5cb..ddafa8e3 100644
--- a/templates/customer/_partials/product-table-line.tpl
+++ b/templates/customer/_partials/product-table-line.tpl
@@ -38,7 +38,7 @@
     <ul class="product-line__attributes mb-0">
       {foreach from=$product.attributes key="attribute" item="value"}
         <li class="product-line__attribute text-muted small">
-          <span>{$attribute}</span>: <span class="font-weight-bold">{$value}</span>
+          <span>{$attribute}</span>: <span class="fw-bold">{$value}</span>
         </li>
       {/foreach}
     </ul>
diff --git a/templates/customer/discount.tpl b/templates/customer/discount.tpl
index 2985df35..de07a8c4 100644
--- a/templates/customer/discount.tpl
+++ b/templates/customer/discount.tpl
@@ -49,7 +49,7 @@
             <td class="align-middle">{$cart_rule.name}</td>
             <td class="text-end">{$cart_rule.quantity_for_user}</td>
             <td class="align-middle">
-              <span class="text-primary font-weight-bold text-lowercase align-middle">
+              <span class="text-primary fw-bold text-lowercase align-middle">
                 {$cart_rule.value}
               </span>
             </td>
diff --git a/templates/customer/guest-login.tpl b/templates/customer/guest-login.tpl
index cd9fae33..a1a2759a 100644
--- a/templates/customer/guest-login.tpl
+++ b/templates/customer/guest-login.tpl
@@ -37,7 +37,7 @@
     <section class="form-fields">
       <input type="hidden" name="controller" value="guest-tracking" >
 
-      <div class="form-group row">
+      <div class="mb-3 row">
         <label class="col-md-3 form-control-label required">
           {l s='Order Reference:' d='Shop.Forms.Labels'}
         </label>
@@ -55,7 +55,7 @@
         </div>
       </div>
 
-      <div class="form-group row">
+      <div class="mb-3 row">
         <label class="col-md-3 form-control-label required">
           {l s='Email:' d='Shop.Forms.Labels'}
         </label>
diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl
index 0c3821ff..8c88d217 100644
--- a/templates/customer/history.tpl
+++ b/templates/customer/history.tpl
@@ -53,7 +53,7 @@
               </span>
             </td>
             <td class="text-end align-middle">
-              <span class="text-primary font-weight-bold text-lowercase">
+              <span class="text-primary fw-bold text-lowercase">
                 {$order.totals.total.value}
               </span>
             </td>
diff --git a/templates/customer/password-email.tpl b/templates/customer/password-email.tpl
index b80241d2..963de1e5 100644
--- a/templates/customer/password-email.tpl
+++ b/templates/customer/password-email.tpl
@@ -45,7 +45,7 @@
     </header>
 
     <section class="form-fields">
-      <div class="form-group">
+      <div class="mb-3">
         <label class="form-control-label required">{l s='Email address' d='Shop.Forms.Labels'}</label>
         <input type="email" name="email" id="email" value="{if isset($smarty.post.email)}{$smarty.post.email|stripslashes}{/if}" class="form-control" required>
 
diff --git a/templates/customer/password-new.tpl b/templates/customer/password-new.tpl
index 47f053e4..92e45003 100644
--- a/templates/customer/password-new.tpl
+++ b/templates/customer/password-new.tpl
@@ -46,12 +46,12 @@
           sprintf=['%email%' => $customer_email|stripslashes]}
       </p>
 
-      <div class="form-group">
+      <div class="mb-3">
         <label class="form-control-label">{l s='New password' d='Shop.Forms.Labels'}</label>
         <input class="form-control" type="password" data-validate="isPasswd" name="passwd" value="">
       </div>
 
-      <div class="form-group">
+      <div class="mb-3">
         <label class="form-control-label">{l s='Confirmation' d='Shop.Forms.Labels'}</label>
         <input class="form-control" type="password" data-validate="isPasswd" name="confirmation" value="">
       </div>

From 8c9a35bd8e4acdf6b118ec643ce5221bf73578b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 12:41:33 +0200
Subject: [PATCH 10/17] Form multiple changes

---
 .../views/templates/widget/contactform.tpl    |  4 +-
 .../ps_currencyselector.tpl                   |  2 +-
 .../views/templates/front/catalog/facets.tpl  |  2 +-
 .../ps_languageselector.tpl                   |  2 +-
 templates/catalog/_partials/per-page.tpl      |  2 +-
 .../catalog/_partials/product-add-to-cart.tpl | 42 +++++++++----------
 .../catalog/_partials/product-variants.tpl    |  2 +-
 templates/catalog/_partials/sort-orders.tpl   |  2 +-
 .../_partials/order-details-return-table.tpl  |  4 +-
 .../customer/_partials/order-messages.tpl     |  2 +-
 10 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/modules/contactform/views/templates/widget/contactform.tpl b/modules/contactform/views/templates/widget/contactform.tpl
index 3df717bb..2a8314de 100644
--- a/modules/contactform/views/templates/widget/contactform.tpl
+++ b/modules/contactform/views/templates/widget/contactform.tpl
@@ -48,7 +48,7 @@
 
           <div class="mb-3">
             <label class="form-control-label">{l s='Subject' d='Shop.Forms.Labels'}</label>
-            <select name="id_contact" class="custom-select">
+            <select name="id_contact" class="form-select">
               {foreach from=$contact.contacts item=contact_elt}
                 <option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
               {/foreach}
@@ -69,7 +69,7 @@
           {if $contact.orders}
             <div class="mb-3">
               <label class="form-control-label">{l s='Order reference' d='Shop.Forms.Labels'}</label>
-              <select name="id_order" class="custom-select">
+              <select name="id_order" class="form-select">
                 <option value="">{l s='Select reference' d='Shop.Forms.Help'}</option>
                 {foreach from=$contact.orders item=order}
                   <option value="{$order.id_order}">{$order.reference}</option>
diff --git a/modules/ps_currencyselector/ps_currencyselector.tpl b/modules/ps_currencyselector/ps_currencyselector.tpl
index 5e5e9290..37e0f3e0 100644
--- a/modules/ps_currencyselector/ps_currencyselector.tpl
+++ b/modules/ps_currencyselector/ps_currencyselector.tpl
@@ -24,7 +24,7 @@
  *}
 
 <div id="_desktop_currency_selector" class="col-auto flex-grow-0 flex-shrink-0">
-  <select class="js-select-link custom-select" aria-labelledby="currency-selector-label">
+  <select class="js-select-link form-select" aria-labelledby="currency-selector-label">
     {foreach from=$currencies item=currency}
       <option value="{$currency.url}"{if $currency.current} selected{/if}>{$currency.iso_code}{if $currency.sign !== $currency.iso_code} {$currency.sign}{/if}</option>
     {/foreach}
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index f20dfd64..73f3511e 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -99,7 +99,7 @@
               {block name='facet_item_dropdown'}
                 <div id="facet_{$_expand_id}" class="search-filters__collapse collapse{if !$_collapse} show{/if}">
                   <div class="py-1 {if $filter@first}pt-2{/if}">
-                    <select class="custom-select" data-action="search-select">
+                    <select class="form-select" data-action="search-select">
                       {if $_collapse}
                         <option value="">---</option>
                       {/if}
diff --git a/modules/ps_languageselector/ps_languageselector.tpl b/modules/ps_languageselector/ps_languageselector.tpl
index b7f64174..35e0a8c0 100644
--- a/modules/ps_languageselector/ps_languageselector.tpl
+++ b/modules/ps_languageselector/ps_languageselector.tpl
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 <div id="_desktop_language_selector" class="col-auto flex-grow-0 flex-shrink-0">
-  <select class="js-select-link custom-select" aria-labelledby="language-selector-label">
+  <select class="js-select-link form-select" aria-labelledby="language-selector-label">
     {foreach from=$languages item=language}
       <option value="{url entity='language' id=$language.id_lang}"{if $language.id_lang == $current_language.id_lang} selected{/if} data-iso-code="{$language.iso_code}">{$language.name_simple}</option>
     {/foreach}
diff --git a/templates/catalog/_partials/per-page.tpl b/templates/catalog/_partials/per-page.tpl
index 1657dc6f..3435f243 100644
--- a/templates/catalog/_partials/per-page.tpl
+++ b/templates/catalog/_partials/per-page.tpl
@@ -38,7 +38,7 @@
       $defaultPerPage * 4
   ]}
 
-  <select data-action="search-select" class="custom-select">
+  <select data-action="search-select" class="form-select">
     {foreach $productPerPageArray as $perPage}
       <option
         {if $currentPerPage == $perPage}selected{/if}
diff --git a/templates/catalog/_partials/product-add-to-cart.tpl b/templates/catalog/_partials/product-add-to-cart.tpl
index 4ad37ead..57ba1452 100644
--- a/templates/catalog/_partials/product-add-to-cart.tpl
+++ b/templates/catalog/_partials/product-add-to-cart.tpl
@@ -26,17 +26,15 @@
   {if !$configuration.is_catalog}
 
     {block name='product_quantity'}
-      <div class="product-quantity row mb-1 mx-n1 mt-n2 align-items-center">
-        <div class="qty col-12 col-sm-auto mx-auto mt-2 px-1">
-          <div class="js-product-qty-spinner row g-0">
-            <div class="col-auto">
-              <a href="#" class="js-custom-qty-btn-down">
-                -
+      <div class="product-quantity row g-2 align-items-center">
+        <div class="qty col-12 col-lg-2 col-md-3 mx-auto px-1">
+          <div class="js-product-qty-spinner">
+            <div class="input-group flex-nowrap">
+              <a href="#" class="btn btn-outline-dark px-1 js-custom-qty-btn-down">
+                <span class="material-icons d-block">remove</span>
               </a>
-            </div>
-            <div class="col-auto">
               <input
-                class="js-custom-qty-spinner-input"
+                class="js-custom-qty-spinner-input px-1 text-center border-black form-control"
                 type="number"
                 inputmode="numeric"
                 pattern="[0-9]*"
@@ -44,19 +42,17 @@
                 id="quantity_wanted"
                 inputmode="numeric"
                 pattern="[0-9]*"
-                {if $product.quantity_wanted}
-                  value="{$product.quantity_wanted}"
-                  min="{$product.minimal_quantity}"
-                {else}
-                  value="1"
-                  min="1"
-                {/if}
+                      {if $product.quantity_wanted}
+                        value="{$product.quantity_wanted}"
+                        min="{$product.minimal_quantity}"
+                      {else}
+                        value="1"
+                        min="1"
+                      {/if}
                 aria-label="{l s='Quantity' d='Shop.Theme.Actions'}"
               >
-            </div>
-            <div class="col-auto">
-              <a href="#" class="js-custom-qty-btn-up">
-                +
+              <a href="#" class="btn btn-outline-dark px-1 js-custom-qty-btn-up">
+                <span class="material-icons d-block">add</span>
               </a>
             </div>
           </div>
@@ -64,7 +60,7 @@
 
 
 
-        <div class="add col mt-2 px-1 js-add-to-cart-btn-wrapper">
+        <div class="add col js-add-to-cart-btn-wrapper">
           <button
             class="btn btn-primary add-to-cart d-block text-center w-100"
             data-button-action="add-to-cart"
@@ -77,9 +73,9 @@
           </button>
         </div>
 
-        <div class="col-auto mt-2 px-1">
+        <div class="col-auto">
           <div class="js-product-actions-buttons">
-            <div class="row mx-n1 mt-n2 align-items-center">
+            <div class="row g-2 align-items-center">
               {hook h='displayProductActions' product=$product}
             </div>
           </div>
diff --git a/templates/catalog/_partials/product-variants.tpl b/templates/catalog/_partials/product-variants.tpl
index 5b24744f..17d0c2bc 100644
--- a/templates/catalog/_partials/product-variants.tpl
+++ b/templates/catalog/_partials/product-variants.tpl
@@ -29,7 +29,7 @@
       <p class="control-label h6 mb-2">{$group.name}</p>
       {if $group.group_type == 'select'}
         <select
-          class="custom-select"
+          class="form-select"
           id="group_{$id_attribute_group}"
           data-product-attribute="{$id_attribute_group}"
           name="group[{$id_attribute_group}]">
diff --git a/templates/catalog/_partials/sort-orders.tpl b/templates/catalog/_partials/sort-orders.tpl
index 19d15e60..5a77c746 100644
--- a/templates/catalog/_partials/sort-orders.tpl
+++ b/templates/catalog/_partials/sort-orders.tpl
@@ -23,7 +23,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 
-<select data-action="search-select" class="custom-select">
+<select data-action="search-select" class="form-select">
   {foreach from=$listing.sort_orders item=sort_order}
     <option
       data-href="{$sort_order.url}"
diff --git a/templates/customer/_partials/order-details-return-table.tpl b/templates/customer/_partials/order-details-return-table.tpl
index b4023d58..1b77ca4e 100644
--- a/templates/customer/_partials/order-details-return-table.tpl
+++ b/templates/customer/_partials/order-details-return-table.tpl
@@ -157,7 +157,7 @@
         {if !$product.customizations}
           {if $product.quantity > $product.qty_returned}
               <div class="select" id="_desktop_return_qty_{$product.id_order_detail}">
-                <select name="order_qte_input[{$product.id_order_detail}]" class="custom-select">
+                <select name="order_qte_input[{$product.id_order_detail}]" class="form-select">
                   {section name=quantity start=1 loop=$product.quantity+1-$product.qty_returned}
                     <option value="{$smarty.section.quantity.index}">{$smarty.section.quantity.index}</option>
                   {/section}
@@ -169,7 +169,7 @@
             <div class="select" id="_desktop_return_qty_{$product.id_order_detail}_{$customization.id_customization}">
               <select
                 name="customization_qty_input[{$customization.id_customization}]"
-                class="custom-select"
+                class="form-select"
               >
                 {section name=quantity start=1 loop=$customization.quantity+1}
                   <option value="{$smarty.section.quantity.index}">{$smarty.section.quantity.index}</option>
diff --git a/templates/customer/_partials/order-messages.tpl b/templates/customer/_partials/order-messages.tpl
index 4c87cf98..76a89d9a 100644
--- a/templates/customer/_partials/order-messages.tpl
+++ b/templates/customer/_partials/order-messages.tpl
@@ -57,7 +57,7 @@
 
           <div class="mb-3">
             <label class="form-control-label">{l s='Product' d='Shop.Forms.Labels'}</label>
-            <select name="id_product" class="custom-select" data-role="product">
+            <select name="id_product" class="form-select" data-role="product">
               <option value="0">{l s='-- please choose --' d='Shop.Forms.Labels'}</option>
               {foreach from=$order.products item=product}
                 <option value="{$product.id_product}">{$product.name}</option>

From 0ff1b4236d6f8f1b00f6ecda9b2aac226f3a334b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 12:41:39 +0200
Subject: [PATCH 11/17] add to cart fix for product page

---
 _dev/js/theme/core/cart/handler/cart/addToCartHandler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_dev/js/theme/core/cart/handler/cart/addToCartHandler.js b/_dev/js/theme/core/cart/handler/cart/addToCartHandler.js
index 910b69be..5a972f6a 100644
--- a/_dev/js/theme/core/cart/handler/cart/addToCartHandler.js
+++ b/_dev/js/theme/core/cart/handler/cart/addToCartHandler.js
@@ -31,7 +31,7 @@ const addToCartHandler = async (event) => {
   const idProductInput = form.querySelector('[name=id_product]');
   const quantityInput = form.querySelector('[name=qty]');
   const idProductAttributeInput = form.querySelector('[name=id_product_attribute]');
-  const idCustomizationInout = form.querySelector('[name=id_product_attribute]');
+  const idCustomizationInout = form.querySelector('[name=id_customization]');
 
   const idProduct = Number.parseInt((idProductInput?.value || null), 10);
   const qty = Number.parseInt(quantityInput?.value, 10) || 0;

From e0626053f37c8ca116c1538176dcdb03992f0a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Fri, 6 Oct 2023 12:50:35 +0200
Subject: [PATCH 12/17] Form qty spinner

---
 .../_partials/cart-detailed-product-line.tpl  | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/templates/checkout/_partials/cart-detailed-product-line.tpl b/templates/checkout/_partials/cart-detailed-product-line.tpl
index e8bdd2d5..efa15817 100644
--- a/templates/checkout/_partials/cart-detailed-product-line.tpl
+++ b/templates/checkout/_partials/cart-detailed-product-line.tpl
@@ -118,34 +118,30 @@
         <span class="gift-quantity">{$product.quantity}</span>
       {else}
           <div class="js-custom-cart-qty-spinner row g-0">
-              <div class="col-auto">
-                  <a href="#" class="js-custom-qty-btn-down">
-                      -
-                  </a>
-              </div>
-              <div class="col-auto">
-                  <input
-                      type="number"
-                      inputmode="numeric"
-                      pattern="[0-9]*"
-                      value="{$product.quantity}"
-                      name="product-quantity-spin"
-                      min="{$product.minimal_quantity}"
-                      class="js-custom-qty-spinner-input js-cart-line-product-quantity"
-                      aria-label="{l s='%productName% product quantity field' sprintf=['%productName%' => $product.name] d='Shop.Theme.Checkout'}"
-                      data-down-url="{$product.down_quantity_url}"
-                      data-up-url="{$product.up_quantity_url}"
-                      data-update-url="{$product.update_quantity_url}"
-                      data-product-id="{$product.id_product}"
-                      data-product-attribute-id="{$product.id_product_attribute}"
-                      data-customization-id="{$product.id_customization|intval}"
-                  >
-              </div>
-              <div class="col-auto">
-                  <a href="#" class="js-custom-qty-btn-up">
-                      +
-                  </a>
-              </div>
+            <div class="input-group flex-nowrap">
+              <a href="#" class="btn btn-outline-dark px-1 js-custom-qty-btn-down">
+                <span class="material-icons d-block">remove</span>
+              </a>
+              <input
+                type="number"
+                inputmode="numeric"
+                pattern="[0-9]*"
+                value="{$product.quantity}"
+                name="product-quantity-spin"
+                min="{$product.minimal_quantity}"
+                class="form-control text-center px-1 border-primary js-custom-qty-spinner-input js-cart-line-product-quantity"
+                aria-label="{l s='%productName% product quantity field' sprintf=['%productName%' => $product.name] d='Shop.Theme.Checkout'}"
+                data-down-url="{$product.down_quantity_url}"
+                data-up-url="{$product.up_quantity_url}"
+                data-update-url="{$product.update_quantity_url}"
+                data-product-id="{$product.id_product}"
+                data-product-attribute-id="{$product.id_product_attribute}"
+                data-customization-id="{$product.id_customization|intval}"
+              >
+              <a href="#" class="btn btn-outline-dark px-1 js-custom-qty-btn-up">
+                <span class="material-icons d-block">add</span>
+              </a>
+            </div>
           </div>
       {/if}
     </div>

From a76abd9758dd9fe2b1ea446b36e5655d944a61be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Sun, 8 Oct 2023 22:58:18 +0200
Subject: [PATCH 13/17] Temporary BS5 dynamic import fix

---
 _dev/js/theme/components/dynamic-bootstrap-components.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_dev/js/theme/components/dynamic-bootstrap-components.js b/_dev/js/theme/components/dynamic-bootstrap-components.js
index 5a31cb3a..f33901f2 100644
--- a/_dev/js/theme/components/dynamic-bootstrap-components.js
+++ b/_dev/js/theme/components/dynamic-bootstrap-components.js
@@ -7,7 +7,7 @@ $(() => {
   const importModal = new DynamicImportHandler({
     jqueryPluginCover: 'modal',
     DOMEvents: 'click',
-    DOMEventsSelector: '[data-toggle="modal"]',
+    DOMEventsSelector: '[data-bs-toggle="modal"]',
     DOMEventsPreventDefault: true,
     files: () => [
       import('bootstrap/js/src/modal'),
@@ -18,7 +18,7 @@ $(() => {
   const importDropdown = new DynamicImportHandler({
     jqueryPluginCover: 'dropdown',
     DOMEvents: 'click',
-    DOMEventsSelector: '[data-toggle="dropdown"]',
+    DOMEventsSelector: '[data-bs-toggle="dropdown"]',
     DOMEventsPreventDefault: true,
     files: () => [
       import('bootstrap/js/src/dropdown'),
@@ -29,7 +29,7 @@ $(() => {
   const importCollapse = new DynamicImportHandler({
     jqueryPluginCover: 'collapse',
     DOMEvents: 'click',
-    DOMEventsSelector: '[data-toggle="collapse"]',
+    DOMEventsSelector: '[data-bs-toggle="collapse"]',
     DOMEventsPreventDefault: true,
     files: () => [
       import('bootstrap/js/src/collapse'),

From d324c32a76a19d36979ad31aa35e3326fbb910ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Sun, 8 Oct 2023 22:59:20 +0200
Subject: [PATCH 14/17] Collapse fix

---
 .../views/templates/hook/ps_categorytree.tpl             | 9 +++++++--
 .../views/templates/front/catalog/facets.tpl             | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl b/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
index 1d38a726..f52c3e3d 100644
--- a/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
+++ b/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl
@@ -34,7 +34,12 @@
               <a href="{$node.link}" class="stretched-link text-reset list-group-item-action-dropdown-link">
                 {$node.name}
               </a>
-              <a href="#exCollapsingNavbar{$node.id}" class="icon-collapse list-group-item-collapse text-reset" data-bs-toggle="collapse">
+              <a href="#catcol_{$node.id}"
+                 class="icon-collapse list-group-item-collapse text-reset"
+                 data-bs-toggle="collapse"
+                 role="button"
+                 data-bs-target="#catcol_{$node.id}"
+              >
                 <i class="material-icons d-block">&#xE313;</i>
               </a>
             </div>
@@ -44,7 +49,7 @@
             </a>
           {/if}
           {if $node.children}
-            <div class="collapse" id="exCollapsingNavbar{$node.id}">
+            <div class="collapse" id="catcol_{$node.id}">
               {categories nodes=$node.children depth=$depth+1}
             </div>
           {/if}
diff --git a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
index 73f3511e..154da7ef 100644
--- a/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
+++ b/modules/ps_facetedsearch/views/templates/front/catalog/facets.tpl
@@ -54,7 +54,11 @@
             <div class="search-filters__header d-flex justify-content-between align-items-center mb-0 h5 position-relative">
               <span class="search-filters__title mb-0">{$facet.label}</span>
               {if $facet.widgetType != 'slider'}
-                <a href="#facet_{$_expand_id}" class="icon-collapse stretched-link text-reset d-block" data-bs-toggle="collapse"
+                <a href="#facet_{$_expand_id}"
+                   class="icon-collapse stretched-link text-reset d-block"
+                   data-bs-target="#facet_{$_expand_id}"
+                   role="button"
+                   data-bs-toggle="collapse"
                   {if !$_collapse} aria-expanded="true" {/if}>
                   <span class="material-icons">&#xE313;</span>
                 </a>

From 236cb84aac33542ac45d06cab032e37776948aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Sun, 8 Oct 2023 23:09:28 +0200
Subject: [PATCH 15/17] Custom checkboxes

---
 .../templates/hook/displayGDPRConsent.tpl     | 19 ++++++----
 templates/checkout/_partials/address-form.tpl | 18 +++++++---
 .../checkout/_partials/steps/payment.tpl      | 11 +++---
 .../checkout/_partials/steps/shipping.tpl     | 36 +++++++++++++++----
 4 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
index c461d357..37feecd4 100644
--- a/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
+++ b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
@@ -18,12 +18,19 @@
  *}
 
 <div id="gdpr_consent" class="gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'} mb-3">
-    <span class="custom-control custom-checkbox">
-        <input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="custom-control-input psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
-        <label class="custom-control-label" for="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
-            {$psgdpr_consent_message nofilter}{* html data *}
-        </label>
-    </span>
+  <div class="form-check">
+    <input
+      id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}"
+      name="psgdpr_consent_checkbox"
+      type="checkbox"
+      value="1"
+      class="form-check-input psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}"
+    >
+    <label class="form-check-label"
+           for="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
+        {$psgdpr_consent_message nofilter}{* html data *}
+    </label>
+  </div>
 </div>
 {literal}
 <script type="text/javascript">
diff --git a/templates/checkout/_partials/address-form.tpl b/templates/checkout/_partials/address-form.tpl
index 68c162bf..4416db7f 100644
--- a/templates/checkout/_partials/address-form.tpl
+++ b/templates/checkout/_partials/address-form.tpl
@@ -19,11 +19,21 @@
 
 {block name='form_fields' append}
   <input type="hidden" name="saveAddress" value="{$type}">
+
   {if $type === "delivery"}
-    <div class="custom-control custom-checkbox">
-      <input name="use_same_address" type="checkbox" value="1" id="use_same_address"
-        class="custom-control-input" value="1" {if $use_same_address} checked {/if}>
-      <label class="custom-control-label" for="use_same_address">{l s='Use this address for invoice too' d='Shop.Theme.Checkout'}</label>
+    <div class="form-check">
+      <input
+        name="use_same_address"
+        type="checkbox"
+        value="1"
+        id="use_same_address"
+        class="form-check-input"
+              {if $use_same_address} checked {/if}
+      >
+      <label class="form-check-label"
+             for="use_same_address">
+          {l s='Use this address for invoice too' d='Shop.Theme.Checkout'}
+      </label>
     </div>
   {/if}
 {/block}
diff --git a/templates/checkout/_partials/steps/payment.tpl b/templates/checkout/_partials/steps/payment.tpl
index 56ef821b..3588d8d3 100644
--- a/templates/checkout/_partials/steps/payment.tpl
+++ b/templates/checkout/_partials/steps/payment.tpl
@@ -87,14 +87,17 @@
     </p>
     <form id="conditions-to-approve" method="GET" class="mt-3 js-conditions-to-approve">
       {foreach from=$conditions_to_approve item="condition" key="condition_name"}
-        <div class="custom-control custom-checkbox">
+        <div class="form-check mb-23">
           <input
             id="conditions_to_approve[{$condition_name}]"
             name="conditions_to_approve[{$condition_name}]"
             required
-            type="checkbox" value="1" class="ps-shown-by-js custom-control-input">
-          <label class="custom-control-label js-terms"
-            for="conditions_to_approve[{$condition_name}]">{$condition nofilter}</label>
+            type="checkbox"
+            value="1"
+            class="form-check-input"
+          >
+          <label class="form-check-label js-terms"
+                 for="conditions_to_approve[{$condition_name}]">{$condition nofilter}</label>
         </div>
       {/foreach}
     </form>
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 40a2302e..61b0ff76 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -89,18 +89,42 @@
 
             {if $recyclablePackAllowed}
               <div class="mb-3 my-3">
-                <div class="custom-control custom-checkbox">
-                  <input class="custom-control-input" type="checkbox" id="input_recyclable" name="recyclable" value="1" {if $recyclable} checked {/if}>
-                  <label class="custom-control-label" for="input_recyclable">{l s='I would like to receive my order in recycled packaging.' d='Shop.Theme.Checkout'}</label>
+                <div class="form-check">
+                  <input
+                    class="form-check-input"
+                    id="input_recyclable"
+                    name="recyclable"
+                    type="checkbox"
+                    value="1"
+                    {if $recyclable}
+                      checked
+                    {/if}
+                  >
+                  <label class="form-check-label"
+                         for="input_recyclable">
+                      {l s='I would like to receive my order in recycled packaging.' d='Shop.Theme.Checkout'}
+                  </label>
                 </div>
               </div>
             {/if}
 
             {if $gift.allowed}
               <div class="mb-3 my-3">
-                <div class="custom-control custom-checkbox">
-                  <input class="custom-control-input js-gift-checkbox" type="checkbox" id="input_gift" name="gift" value="1" {if $gift.isGift} checked {/if}>
-                  <label class="custom-control-label" for="input_gift">{$gift.label}</label>
+                <div class="form-check">
+                  <input
+                    class="form-check-input js-gift-checkbox"
+                    id="input_gift"
+                    name="gift"
+                    type="checkbox"
+                    value="1"
+                    {if $gift.isGift}
+                      checked
+                    {/if}
+                  >
+                  <label class="form-check-label"
+                         for="input_gift">
+                      {$gift.label}
+                  </label>
                 </div>
               </div>
 

From f070ea2a387db6c3ac686a5f27aa35e3039ebcc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Sun, 8 Oct 2023 23:10:53 +0200
Subject: [PATCH 16/17] Checkout header fix

---
 templates/checkout/_partials/header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/checkout/_partials/header.tpl b/templates/checkout/_partials/header.tpl
index 10766545..69418ad1 100644
--- a/templates/checkout/_partials/header.tpl
+++ b/templates/checkout/_partials/header.tpl
@@ -27,7 +27,7 @@
   <nav class="header-nav py-2">
     <div class="container">
       <div class="row">
-        <div class="col text-md-left text-center">
+        <div class="col text-md-start text-center">
           <a href="{$urls.base_url}">
             {images_block webpEnabled=$webpEnabled}
               <img

From a8dcc56de49037eff743db71a4e78b55bb60bc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Ste=CC=A8pien=CC=81?= <igor@istepien.dev>
Date: Sun, 8 Oct 2023 23:12:11 +0200
Subject: [PATCH 17/17] stylelint fix

---
 _dev/css/abstracts/_index.scss      | 2 --
 _dev/css/abstracts/maps/_index.scss | 0
 2 files changed, 2 deletions(-)
 delete mode 100644 _dev/css/abstracts/maps/_index.scss

diff --git a/_dev/css/abstracts/_index.scss b/_dev/css/abstracts/_index.scss
index a3ef10de..03b0ef84 100644
--- a/_dev/css/abstracts/_index.scss
+++ b/_dev/css/abstracts/_index.scss
@@ -8,5 +8,3 @@
 @import "~bootstrap/scss/variables-dark";
 @import "~bootstrap/scss/maps";
 @import "~bootstrap/scss/mixins";
-
-@import "maps";
diff --git a/_dev/css/abstracts/maps/_index.scss b/_dev/css/abstracts/maps/_index.scss
deleted file mode 100644
index e69de29b..00000000