diff --git a/website_product_configurator/__init__.py b/website_product_configurator/__init__.py
index 5a9543a4b8..f7209b1710 100644
--- a/website_product_configurator/__init__.py
+++ b/website_product_configurator/__init__.py
@@ -1,3 +1,2 @@
 from . import models
 from . import controllers
-from . import tests
diff --git a/website_product_configurator/__manifest__.py b/website_product_configurator/__manifest__.py
index 3e50eb258e..7d1d7b591b 100644
--- a/website_product_configurator/__manifest__.py
+++ b/website_product_configurator/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "Website Product Configurator",
-    "version": "14.0.1.2.0",
+    "version": "16.0.1.0.0",
     "summary": """Configure products in e-shop""",
     "author": "Pledra, Odoo Community Association (OCA)",
     "license": "AGPL-3",
@@ -16,11 +16,19 @@
         "data/ir_config_parameter_data.xml",
         "data/config_form_templates.xml",
         "data/cron.xml",
-        "views/assets.xml",
         "views/product_view.xml",
         "views/templates.xml",
         "views/res_config_settings_view.xml",
     ],
+    "assets": {
+        "web.assets_frontend": [
+            "website_product_configurator/static/src/js/config_form.js",
+            "website_product_configurator/static/src/js/website_sale.esm.js",
+            "website_product_configurator/static/src/js/website_config_tour.js",
+            "website_product_configurator/static/src/scss/config_form.scss",
+            "website_product_configurator/static/src/scss/tooltip.scss",
+        ],
+    },
     "demo": ["demo/product_template_demo.xml"],
     "images": ["static/description/cover.png"],
     "application": True,
diff --git a/website_product_configurator/controllers/main.py b/website_product_configurator/controllers/main.py
index eb9eb464ca..2d72029465 100644
--- a/website_product_configurator/controllers/main.py
+++ b/website_product_configurator/controllers/main.py
@@ -1,4 +1,5 @@
 import json
+import logging
 
 from odoo import http, models
 from odoo.exceptions import UserError, ValidationError
@@ -8,6 +9,8 @@
 from odoo.addons.http_routing.models.ir_http import slug
 from odoo.addons.website_sale.controllers.main import WebsiteSale
 
+_logger = logging.getLogger(__name__)
+
 
 def get_pricelist():
     sale_order = request.env.context.get("sale_order")
@@ -467,8 +470,8 @@ def save_configuration(
                     valid = config_session_id.sudo().validate_configuration()
                     if valid:
                         check_next_step = False
-                except Exception:
-                    pass
+                except Exception as exc:
+                    _logger.debug(exc, exc_info=True)
             if check_next_step:
                 result = self.set_config_next_step(
                     config_session_id=config_session_id,
diff --git a/website_product_configurator/data/config_form_templates.xml b/website_product_configurator/data/config_form_templates.xml
index 9fbdacf12a..e8381b9522 100644
--- a/website_product_configurator/data/config_form_templates.xml
+++ b/website_product_configurator/data/config_form_templates.xml
@@ -18,14 +18,13 @@
 
     <!-- Base view for website configuration body -->
     <template id="product_configurator" name="Product Configuration Interface">
-      <xpath expr="." position="inside">
         <t t-call="website.layout">
         <div itemscope="itemscope" itemtype="http://schema.org/Product" id="wrap">
 
           <section
-                        id="product_configurator"
-                        class="container py-2 product_configurator"
-                    >
+                    id="product_configurator"
+                    class="container py-2 product_configurator"
+                >
             <div class="row">
                 <div class="col-lg-12">
                     <t t-call="website_product_configurator.config_header" />
@@ -34,24 +33,24 @@
             <div class="row">
                 <div class="col-lg-12">
                     <form
-                                    id="product_config_form"
-                                    class="form-horizontal"
-                                    method="post"
-                                    enctype="multipart/form-data"
-                                >
+                                id="product_config_form"
+                                class="form-horizontal"
+                                method="post"
+                                enctype="multipart/form-data"
+                            >
                       <input
-                                        type="hidden"
-                                        name="csrf_token"
-                                        t-att-value="request.csrf_token()"
-                                    />
+                                    type="hidden"
+                                    name="csrf_token"
+                                    t-att-value="request.csrf_token()"
+                                />
                         <div class="row">
                             <div class="col-lg-12">
                               <div class="config_weight">
                                 <span><b>Weight: </b></span>
                                 <span
-                                                    class="config_product_weight"
-                                                    t-esc="('{0:,.%sf}' % (weight_prec)).format(cfg_session.weight)"
-                                                />
+                                                class="config_product_weight"
+                                                t-esc="('{0:,.%sf}' % (weight_prec)).format(cfg_session.weight)"
+                                            />
                                 <span>kg</span>
                               </div>
                                <div class="config_price">
@@ -60,10 +59,10 @@
                                 <!-- <span class="config_product_price" t-esc="cfg_session.price" t-options="{'widget': 'monetary', 'display_currency': product_tmpl.currency_id}"/> -->
                                 <!-- Bizzappdev start code -->
                                 <span
-                                                    class="config_product_price"
-                                                    t-esc="cfg_session.price"
-                                                    t-options="{'widget': 'monetary', 'display_currency': website.get_current_pricelist().currency_id}"
-                                                />
+                                                class="config_product_price"
+                                                t-esc="cfg_session.price"
+                                                t-options="{'widget': 'monetary', 'display_currency': website.get_current_pricelist().currency_id}"
+                                            />
                                 <!-- Bizzappdev end code -->
 
                               </div>
@@ -84,8 +83,8 @@
                         <div class="row">
                             <div class="col-lg-12">
                                 <t
-                                                t-call="website_product_configurator.config_footer"
-                                            />
+                                            t-call="website_product_configurator.config_footer"
+                                        />
                             </div>
                         </div>
                     </form>
@@ -94,7 +93,6 @@
           </section>
         </div>
         </t>
-      </xpath>
     </template>
 
     <template id="config_footer" name="Product Configuration Footer">
@@ -220,7 +218,8 @@
                         >
                     <a
                                 t-att-class="'nav-link' + (cfg_step_line.id == active_step.id and ' active' or '')"
-                                data-toggle="tab"
+                                data-bs-toggle="tab"
+                                t-attf-data-bs-target="#cfg_step_{{cfg_step_line.id}}"
                                 role="tab"
                                 t-attf-href="#cfg_step_{{cfg_step_line.id}}"
                                 t-esc="cfg_step_line.config_step_id.name"
@@ -398,7 +397,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t
                         t-set="custom_value"
-                        t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"
+                        t-value="custom_value_ids.filtered(lambda x: x.attribute_id == line.attribute_id)"
                     />
                     <t
                         t-set="available_val"
@@ -491,7 +490,7 @@
                 <t t-foreach="cfg_step_attribute_line_ids" t-as="line">
                     <t
                         t-set="custom_value"
-                        t-value="custom_value_ids.filtered(lambda x, line=line: x.attribute_id == line.attribute_id)"
+                        t-value="custom_value_ids.filtered(lambda x: x.attribute_id == line.attribute_id)"
                     />
                     <t
                         t-set="available_val"
@@ -617,7 +616,7 @@
                 <t t-set="curr_pl" t-value="website.get_current_pricelist()" />
                 <t
                     t-set="price"
-                    t-value="product_variant.with_context(pricelist=curr_pl.id).price"
+                    t-value="product_variant.with_context(pricelist=curr_pl.id)._get_contextual_price()"
                 />
                 <b
                     class="oe_price"
@@ -652,6 +651,7 @@
                     t-attf-class="container py-2 oe_website_sale #{'discount' if combination_info['has_discounted_price'] else ''}"
                     id="product_detail"
                     t-att-data-view-track="view_track and '1' or '0'"
+                    t-att-data-product-tracking-info="json.dumps(request.env['product.template'].get_google_analytics_data(combination_info))"
                 >
                     <div class="row">
                         <div class="col-md-4">
@@ -675,9 +675,20 @@
                             </ol>
                         </div>
                     </div>
-                    <div class="row">
+                    <div
+                        class="row"
+                        id="product_detail_main"
+                        data-name="Product Page"
+                        t-att-data-image_width="website.product_page_image_width"
+                        t-att-data-image_layout="website.product_page_image_layout"
+                    >
                         <div class="col-md-6 col-xl-8">
-                            <t t-call="website_sale.shop_product_carousel" />
+                            <t t-call="website_sale.shop_product_carousel">
+                                <t
+                                    t-set="product_images"
+                                    t-value="product_variant._get_images() if product_variant else product._get_images()"
+                                />
+                            </t>
                         </div>
                         <div class="col-md-6 col-xl-4" id="product_details">
                             <h1 itemprop="name" t-field="product.name">Product Name</h1>
@@ -696,7 +707,7 @@
                                     name="csrf_token"
                                     t-att-value="request.csrf_token()"
                                 />
-                                <div class="js_product js_main_product">
+                                <div class="js_product js_main_product main_product">
                                     <t t-placeholder="select">
                                         <input
                                             type="hidden"
@@ -732,6 +743,13 @@
                                                             t-field="val.attribute_id.name"
                                                         />:
                                                         <span t-field="val.value" />
+                                                        <input
+                                                            type="hidden"
+                                                            class="variant_custom_value"
+                                                            t-att-data-custom_product_template_attribute_value_id="val.attribute_id.id"
+                                                            t-att-data-attribute_value_name="val.attribute_id.name"
+                                                            t-att-value="val.value"
+                                                        />
                                                         <t
                                                             t-foreach="val.attachment_ids"
                                                             t-as="attachment"
@@ -748,17 +766,50 @@
                                             </ul>
                                         </div>
                                     </t>
+                                    <div
+                                        class="d-none oe_unchanged_value_ids"
+                                        t-att-data-unchanged_value_ids="product_variant.product_template_attribute_value_ids.ids"
+                                    />
                                     <t
                                         t-call="website_product_configurator.product_price"
                                     />
-                                    <!-- <p t-if="True" class="css_not_available_msg alert alert-warning">This combination does not exist.</p> -->
-                                    <a
-                                        role="button"
-                                        id="add_to_cart"
-                                        class="btn btn-primary btn-lg mt16 js_check_product a-submit d-block d-sm-inline-block"
-                                        href="#"
-                                    ><i class="fa fa-shopping-cart" /> Add to Cart</a>
-                                    <div id="product_option_block" />
+                                    <ul
+                                        class="d-none js_add_cart_variants mb-0"
+                                        t-att-data-attribute_exclusions="{'exclusions: []'}"
+                                    />
+                                    <div
+                                        id="o_wsale_cta_wrapper"
+                                        class="d-flex flex-wrap align-items-center"
+                                    >
+                                        <t t-set="hasQuantities" t-value="false" />
+                                        <t t-set="hasBuyNow" t-value="false" />
+                                        <t
+                                            t-set="ctaSizeBig"
+                                            t-value="not hasQuantities or not hasBuyNow"
+                                        />
+
+                                        <div
+                                            id="add_to_cart_wrap"
+                                            t-attf-class="{{'d-none' if combination_info['prevent_zero_price_sale'] else 'd-inline-flex'}} align-items-center mb-2 me-auto"
+                                        >
+                                            <a
+                                                data-animation-selector=".o_wsale_product_images"
+                                                role="button"
+                                                id="add_to_cart"
+                                                t-attf-class="btn btn-primary js_check_product a-submit flex-grow-1 #{'btn-lg' if ctaSizeBig else ''}"
+                                                href="#"
+                                            >
+                                                <i class="fa fa-shopping-cart me-2" />
+                                                <span
+                                                    style="font-weight: bold"
+                                                >ADD TO CART</span>
+                                            </a>
+                                        </div>
+                                        <div
+                                            id="product_option_block"
+                                            class="d-flex flex-wrap w-100"
+                                        />
+                                    </div>
                                 </div>
                             </form>
                             <p
@@ -872,19 +923,6 @@
         </xpath>
     </template>
 
-    <template
-        id="recently_viewed_products_product_cfg"
-        inherit_id="website_product_configurator.cfg_product"
-        active="True"
-        customize_show="True"
-        name="Recently Viewed Products"
-        priority="16"
-    >
-        <xpath expr="//div[@t-field='product.website_description']" position="after">
-            <t t-call="website_sale.s_products_recently_viewed" />
-        </xpath>
-    </template>
-
     <template
         id="product_comment_cfg"
         inherit_id="website_product_configurator.cfg_product"
@@ -930,7 +968,7 @@
                 </div>
                 <input
                     type="text"
-                    class="form-control quantity"
+                    class="form-control quantity text-center"
                     data-min="1"
                     name="add_qty"
                     t-att-value="add_qty or 1"
diff --git a/website_product_configurator/data/ir_config_parameter_data.xml b/website_product_configurator/data/ir_config_parameter_data.xml
index 881454bae4..81c7e80753 100644
--- a/website_product_configurator/data/ir_config_parameter_data.xml
+++ b/website_product_configurator/data/ir_config_parameter_data.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <record
-            id="default_configuration_step_website_view_id"
-            model="ir.config_parameter"
-        >
-            <field
-                name="key"
-            >product_configurator.default_configuration_step_website_view_id</field>
-            <field name="value">website_product_configurator.config_form_select</field>
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="default_configuration_step_website_view_id" model="ir.config_parameter">
+        <field
+            name="key"
+        >product_configurator.default_configuration_step_website_view_id</field>
+        <field name="value">website_product_configurator.config_form_select</field>
+    </record>
 </odoo>
diff --git a/website_product_configurator/demo/product_template_demo.xml b/website_product_configurator/demo/product_template_demo.xml
index ef3f1ee4c0..061353d2bb 100644
--- a/website_product_configurator/demo/product_template_demo.xml
+++ b/website_product_configurator/demo/product_template_demo.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
 
         <record id="product_configurator.bmw_2_series" model="product.template">
             <field name="website_published">True</field>
         </record>
 
-    </data>
 </odoo>
diff --git a/website_product_configurator/models/__init__.py b/website_product_configurator/models/__init__.py
index b91ad766b3..755ef05fd4 100644
--- a/website_product_configurator/models/__init__.py
+++ b/website_product_configurator/models/__init__.py
@@ -1,3 +1,4 @@
 from . import product_config
+from . import product_template
 from . import res_config_settings
 from . import sale_order
diff --git a/website_product_configurator/models/product_config.py b/website_product_configurator/models/product_config.py
index 68aa908b49..fe2db1e839 100644
--- a/website_product_configurator/models/product_config.py
+++ b/website_product_configurator/models/product_config.py
@@ -21,7 +21,7 @@ class ProductConfigStepLine(models.Model):
     def get_website_template(self):
         """Return the external id of the qweb template linked to this step"""
         if self.website_tmpl_id:
-            xml_id_dict = self.website_tmpl_id.get_xml_id()
+            xml_id_dict = self.website_tmpl_id.get_external_id()
             view_id = xml_id_dict.get(self.website_tmpl_id.id)
         else:
             view_id = self.env[
diff --git a/website_product_configurator/models/product_template.py b/website_product_configurator/models/product_template.py
new file mode 100644
index 0000000000..3e5d6ccfa6
--- /dev/null
+++ b/website_product_configurator/models/product_template.py
@@ -0,0 +1,58 @@
+#  Copyright 2024 Simone Rubino - Aion Tech
+#  License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+from odoo.exceptions import ValidationError
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    def _get_variant_for_combination(self, combination):
+        self.ensure_one()
+        if self.config_ok and combination:
+            variant = self.env["product.config.session"].search_variant(
+                product_tmpl_id=self,
+                value_ids=combination.product_attribute_value_id.ids,
+            )
+        else:
+            variant = super()._get_variant_for_combination(
+                combination,
+            )
+        return variant
+
+    def _get_possible_combinations(
+        self, parent_combination=None, necessary_values=None
+    ):
+        self.ensure_one()
+        if not self.config_ok:
+            yield from super()._get_possible_combinations(
+                parent_combination=parent_combination,
+                necessary_values=necessary_values,
+            )
+        else:
+            # For configurable products,
+            # custom values cannot be found among ptavs
+            # because it is actually a flag in the pta.
+            # super() would get stuck trying any possible combination
+            # for filling the missing ptav.
+            yield necessary_values
+
+    def _is_combination_possible_by_config(self, combination, ignore_no_variant=False):
+        self.ensure_one()
+        if not self.config_ok:
+            res = super()._is_combination_possible_by_config(
+                combination,
+                ignore_no_variant=ignore_no_variant,
+            )
+        else:
+            try:
+                self.env["product.config.session"].validate_configuration(
+                    value_ids=combination.product_attribute_value_id.ids,
+                    product_tmpl_id=self.id,
+                )
+            except ValidationError:
+                res = False
+            else:
+                res = True
+        return res
diff --git a/website_product_configurator/models/res_config_settings.py b/website_product_configurator/models/res_config_settings.py
index 4b4c15f82e..e25d522b87 100644
--- a/website_product_configurator/models/res_config_settings.py
+++ b/website_product_configurator/models/res_config_settings.py
@@ -28,7 +28,7 @@ def xml_id_to_record_id(self, xml_id):
         return website_tmpl_id
 
     def set_values(self):
-        super(ResConfigSettings, self).set_values()
+        result = super().set_values()
         ICPSudo = self.env["ir.config_parameter"].sudo()
         website_tmpl_xml_id = ""
         if self.website_tmpl_id:
@@ -37,10 +37,11 @@ def set_values(self):
             "product_configurator.default_configuration_step_website_view_id",
             website_tmpl_xml_id,
         )
+        return result
 
     @api.model
     def get_values(self):
-        res = super(ResConfigSettings, self).get_values()
+        res = super().get_values()
         ICPSudo = self.env["ir.config_parameter"].sudo()
         xml_id = ICPSudo.get_param(
             "product_configurator.default_configuration_step_website_view_id"
diff --git a/website_product_configurator/models/sale_order.py b/website_product_configurator/models/sale_order.py
index 7808d86bd1..b174719f27 100644
--- a/website_product_configurator/models/sale_order.py
+++ b/website_product_configurator/models/sale_order.py
@@ -1,8 +1,6 @@
 import logging
 
-from odoo import _, models
-from odoo.exceptions import UserError, ValidationError
-from odoo.http import request
+from odoo import models
 
 _logger = logging.getLogger(__name__)
 
@@ -10,189 +8,32 @@
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
-    # flake8: noqa: C901
-    def _cart_update(
-        self, product_id=None, line_id=None, add_qty=0, set_qty=0, **kwargs
+    def _prepare_order_line_values(
+        self,
+        product_id,
+        quantity,
+        linked_line_id=False,
+        no_variant_attribute_values=None,
+        product_custom_attribute_values=None,
+        **kwargs
     ):
-        """Add or set product quantity, add_qty can be negative"""
-        self.ensure_one()
-        product_context = dict(self.env.context)
-        product_context.setdefault("lang", self.sudo().partner_id.lang)
-        SaleOrderLineSudo = (
-            self.env["sale.order.line"].sudo().with_context(product_context)
+        values = super()._prepare_order_line_values(
+            product_id,
+            quantity,
+            linked_line_id=linked_line_id,
+            no_variant_attribute_values=no_variant_attribute_values,
+            product_custom_attribute_values=product_custom_attribute_values,
+            **kwargs,
         )
-        # change lang to get correct name of attributes/values
-        product_with_context = self.env["product.product"].with_context(product_context)
-        product = product_with_context.browse(int(product_id))
+        config_session_id_str = kwargs.get("config_session_id")
+        if config_session_id_str is not None:
+            values["config_session_id"] = int(config_session_id_str)
+        return values
 
-        if not product.product_tmpl_id.config_ok:
-            return super(SaleOrder, self)._cart_update(
-                product_id=product_id,
-                line_id=line_id,
-                add_qty=add_qty,
-                set_qty=set_qty,
-                kwargs=kwargs,
-            )
-
-        # Config session map
-        config_session_id = kwargs.get("config_session_id", False)
-        if not config_session_id and line_id:
-            order_line = self._cart_find_product_line(product_id, line_id, **kwargs)[:1]
-            config_session_id = order_line.config_session_id.id
-        if config_session_id:
-            config_session_id = int(config_session_id)
-            if not product:
-                config_session = self.env["product.config.session"].browse(
-                    config_session_id
-                )
-                product = config_session.product_id
-            ctx = {
-                "current_sale_line": line_id,
-                "default_config_session_id": config_session_id,
-            }
-            self = self.with_context(ctx)
-            SaleOrderLineSudo = SaleOrderLineSudo.with_context(ctx)
-
-        # Add to cart functionality
-        try:
-            if add_qty:
-                add_qty = float(add_qty)
-        except ValueError:
-            add_qty = 1
-        try:
-            if set_qty:
-                set_qty = float(set_qty)
-        except ValueError:
-            set_qty = 0
-        quantity = 0
-        order_line = False
-        if self.state != "draft":
-            request.session["sale_order_id"] = None
-            raise UserError(
-                _(
-                    "It is forbidden to modify a sales order "
-                    "which is not in draft status."
-                )
-            )
-        if line_id is not False:
-            order_line = self._cart_find_product_line(product_id, line_id, **kwargs)[:1]
-
-        # Create line if no line with product_id can be located
-        if not order_line:
-            if not product:
-                raise UserError(
-                    _(
-                        "The given product does not exist therefore "
-                        "it cannot be added to cart."
-                    )
-                )
-
-            product_id = product.id
-            values = self._website_product_id_change(self.id, product_id, qty=1)
-
-            # create the line
-            order_line = SaleOrderLineSudo.create(values)
-
-            try:
-                order_line._compute_tax_id()
-            except ValidationError as e:
-                # The validation may occur in backend
-                # eg: taxcloud) but should fail silently in frontend
-                _logger.debug("ValidationError occurs during tax compute. %s" % (e))
-            if add_qty:
-                add_qty -= 1
-
-        # compute new quantity
-        if set_qty:
-            quantity = set_qty
-        elif add_qty is not None:
-            quantity = order_line.product_uom_qty + (add_qty or 0)
-
-        # Remove zero of negative lines
-        if quantity <= 0:
-            linked_line = order_line.linked_line_id
-            order_line.unlink()
-            if linked_line:
-                # update description of the parent
-                linked_product = product_with_context.browse(linked_line.product_id.id)
-                linked_line.name = (
-                    linked_line.get_sale_order_line_multiline_description_sale(
-                        linked_product
-                    )
-                )
-        else:
-            # update line
-            no_variant_attributes_price_extra = [
-                ptav.price_extra
-                for ptav in order_line.product_no_variant_attribute_value_ids
-            ]
-            values = self.with_context(
-                no_variant_attributes_price_extra=tuple(
-                    no_variant_attributes_price_extra
-                )
-            )._website_product_id_change(self.id, product_id, qty=quantity)
-            if (
-                self.pricelist_id.discount_policy == "with_discount"
-                and not self.env.context.get("fixed_price")
-            ):
-                order = self.sudo().browse(self.id)
-                product_context.update(
-                    {
-                        "partner": order.partner_id,
-                        "quantity": quantity,
-                        "date": order.date_order,
-                        "pricelist": order.pricelist_id.id,
-                        "company_id": order.company_id.id,
-                    }
-                )
-                product_with_context = self.env["product.product"].with_context(
-                    product_context
-                )
-                product = product_with_context.browse(product_id)
-                values["price_unit"] = self.env[
-                    "account.tax"
-                ]._fix_tax_included_price_company(
-                    order_line._get_display_price(product),
-                    order_line.product_id.taxes_id,
-                    order_line.tax_id,
-                    self.company_id,
-                )
-
-            order_line.write(values)
-
-            # link a product to the sales order
-            if kwargs.get("linked_line_id"):
-                linked_line = SaleOrderLineSudo.browse(kwargs["linked_line_id"])
-                order_line.write({"linked_line_id": linked_line.id})
-                linked_product = product_with_context.browse(linked_line.product_id.id)
-                linked_line.name = (
-                    linked_line.get_sale_order_line_multiline_description_sale(
-                        linked_product
-                    )
-                )
-            # Generate the description with everything. This is done after
-            # creating because the following related fields have to be set:
-            # - product_no_variant_attribute_value_ids
-            # - product_custom_attribute_value_ids
-            # - linked_line_id
-            order_line.name = order_line.get_sale_order_line_multiline_description_sale(
-                product
-            )
-
-        option_lines = self.order_line.filtered(
-            lambda l: l.linked_line_id.id == order_line.id
-        )
-
-        return {
-            "line_id": order_line.id,
-            "quantity": quantity,
-            "option_ids": list(set(option_lines.ids)),
-        }
-
-    def _cart_find_product_line(self, product_id=None, line_id=None, **kwargs):
+    def _cart_find_product_line(self, product_id, line_id=None, **kwargs):
         """Include Config session in search."""
-        order_line = super(SaleOrder, self)._cart_find_product_line(
-            product_id=product_id, line_id=line_id, **kwargs
+        order_line = super()._cart_find_product_line(
+            product_id, line_id=line_id, **kwargs
         )
         # Onchange quantity in cart
         if line_id:
@@ -206,38 +47,3 @@ def _cart_find_product_line(self, product_id=None, line_id=None, **kwargs):
             lambda p: p.config_session_id.id == int(config_session_id)
         )
         return order_line
-
-
-class SaleOrderLine(models.Model):
-    _inherit = "sale.order.line"
-
-    def create(self, vals):
-        res = super(SaleOrderLine, self).create(vals)
-        return res
-
-    def _get_real_price_currency(self, product, rule_id, qty, uom, pricelist_id):
-        if not product.config_ok:
-            return super(SaleOrderLine, self)._get_real_price_currency(
-                product=product,
-                rule_id=rule_id,
-                qty=qty,
-                uom=uom,
-                pricelist_id=pricelist_id,
-            )
-        currency_id = None
-        product_currency = None
-        if rule_id:
-            PricelistItem = self.env["product.pricelist.item"]
-            pricelist_item = PricelistItem.browse(rule_id)
-            currency_id = pricelist_item.pricelist_id.currency_id
-            if pricelist_item.base == "pricelist" and pricelist_item.base_pricelist_id:
-                product_currency = pricelist_item.base_pricelist_id.currency_id
-        product_currency = (
-            product_currency
-            or (product.company_id and product.company_id.currency_id)
-            or self.env.user.company_id.currency_id
-        )
-
-        if not currency_id or currency_id.id == product_currency.id:
-            currency_id = product_currency
-        return product.price, currency_id
diff --git a/website_product_configurator/security/configurator_security.xml b/website_product_configurator/security/configurator_security.xml
index bff5b12b92..aadf319b8d 100644
--- a/website_product_configurator/security/configurator_security.xml
+++ b/website_product_configurator/security/configurator_security.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <record model="res.groups" id="base.group_public">
-            <field
-                name="implied_ids"
-                eval="[(4, ref('product_configurator.group_product_configurator'))]"
-            />
-        </record>
-        <record model="res.groups" id="base.group_portal">
-            <field
-                name="implied_ids"
-                eval="[(4, ref('product_configurator.group_product_configurator'))]"
-            />
-        </record>
-    </data>
+    <record model="res.groups" id="base.group_public">
+        <field
+            name="implied_ids"
+            eval="[(4, ref('product_configurator.group_product_configurator'))]"
+        />
+    </record>
+    <record model="res.groups" id="base.group_portal">
+        <field
+            name="implied_ids"
+            eval="[(4, ref('product_configurator.group_product_configurator'))]"
+        />
+    </record>
 </odoo>
diff --git a/website_product_configurator/static/src/js/config_form.js b/website_product_configurator/static/src/js/config_form.js
index cfc9768363..bff60a9f9a 100644
--- a/website_product_configurator/static/src/js/config_form.js
+++ b/website_product_configurator/static/src/js/config_form.js
@@ -73,7 +73,7 @@ odoo.define("website_product_configurator.config_form", function (require) {
             this.blockui_opts.css["background-color"] = "";
             this.blockui_opts.overlayCSS.opacity = "0.5";
             this.blockui_opts.message =
-                '<h2 class="text-white"><img src="/web/static/src/img/spin.png" class="fa-pulse"/><br /></h2>';
+                '<h2 class="text-white"><img src="/web/static/img/spin.png" class="fa-pulse"/><br /></h2>';
         },
 
         start: function () {
@@ -410,6 +410,7 @@ odoo.define("website_product_configurator.config_form", function (require) {
             var next_step = event.currentTarget.getAttribute("data-step-id");
             var result = self._onChangeConfigStep(event, next_step);
             if (result) {
+                $(event.target).tab("show");
                 self._handleFooterButtons($(event.currentTarget));
             } else {
                 event.preventDefault();
diff --git a/website_product_configurator/static/src/js/website_sale.esm.js b/website_product_configurator/static/src/js/website_sale.esm.js
new file mode 100644
index 0000000000..f4249dc4f5
--- /dev/null
+++ b/website_product_configurator/static/src/js/website_sale.esm.js
@@ -0,0 +1,18 @@
+/** @odoo-module **/
+
+import {WebsiteSale} from "website_sale.website_sale";
+
+WebsiteSale.include({
+    /**
+     * Override to inject configuration session
+     *
+     * @override
+     */
+    // eslint-disable-next-line no-unused-vars
+    _updateRootProduct($form, productId) {
+        this._super(...arguments);
+        this.rootProduct.config_session_id = $form
+            .find('input[name="config_session_id"]')
+            .val();
+    },
+});
diff --git a/website_product_configurator/static/src/js/website_sale.js b/website_product_configurator/static/src/js/website_sale.js
deleted file mode 100644
index 7b24f74e05..0000000000
--- a/website_product_configurator/static/src/js/website_sale.js
+++ /dev/null
@@ -1,55 +0,0 @@
-odoo.define("website_product_configurator.config_website_sale", function (require) {
-    "use strict";
-    var publicWidget = require("web.public.widget");
-
-    publicWidget.registry.WebsiteSale.include({
-        /**
-         * Initializes the optional products modal
-         * and add handlers to the modal events (confirm, back, ...)
-         *
-         * @private
-         * @param {$.Element} $form the related webshop form
-         * @returns {Object}
-         * Override method to add config session
-         */
-        _handleAdd: function ($form) {
-            var self = this;
-            this.$form = $form;
-
-            var productSelector = [
-                'input[type="hidden"][name="product_id"]',
-                'input[type="radio"][name="product_id"]:checked',
-            ];
-
-            var productReady = this.selectOrCreateProduct(
-                $form,
-                parseInt($form.find(productSelector.join(", ")).first().val(), 10),
-                $form.find(".product_template_id").val(),
-                false
-            );
-            return productReady.then(function (productId) {
-                $form.find(productSelector.join(", ")).val(productId);
-
-                self.rootProduct = {
-                    product_id: productId,
-                    quantity: parseFloat(
-                        $form.find('input[name="add_qty"]').val() || 1
-                    ),
-                    product_custom_attribute_values: self.getCustomVariantValues(
-                        $form.find(".js_product")
-                    ),
-                    variant_values: self.getSelectedVariantValues(
-                        $form.find(".js_product")
-                    ),
-                    no_variant_attribute_values: self.getNoVariantAttributeValues(
-                        $form.find(".js_product")
-                    ),
-                    config_session_id: $form
-                        .find('input[name="config_session_id"]')
-                        .val(),
-                };
-                return self._onProductReady();
-            });
-        },
-    });
-});
diff --git a/website_product_configurator/tests/test_sale_order.py b/website_product_configurator/tests/test_sale_order.py
index e2a126c934..2e515add93 100644
--- a/website_product_configurator/tests/test_sale_order.py
+++ b/website_product_configurator/tests/test_sale_order.py
@@ -100,29 +100,42 @@ def test_cart_update(self):
             "If wrong value is added then Order Line quantity as it is.",
         )
 
-    def test_get_real_price_currency(self):
-        price, rule_id = self.sale_order.pricelist_id.get_product_price_rule(
-            self.sale_order.order_line.product_id,
-            self.sale_order.order_line.product_uom_qty,
-            self.sale_order.partner_id,
-        )
-        self.sale_order.order_line._get_real_price_currency(
-            self.sale_order.order_line.product_id,
-            rule_id,
-            self.sale_order.order_line.product_uom_qty,
-            self.sale_order.order_line.product_uom,
-            self.sale_order.pricelist_id.id,
-        )
-        self.assertFalse(
-            self.product.product_tmpl_id.config_ok, "product is config_ok True"
-        )
-        self.product.product_tmpl_id.write({"config_ok": True})
-        price, currency = self.sale_order.order_line._get_real_price_currency(
-            self.sale_order.order_line.product_id,
-            rule_id,
-            self.sale_order.order_line.product_uom_qty,
-            self.sale_order.order_line.product_uom,
-            self.sale_order.pricelist_id.id,
+    def test_cart_update_multi_attribute(self):
+        """A product having multiple values selected for a multi attribute
+        can be added to cart"""
+        # Arrange
+        session = self.session_id
+        session.value_ids |= (
+            self.env.ref("product_configurator.product_attribute_value_218i")
+            | self.env.ref("product_configurator.product_attribute_value_rims_378")
+            | self.env.ref(
+                "product_configurator.product_attribute_value_tapistry_black"
+            )
+            | self.env.ref("product_configurator.product_attribute_value_sport_line")
+            | self.env.ref("product_configurator.product_attribute_value_armrest")
+            | self.env.ref(
+                "product_configurator.product_attribute_value_smoker_package"
+            )
+        )
+        session.action_confirm()
+        product = session.product_id
+        # pre-condition: Product has multiple values for a multi attribute
+        multi_attribute_line = self.env.ref(
+            "product_configurator.product_attribute_line_2_series_options"
+        )
+        self.assertTrue(multi_attribute_line.multi)
+        multi_attribute = multi_attribute_line.attribute_id
+        multi_values = product.product_template_attribute_value_ids.filtered(
+            lambda ptav, attribute=multi_attribute: ptav.attribute_id == multi_attribute
+        )
+        self.assertGreater(len(multi_values), 1)
+
+        # Act
+        result = self.sale_order._cart_update(
+            product.id,
+            add_qty=1,
         )
-        self.assertEqual(price, 0.0)
-        self.assertEqual(currency, self.env.ref("base.USD"))
+
+        # Assert
+        order_line = self.env["sale.order.line"].browse(result["line_id"])
+        self.assertEqual(order_line.product_id, product)
diff --git a/website_product_configurator/views/assets.xml b/website_product_configurator/views/assets.xml
deleted file mode 100644
index 71169b6fad..0000000000
--- a/website_product_configurator/views/assets.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-    <template
-        id="assets_frontend"
-        name="Product Configurator frontend assets"
-        inherit_id="website.assets_frontend"
-    >
-
-        <xpath expr="//script[last()]" position="after">
-            <script
-                type="text/javascript"
-                src="/website_product_configurator/static/src/js/config_form.js"
-            />
-            <script
-                type="text/javascript"
-                src="/website_product_configurator/static/src/js/website_sale.js"
-            />
-            <script
-                type="text/javascript"
-                src="/website_product_configurator/static/src/js/website_config_tour.js"
-            />
-            <link
-                rel="stylesheet"
-                href="/website_product_configurator/static/src/scss/config_form.scss"
-            />
-            <link
-                rel="stylesheet"
-                href="/website_product_configurator/static/src/scss/tooltip.scss"
-            />
-        </xpath>
-
-    </template>
-
-</odoo>
diff --git a/website_product_configurator/views/product_view.xml b/website_product_configurator/views/product_view.xml
index beb7e03252..2cb7a62fb0 100644
--- a/website_product_configurator/views/product_view.xml
+++ b/website_product_configurator/views/product_view.xml
@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-<data>
 
     <record id="product_template_form_view_step_line" model="ir.ui.view">
         <field name="name">product.configurator.product.template.step.line.form</field>
         <field name="model">product.template</field>
         <field
-                name="inherit_id"
-                ref="product_configurator.product_template_only_form_view_inherited"
-            />
+            name="inherit_id"
+            ref="product_configurator.product_template_only_form_view_inherited"
+        />
         <field name="arch" type="xml">
             <xpath
-                    expr="//notebook/page[@name='configurator']//field[@name='config_step_line_ids']//tree//field[@name='attribute_line_ids']"
-                    position="after"
-                >
+                expr="//notebook/page[@name='configurator']//field[@name='config_step_line_ids']//tree//field[@name='attribute_line_ids']"
+                position="after"
+            >
                 <field name="website_tmpl_id" />
             </xpath>
         </field>
     </record>
 
-</data>
 </odoo>
diff --git a/website_product_configurator/views/res_config_settings_view.xml b/website_product_configurator/views/res_config_settings_view.xml
index 8bd8236c81..52f2d2c214 100644
--- a/website_product_configurator/views/res_config_settings_view.xml
+++ b/website_product_configurator/views/res_config_settings_view.xml
@@ -1,44 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
-        <record id="configurator_settings_view_form" model="ir.ui.view">
-            <field name="name">res.config.settings.view.form.inherit.sale</field>
-            <field name="model">res.config.settings</field>
-            <field name="priority" eval="10" />
-            <field
-                name="inherit_id"
-                ref="product_configurator.configurator_settings_view_form"
-            />
-            <field name="arch" type="xml">
-                <xpath expr="//div[@data-key='product_configurator']" position="inside">
-                    <h2>Website</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            id="configurator_website_template"
-                        >
-                            <div class="o_setting_right_pane">
-                                <span class="o_form_label">Website Template</span>
-                                <div class="text-muted">
-                                    Set the default template for configurator tabs(Radio/Select).
-                                </div>
-                                <div class="mt16">
-                                    <field name="website_tmpl_id" class="oe_inline" />
-                                </div>
+    <record id="configurator_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="10" />
+        <field
+            name="inherit_id"
+            ref="product_configurator.configurator_settings_view_form"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@data-key='product_configurator']" position="inside">
+                <h2>Website</h2>
+                <div class="row mt16 o_settings_container">
+                    <div
+                        class="col-12 col-lg-6 o_setting_box"
+                        id="configurator_website_template"
+                    >
+                        <div class="o_setting_right_pane">
+                            <span class="o_form_label">Website Template</span>
+                            <div class="text-muted">
+                                Set the default template for configurator tabs(Radio/Select).
+                            </div>
+                            <div class="mt16">
+                                <field name="website_tmpl_id" class="oe_inline" />
                             </div>
                         </div>
                     </div>
-                </xpath>
-            </field>
-        </record>
+                </div>
+            </xpath>
+        </field>
+    </record>
 
-        <menuitem
-            id="product_configurator.menu_action_product_configurator_configuration"
-            action="product_configurator.action_product_configurator_configuration"
-            name="Settings"
-            active="True"
-            parent="product_configurator.menu_product_configurable_settings"
-            sequence="0"
-        />
-    </data>
+    <menuitem
+        id="product_configurator.menu_action_product_configurator_configuration"
+        action="product_configurator.action_product_configurator_configuration"
+        name="Settings"
+        active="True"
+        parent="product_configurator.menu_product_configurable_settings"
+        sequence="0"
+    />
 </odoo>