From d206c119720d557c11320ebb3d7339890b8f9efa Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Mon, 28 Aug 2023 14:42:05 +0200
Subject: [PATCH] [IMP] theme_*: extract shapes to configurator-dedicated
 templates

This commit extracts the pre-defined section shapes from blocks into
templates that are dedicated to being used by the configurator.

For blocks that are not used in configurator pages, the configurator
templates have not been created.

task-3381714

Part-of: odoo/design-themes#692
---
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 .../views/snippets/s_comparisons.xml          |  16 ++-
 theme_anelusia/views/snippets/s_numbers.xml   |   6 +
 .../views/snippets/s_product_catalog.xml      |   8 +-
 theme_anelusia/views/snippets/s_showcase.xml  |   5 -
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 theme_artists/views/snippets/s_carousel.xml   |  35 +++++-
 theme_artists/views/snippets/s_cover.xml      |  16 ++-
 theme_artists/views/snippets/s_features.xml   |  16 ++-
 .../views/snippets/s_image_gallery.xml        |  15 ++-
 theme_artists/views/snippets/s_image_text.xml |  16 ++-
 theme_artists/views/snippets/s_numbers.xml    |   6 +
 theme_artists/views/snippets/s_parallax.xml   |  11 +-
 .../views/snippets/s_product_catalog.xml      |   8 +-
 .../views/snippets/s_quotes_carousel.xml      |  16 ++-
 theme_artists/views/snippets/s_text_image.xml |  16 ++-
 theme_artists/views/snippets/s_title.xml      |  15 ++-
 theme_avantgarde/views/customizations.xml     |  40 +++++--
 theme_aviato/views/snippets/s_cover.xml       |  16 ++-
 theme_aviato/views/snippets/s_picture.xml     |  13 ++-
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 .../views/snippets/s_company_team.xml         |  16 ++-
 theme_beauty/views/snippets/s_cover.xml       |  16 ++-
 theme_beauty/views/snippets/s_numbers.xml     |   6 +
 theme_beauty/views/snippets/s_picture.xml     |   6 +
 .../views/snippets/s_product_list.xml         |  16 ++-
 theme_beauty/views/snippets/s_title.xml       |   8 +-
 theme_bewise/views/customizations.xml         | 103 ++++++++++++------
 theme_bistro/views/snippets/s_banner.xml      |  14 ++-
 theme_bistro/views/snippets/s_cover.xml       |  19 ++--
 theme_bistro/views/snippets/s_picture.xml     |  15 ++-
 .../views/snippets/s_product_catalog.xml      |  13 ++-
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 theme_bookstore/views/snippets/s_cover.xml    |  16 ++-
 .../views/snippets/s_image_text.xml           |  16 ++-
 .../views/snippets/s_media_list.xml           |  16 ++-
 theme_bookstore/views/snippets/s_numbers.xml  |  16 ++-
 .../views/snippets/s_product_catalog.xml      |  13 ++-
 theme_buzzy/views/snippets/s_banner.xml       |  16 ++-
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 theme_buzzy/views/snippets/s_cover.xml        |  15 ++-
 theme_buzzy/views/snippets/s_features.xml     |  16 ++-
 theme_buzzy/views/snippets/s_numbers.xml      |   6 +
 .../views/snippets/s_process_steps.xml        |   5 -
 .../views/snippets/s_product_catalog.xml      |   8 +-
 .../views/snippets/s_quotes_carousel.xml      |  16 ++-
 theme_buzzy/views/snippets/s_showcase.xml     |   5 -
 .../views/snippets/s_three_columns.xml        |  16 ++-
 theme_buzzy/views/snippets/s_title.xml        |  16 ++-
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 theme_clean/views/snippets/s_comparisons.xml  |  16 ++-
 theme_clean/views/snippets/s_cover.xml        |  16 ++-
 theme_clean/views/snippets/s_numbers.xml      |   6 +
 .../views/snippets/s_three_columns.xml        |  16 ++-
 theme_clean/views/snippets/s_title.xml        |  15 ++-
 theme_cobalt/views/customizations.xml         |  53 ++++++---
 theme_graphene/views/customizations.xml       |  69 ++++++++----
 theme_kea/views/snippets/s_cover.xml          |  16 ++-
 theme_kea/views/snippets/s_image_text.xml     |  16 ++-
 theme_kea/views/snippets/s_media_list.xml     |  16 ++-
 theme_kea/views/snippets/s_picture.xml        |  16 ++-
 theme_kea/views/snippets/s_references.xml     |   6 +
 theme_kea/views/snippets/s_text_image.xml     |  16 ++-
 theme_kiddo/views/snippets/s_banner.xml       |  15 ++-
 .../views/snippets/s_call_to_action.xml       |  18 ++-
 theme_kiddo/views/snippets/s_cover.xml        |  18 ++-
 theme_kiddo/views/snippets/s_image_text.xml   |  18 ++-
 theme_kiddo/views/snippets/s_picture.xml      |  18 ++-
 theme_kiddo/views/snippets/s_text_image.xml   |  18 ++-
 .../views/snippets/s_three_columns.xml        |  18 ++-
 .../views/snippets/s_call_to_action.xml       |  16 ++-
 .../views/snippets/s_image_text.xml           |  16 ++-
 theme_loftspace/views/snippets/s_numbers.xml  |   8 +-
 .../views/snippets/s_product_catalog.xml      |  13 ++-
 .../views/snippets/s_text_image.xml           |  16 ++-
 theme_monglia/views/customizations.xml        |  26 +++--
 theme_nano/views/snippets/s_cover.xml         |  14 ++-
 theme_nano/views/snippets/s_features.xml      |  14 ++-
 theme_nano/views/snippets/s_parallax.xml      |  15 ++-
 theme_notes/views/snippets/s_banner.xml       |  17 ++-
 .../views/snippets/s_call_to_action.xml       |  15 ++-
 theme_notes/views/snippets/s_carousel.xml     |  34 ++++--
 theme_notes/views/snippets/s_company_team.xml |  16 ++-
 theme_notes/views/snippets/s_comparisons.xml  |   4 +-
 theme_notes/views/snippets/s_cover.xml        |  13 ++-
 .../views/snippets/s_features_grid.xml        |   1 -
 theme_notes/views/snippets/s_image_text.xml   |   8 +-
 theme_notes/views/snippets/s_media_list.xml   |  16 ++-
 theme_notes/views/snippets/s_parallax.xml     |   4 +-
 .../views/snippets/s_product_catalog.xml      |  15 ++-
 theme_notes/views/snippets/s_text_image.xml   |   8 +-
 .../views/snippets/s_company_team.xml         |   6 +
 .../views/snippets/s_comparisons.xml          |  19 ++--
 theme_odoo_experts/views/snippets/s_cover.xml |  16 ++-
 .../views/snippets/s_image_text.xml           |  19 ++--
 .../views/snippets/s_media_list.xml           |  15 ++-
 .../views/snippets/s_numbers.xml              |  16 ++-
 .../views/snippets/s_picture.xml              |  15 ++-
 .../views/snippets/s_product_catalog.xml      |  13 ++-
 .../views/snippets/s_text_image.xml           |  16 ++-
 .../views/snippets/s_three_columns.xml        |  16 ++-
 theme_orchid/views/snippets/s_cover.xml       |  16 ++-
 theme_orchid/views/snippets/s_image_text.xml  |  16 ++-
 theme_orchid/views/snippets/s_numbers.xml     |   6 +
 .../views/snippets/s_quotes_carousel.xml      |  16 ++-
 theme_orchid/views/snippets/s_text_image.xml  |  16 ++-
 .../views/snippets/s_three_columns.xml        |  16 ++-
 theme_paptic/views/customizations.xml         |  95 +++++++++++-----
 theme_real_estate/views/snippets/s_banner.xml |  13 ++-
 theme_treehouse/views/snippets/s_banner.xml   |  15 ++-
 .../views/snippets/s_call_to_action.xml       |  15 ++-
 theme_vehicle/views/customizations.xml        |  37 +++++--
 theme_yes/views/snippets/s_company_team.xml   |  19 ++--
 theme_yes/views/snippets/s_cover.xml          |  15 ++-
 theme_yes/views/snippets/s_image_gallery.xml  |   5 -
 theme_yes/views/snippets/s_images_wall.xml    |  19 ++--
 theme_yes/views/snippets/s_media_list.xml     |  16 ++-
 theme_yes/views/snippets/s_three_columns.xml  |  16 ++-
 theme_zap/views/snippets/s_banner.xml         |  12 +-
 119 files changed, 1405 insertions(+), 596 deletions(-)

diff --git a/theme_anelusia/views/snippets/s_call_to_action.xml b/theme_anelusia/views/snippets/s_call_to_action.xml
index 7bccfd974..61024d2d5 100644
--- a/theme_anelusia/views/snippets/s_call_to_action.xml
+++ b/theme_anelusia/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb104 o_cc4" remove="pt48 pb24 o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_02"/>
     </xpath>
     <!-- Title & subtitle -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
@@ -42,4 +37,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_02"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_anelusia/views/snippets/s_comparisons.xml b/theme_anelusia/views/snippets/s_comparisons.xml
index ce9a96d0c..f856f57c6 100644
--- a/theme_anelusia/views/snippets/s_comparisons.xml
+++ b/theme_anelusia/views/snippets/s_comparisons.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_17"/>
     </xpath>
     <!-- Card #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
@@ -34,4 +29,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_17"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_anelusia/views/snippets/s_numbers.xml b/theme_anelusia/views/snippets/s_numbers.xml
index c50fdff0b..e0807b55e 100644
--- a/theme_anelusia/views/snippets/s_numbers.xml
+++ b/theme_anelusia/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height o_cc4" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_anelusia/views/snippets/s_product_catalog.xml b/theme_anelusia/views/snippets/s_product_catalog.xml
index c14218348..122cb6814 100644
--- a/theme_anelusia/views/snippets/s_product_catalog.xml
+++ b/theme_anelusia/views/snippets/s_product_catalog.xml
@@ -5,10 +5,16 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/11","flip":[]}</attribute>
         <!-- Remove the background image -->
         <attribute name="style"/>
     </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/11","flip":[]}</attribute>
+    </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Airy_11"/>
diff --git a/theme_anelusia/views/snippets/s_showcase.xml b/theme_anelusia/views/snippets/s_showcase.xml
index 4c9f8d122..ad17920bd 100644
--- a/theme_anelusia/views/snippets/s_showcase.xml
+++ b/theme_anelusia/views/snippets/s_showcase.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120" remove="pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_05"/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_call_to_action.xml b/theme_artists/views/snippets/s_call_to_action.xml
index 98e51f8c9..93f976df4 100644
--- a/theme_artists/views/snippets/s_call_to_action.xml
+++ b/theme_artists/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb208 pt64 o_cc4" remove="pb24 pt48 o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h3" position="replace" mode="inner">
@@ -20,4 +15,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_carousel.xml b/theme_artists/views/snippets/s_carousel.xml
index 342c9c9a0..c4c8d13bf 100644
--- a/theme_artists/views/snippets/s_carousel.xml
+++ b/theme_artists/views/snippets/s_carousel.xml
@@ -4,13 +4,11 @@
 <template id="s_carousel" inherit_id="website.s_carousel">
     <!-- Carousel-item #01 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
     <!-- Shape & filter -->
     <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-25"/>
-        <div class="o_we_shape o_web_editor_Origins_16"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('carousel-content')]" position="replace">
@@ -25,13 +23,11 @@
 
     <!-- Carousel-item #02 -->
     <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["y"]}</attribute>
         <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pt96 pb96" separator=" "/>
     </xpath>
     <!-- Shape & filter -->
     <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-25"/>
-        <div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('carousel-content')]" position="replace">
@@ -46,13 +42,11 @@
 
     <!-- Carousel-item #03 -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
         <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pb112 pt112" separator=" "/>
     </xpath>
     <!-- Shape & filter -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-25"/>
-        <div class="o_we_shape o_web_editor_Origins_16"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('carousel-content')]" position="replace">
@@ -66,4 +60,33 @@
     </xpath>
 </template>
 
+<template id="configurator_s_carousel" inherit_id="website.configurator_s_carousel">
+    <!-- Carousel-item #01 -->
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_16"/>
+    </xpath>
+
+    <!-- Carousel-item #02 -->
+    <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+    </xpath>
+
+    <!-- Carousel-item #03 -->
+    <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_16"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_cover.xml b/theme_artists/views/snippets/s_cover.xml
index 99012d720..873c83db1 100644
--- a/theme_artists/views/snippets/s_cover.xml
+++ b/theme_artists/views/snippets/s_cover.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt200 pb200 o_cc o_cc4" remove="pb96 pt96 s_parallax_bg parallax s_parallax_is_fixed bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_02"/>
     </xpath>
     <!-- Remove filter & parallax -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
@@ -23,4 +18,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_02"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_features.xml b/theme_artists/views/snippets/s_features.xml
index ec27677cb..d19edf967 100644
--- a/theme_artists/views/snippets/s_features.xml
+++ b/theme_artists/views/snippets/s_features.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_14"/>
     </xpath>
     <!-- Feature #01 - Icon -->
     <xpath expr="//i" position="attributes">
@@ -21,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_features" inherit_id="website.configurator_s_features">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_14"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_image_gallery.xml b/theme_artists/views/snippets/s_image_gallery.xml
index 4f1eb18de..17d8612f0 100644
--- a/theme_artists/views/snippets/s_image_gallery.xml
+++ b/theme_artists/views/snippets/s_image_gallery.xml
@@ -5,14 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="parallax s_parallax_is_fixed" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
-    <!-- Shape, parallax background & filter -->
+    <!-- Parallax background & filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image');"/>
         <div class="o_we_bg_filter" style="background-color: rgba(17, 13, 22, 0.85) !important;"/>
-        <div class="o_we_shape o_web_editor_Wavy_04"/>
     </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
@@ -32,6 +30,17 @@
     </xpath>
 </template>
 
+<template id="configurator_s_images_wall" inherit_id="website.configurator_s_images_wall">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape, parallax background & filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04"/>
+    </xpath>
+</template>
+
 <template id="s_image_gallery" inherit_id="website.s_image_gallery">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
diff --git a/theme_artists/views/snippets/s_image_text.xml b/theme_artists/views/snippets/s_image_text.xml
index 3f4ff860e..ff23a561c 100644
--- a/theme_artists/views/snippets/s_image_text.xml
+++ b/theme_artists/views/snippets/s_image_text.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt128" remove="pt32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_05"/>
     </xpath>
     <!-- Text wrapper -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -32,4 +27,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_05"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_numbers.xml b/theme_artists/views/snippets/s_numbers.xml
index d25e8526a..9158ffd43 100644
--- a/theme_artists/views/snippets/s_numbers.xml
+++ b/theme_artists/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb120 pt120 o_cc5" remove="pb24 pt24 o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_artists/views/snippets/s_parallax.xml b/theme_artists/views/snippets/s_parallax.xml
index 8101ec2f2..1c7d4b79b 100644
--- a/theme_artists/views/snippets/s_parallax.xml
+++ b/theme_artists/views/snippets/s_parallax.xml
@@ -2,14 +2,17 @@
 <odoo>
 
 <template id="s_parallax" inherit_id="website.s_parallax">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
-    </xpath>
     <!-- Bg Image -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 75%;"/>
     </xpath>
+</template>
+
+<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+    </xpath>
     <!-- Shape -->
     <xpath expr="//section/*[last()]" position="before">
         <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
diff --git a/theme_artists/views/snippets/s_product_catalog.xml b/theme_artists/views/snippets/s_product_catalog.xml
index 6b8911bd7..a8f1571ca 100644
--- a/theme_artists/views/snippets/s_product_catalog.xml
+++ b/theme_artists/views/snippets/s_product_catalog.xml
@@ -5,9 +5,15 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt200 pb200" remove="pb32 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":[]}</attribute>
         <attribute name="style"/>
     </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":[]}</attribute>
+    </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Wavy_08"/>
diff --git a/theme_artists/views/snippets/s_quotes_carousel.xml b/theme_artists/views/snippets/s_quotes_carousel.xml
index 08faf814d..0a49d2853 100644
--- a/theme_artists/views/snippets/s_quotes_carousel.xml
+++ b/theme_artists/views/snippets/s_quotes_carousel.xml
@@ -5,11 +5,6 @@
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_rounded o_cc4" remove="s_carousel_default o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_09"/>
     </xpath>
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
@@ -33,4 +28,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
+    <!-- Shape option -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_09"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_text_image.xml b/theme_artists/views/snippets/s_text_image.xml
index d6ca607e2..ba219e49b 100644
--- a/theme_artists/views/snippets/s_text_image.xml
+++ b/theme_artists/views/snippets/s_text_image.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pb128" remove="pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" />
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -35,4 +30,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04" />
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_artists/views/snippets/s_title.xml b/theme_artists/views/snippets/s_title.xml
index 15ebfd966..ed2a7ce52 100644
--- a/theme_artists/views/snippets/s_title.xml
+++ b/theme_artists/views/snippets/s_title.xml
@@ -5,14 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt256 parallax s_parallax_is_fixed o_cc o_cc5" remove="pt40" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
-    <!-- Shape, parallax background & filter -->
+    <!-- Parallax background & filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image');"/>
         <div class="o_we_bg_filter" style="background-color: rgba(17, 13, 22, 0.85) !important;"/>
-        <div class="o_we_shape o_web_editor_Airy_12_001 o_second_extra_shape_mapping"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -20,4 +18,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_title" inherit_id="website.configurator_s_title">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_12_001 o_second_extra_shape_mapping"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 02742f982..49ec2e413 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -5,14 +5,10 @@
 <template id="s_cover" inherit_id="website.s_cover" name="Avantgarde s_cover">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="s_parallax_no_overflow_hidden o_full_screen_height" remove="s_parallax_is_fixed s_parallax" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
         <attribute name="style" remove="background-position: 50% 0;" add="background-position: 50% 80%;" separator=";"/>
     </xpath>
-    <xpath expr="//div[hasclass('s_allow_columns')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
-    </xpath>
     <xpath expr="//font" position="attributes">
         <attribute name="class" add="text-o-color-1 text-break" separator=" "/>
     </xpath>
@@ -28,6 +24,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover" name="Avantgarde s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('s_allow_columns')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 <!-- ======== PICTURE ======== -->
 <template id="s_picture" inherit_id="website.s_picture" name="Avantgarde s_cover">
     <xpath expr="//section" position="attributes">
@@ -70,10 +75,6 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Avantgarde s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb240 o_full_screen_height" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20"}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_20"/>
     </xpath>
     <xpath expr="//*[hasclass('card')]" position="attributes">
         <attribute name="class" add="shadow border" separator=" "/>
@@ -106,6 +107,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns" name="Avantgarde s_three_columns">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20"}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_20"/>
+    </xpath>
+</template>
+
 <!-- ======== TEXT-IMAGE ======== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Avantgarde s_text_image">
     <xpath expr="//section" position="attributes">
@@ -163,10 +173,6 @@
 
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3 o_half_screen_height pt0" remove="pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001"/>
     </xpath>
     <xpath expr="//h3" position="replace">
         <h3 style="text-align: right;"><b>Since 1992</b> creating around the world.</h3>
@@ -191,6 +197,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Avantgarde s_call_to_action">
+
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001"/>
+    </xpath>
+</template>
+
 <!-- ======== CAROUSEL ======== -->
 <template id="s_carousel" inherit_id="website.s_carousel" name="Avantgarde s_carousel">
     <!-- Assign slide3 as 'active' and move it in first position -->
diff --git a/theme_aviato/views/snippets/s_cover.xml b/theme_aviato/views/snippets/s_cover.xml
index 399bbdc6c..9ee1d5bd6 100644
--- a/theme_aviato/views/snippets/s_cover.xml
+++ b/theme_aviato/views/snippets/s_cover.xml
@@ -5,15 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt192 pb192" remove="pt96 pb96 s_parallax_is_fixed" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/21","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;"/>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_21" style="background-image: url('/web_editor/shape/web_editor/Wavy/21.svg?c2=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Travel to any corner <br/>of the world
@@ -29,4 +24,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/21","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_21" style="background-image: url('/web_editor/shape/web_editor/Wavy/21.svg?c2=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_aviato/views/snippets/s_picture.xml b/theme_aviato/views/snippets/s_picture.xml
index bc90f388b..f38fdbe13 100644
--- a/theme_aviato/views/snippets/s_picture.xml
+++ b/theme_aviato/views/snippets/s_picture.xml
@@ -4,10 +4,6 @@
 <template id="s_picture" inherit_id="website.s_picture">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 overflow-hidden o_cc3 bg-o-color-3" remove="pt48 o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Bold_07_001"/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Our travel agencies
@@ -21,4 +17,13 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Bold_07_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_call_to_action.xml b/theme_beauty/views/snippets/s_call_to_action.xml
index 32985f11b..7647ff3fa 100644
--- a/theme_beauty/views/snippets/s_call_to_action.xml
+++ b/theme_beauty/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt128 pb128" remove="pt48 pb24 bg-200" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/05_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_05_001"/>
     </xpath>
     <!-- Layout -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
@@ -31,4 +26,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/05_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_05_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index 75d8443cc..6e7117086 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_20" style="background-image: url('/web_editor/shape/web_editor/Wavy/20.svg?c2=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Titles -->
     <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace" mode="inner">
@@ -39,4 +34,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_20" style="background-image: url('/web_editor/shape/web_editor/Wavy/20.svg?c2=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index 7fe634fd2..eff10a679 100644
--- a/theme_beauty/views/snippets/s_cover.xml
+++ b/theme_beauty/views/snippets/s_cover.xml
@@ -5,7 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height bg-black-15 o_cc o_cc5" remove="bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
     </xpath>
     <!-- Change position of background image -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
@@ -15,10 +14,6 @@
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
         <attribute name="class" add="bg-black-15" remove="bg-black-50" separator=" "/>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_09"/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Working beauty <br/>from the inside out
@@ -28,4 +23,15 @@
     <xpath expr="//p[1]" position="replace"/>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_09"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_numbers.xml b/theme_beauty/views/snippets/s_numbers.xml
index ffe5543e4..9680a8ac1 100644
--- a/theme_beauty/views/snippets/s_numbers.xml
+++ b/theme_beauty/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_beauty/views/snippets/s_picture.xml b/theme_beauty/views/snippets/s_picture.xml
index 752940d02..cc45d9b90 100644
--- a/theme_beauty/views/snippets/s_picture.xml
+++ b/theme_beauty/views/snippets/s_picture.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/06","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_beauty/views/snippets/s_product_list.xml b/theme_beauty/views/snippets/s_product_list.xml
index e49f9ae9d..abe2eabf1 100644
--- a/theme_beauty/views/snippets/s_product_list.xml
+++ b/theme_beauty/views/snippets/s_product_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/15","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container-fluid')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_15"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container-fluid')]" position="attributes">
@@ -59,4 +54,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_product_list" inherit_id="website.configurator_s_product_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/15","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container-fluid')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_15"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_title.xml b/theme_beauty/views/snippets/s_title.xml
index f12326c8c..7f3a98594 100644
--- a/theme_beauty/views/snippets/s_title.xml
+++ b/theme_beauty/views/snippets/s_title.xml
@@ -5,12 +5,18 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pt80" remove="pt40" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":["y"]}</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Close your eyes and let yourself go in the expert hands of our beauticians.
     </xpath>
+</template>
+
+<template id="configurator_s_title" inherit_id="website.configurator_s_title">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":["y"]}</attribute>
+    </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Wavy_13_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/13_001.svg?c1=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index c5ca77bb2..299a6392b 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -6,13 +6,8 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt200 pb200 o_cc o_cc5 oe_img_bg o_bg_img_center" remove="bg-black-50 s_parallax_is_fixed parallax pt96 pb96" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">0</attribute>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
-    </xpath>
     <!-- Remove the background image for parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <!-- Button -->
@@ -32,6 +27,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover" name="Be Wise s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+    </xpath>
+</template>
+
 <!-- ======== TEXT-IMAGE ======== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Be Wise s_text_image">
     <xpath expr="//h2" position="replace" mode="inner">
@@ -88,10 +93,6 @@
 <template id="s_numbers" inherit_id="website.s_numbers" name="Be Wise s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
     <xpath expr="//h6" position="replace" mode="inner">
         Faculties
@@ -110,6 +111,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers" name="Be Wise s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 <!-- ======== QUOTES ======== -->
 <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel" name="Be Wise s_quotes_carousel">
     <!-- Section : Add a main background to the carousel -->
@@ -124,11 +134,6 @@
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_rounded" remove="o_cc o_cc2 s_carousel_default" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-4&amp;c4=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Slide #1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
@@ -189,15 +194,19 @@
     </xpath>
 </template>
 
-<!-- ======== CALL TO ACTION ======== -->
-<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Be Wise s_call_to_action">
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
+<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel" name="Be Wise s_quotes_carousel">
+    <!-- Shape option -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_11"/>
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-4&amp;c4=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
+</template>
+
+<!-- ======== CALL TO ACTION ======== -->
+<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Be Wise s_call_to_action">
     <!-- Title -->
     <xpath expr="//h3" position="replace">
         <h4><b>3,000 students</b> graduate each year find a job within 2 months</h4>
@@ -212,14 +221,18 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Be Wise s_call_to_action">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_11"/>
+    </xpath>
+</template>
+
 <!-- ======== TEAM ======== -->
 <template id="s_company_team" inherit_id="website.s_company_team" name="Be Wise s_company_team">
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/09","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_09"/>
-    </xpath>
     <!-- Profile #1 -->
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
         <b>Tony Fred, Faculty Head of IT</b>
@@ -247,6 +260,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team" name="Be Wise s_company_team">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/09","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_09"/>
+    </xpath>
+</template>
+
 <!-- ======== BIG BOXES ======== -->
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Be Wise s_color_blocks_2">
     <!-- Left column -->
@@ -344,13 +366,6 @@
 
 <!-- ======== MEDIA LIST ======== -->
 <template id="s_media_list" inherit_id="website.s_media_list" name="Be Wise s_media_list">
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/04_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_04_001"/>
-    </xpath>
     <!-- Item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
         <attribute name="class" add="col-lg-10" remove="col-lg-12" separator=" "/>
@@ -395,6 +410,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list" name="Be Wise s_media_list">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/04_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_04_001"/>
+    </xpath>
+</template>
+
 <!-- ======== COMPARISONS ======== -->
 <template id="s_comparisons" inherit_id="website.s_comparisons" name="Be Wise s_comparisons">
     <xpath expr="//div[hasclass('card')]//li[hasclass('list-group-item')]" position="replace" mode="inner">
@@ -429,11 +454,19 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Be Wise s_product_catalog">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt120 pb120" remove="pt48 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/06","flip":[]}</attribute>
     </xpath>
-    <!-- Filter & shape -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-75"/>
+    </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog" name="Be Wise s_product_catalog">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/06","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Floats_06"/>
     </xpath>
 </template>
diff --git a/theme_bistro/views/snippets/s_banner.xml b/theme_bistro/views/snippets/s_banner.xml
index 7573b041a..efb64587a 100644
--- a/theme_bistro/views/snippets/s_banner.xml
+++ b/theme_bistro/views/snippets/s_banner.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
-    </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_09_001" style="background-image: url('/web_editor/shape/web_editor/Origins/09_001.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -16,4 +12,14 @@
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_09_001" style="background-image: url('/web_editor/shape/web_editor/Origins/09_001.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_cover.xml b/theme_bistro/views/snippets/s_cover.xml
index 613575f0c..2623d0dfe 100644
--- a/theme_bistro/views/snippets/s_cover.xml
+++ b/theme_bistro/views/snippets/s_cover.xml
@@ -2,16 +2,10 @@
 <odoo>
 
 <template id="s_cover" inherit_id="website.s_cover">
-    <!-- Section -->
-    <xpath expr="section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
-    </xpath>
+    <!-- Parallax -->
     <xpath expr="//*[hasclass('s_parallax_bg')]" position="attributes">
         <attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 0;" separator=" "/>
     </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_06"/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h1//font" position="replace" mode="inner">
         Seasonal<br/> Flavors
@@ -32,4 +26,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Zigs_06"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_picture.xml b/theme_bistro/views/snippets/s_picture.xml
index 52a6099d3..aa770b813 100644
--- a/theme_bistro/views/snippets/s_picture.xml
+++ b/theme_bistro/views/snippets/s_picture.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3 pt64" remove="o_cc2 pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_04_001"/>
     </xpath>
     <!-- Size -->
     <xpath expr="//div[hasclass('col-lg-10')]" position="attributes">
@@ -28,4 +24,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_04_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index abe7ea75b..717b8082d 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -7,12 +7,10 @@
         <attribute name="style"/>
         <attribute name="class" add="s_parallax parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt48 pb32" separator=" "/>
         <attribute name="data-scroll-background-ratio">1</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_product_catalog_default_image'); background-position: 50% 0%;"/>
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Zigs_06"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace"/>
@@ -20,6 +18,17 @@
     <xpath expr="//p" position="replace"/>
 </template>
 
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Zigs_06"/>
+    </xpath>
+</template>
+
 <template id="s_product_catalog_dish" inherit_id="website.s_product_catalog_dish">
     <xpath expr="//li" position="inside">
         <p class="s_product_catalog_dish_description border-top text-muted pt-1 o_default_snippet_text">
diff --git a/theme_bookstore/views/snippets/s_call_to_action.xml b/theme_bookstore/views/snippets/s_call_to_action.xml
index 5ab36b926..0fc802a3e 100644
--- a/theme_bookstore/views/snippets/s_call_to_action.xml
+++ b/theme_bookstore/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt128 pb32" remove="o_cc3 pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":["x","y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_20" style="background-image: url('/web_editor/shape/web_editor/Wavy/20.svg?c2=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Paragraph #1 -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="replace">
@@ -29,4 +24,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":["x","y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_20" style="background-image: url('/web_editor/shape/web_editor/Wavy/20.svg?c2=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml
index 779fb0521..ffc022bd4 100644
--- a/theme_bookstore/views/snippets/s_cover.xml
+++ b/theme_bookstore/views/snippets/s_cover.xml
@@ -6,17 +6,12 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="oe_img_bg o_full_screen_height" remove="parallax s_parallax_is_fixed bg-black-50" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/03","flip":[]}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 55%;</attribute>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-white-75"/>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_03"/>
-    </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <!-- Title -->
@@ -33,4 +28,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/03","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_03"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bookstore/views/snippets/s_image_text.xml b/theme_bookstore/views/snippets/s_image_text.xml
index 2c587fdba..4648c3506 100644
--- a/theme_bookstore/views/snippets/s_image_text.xml
+++ b/theme_bookstore/views/snippets/s_image_text.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt112 pb112" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_20"/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
@@ -30,4 +25,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_20"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bookstore/views/snippets/s_media_list.xml b/theme_bookstore/views/snippets/s_media_list.xml
index 5e58c5c8b..b40295da0 100644
--- a/theme_bookstore/views/snippets/s_media_list.xml
+++ b/theme_bookstore/views/snippets/s_media_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_10"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
@@ -32,4 +27,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_10"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bookstore/views/snippets/s_numbers.xml b/theme_bookstore/views/snippets/s_numbers.xml
index 3fbfee8f3..8eb67879f 100644
--- a/theme_bookstore/views/snippets/s_numbers.xml
+++ b/theme_bookstore/views/snippets/s_numbers.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt112 pb112" remove="o_cc2 pt24 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Titles -->
     <xpath expr="//h6" position="replace" mode="inner">
@@ -26,4 +21,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bookstore/views/snippets/s_product_catalog.xml b/theme_bookstore/views/snippets/s_product_catalog.xml
index 22375fca0..78fd95fe8 100644
--- a/theme_bookstore/views/snippets/s_product_catalog.xml
+++ b/theme_bookstore/views/snippets/s_product_catalog.xml
@@ -5,11 +5,20 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pb112 pt112" remove="pb32 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":["y"]}</attribute>
     </xpath>
-    <!-- Shape and filter -->
+    <!-- Filter -->
     <xpath expr="//section/*" position="before">
         <div class="o_we_bg_filter" style="background-color: rgba(47, 47, 47, 0.7) !important;"/>
+    </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//section/*" position="before">
         <div class="o_we_shape o_web_editor_Origins_17" style="background-image: url('/web_editor/shape/web_editor/Origins/17.svg?c3=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 </template>
diff --git a/theme_buzzy/views/snippets/s_banner.xml b/theme_buzzy/views/snippets/s_banner.xml
index 94dba552e..8559584e2 100644
--- a/theme_buzzy/views/snippets/s_banner.xml
+++ b/theme_buzzy/views/snippets/s_banner.xml
@@ -5,7 +5,6 @@
    <!-- Section -->
    <xpath expr="//section" position="attributes">
       <attribute name="class" add="pb120 pt256 oe_img_bg o_bg_img_center" remove="pt96 pb96" separator=" "/>
-      <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
       <!-- Enable SVG dynamic color functionality -->
       <attribute name="style">background-image:url('/web_editor/shape/theme_buzzy/s_banner.svg?c1=o-color-1'); background-position: 50% 37%</attribute>
    </xpath>
@@ -15,10 +14,6 @@
    <xpath expr="//div[hasclass('o_grid_item_image')]" position="replace"/>
    <!-- Remove hr -->
    <xpath expr="//div[hasclass('s_hr')]" position="replace"/>
-   <!-- Shape -->
-   <xpath expr="//div[hasclass('container')]" position="before">
-      <div class="o_we_shape o_web_editor_Origins_02_001"/>
-   </xpath>
    <!-- Row - remove grid mode -->
    <xpath expr="//div[hasclass('row')]" position="attributes">
       <attribute name="class" remove="o_grid_mode" separator=" "/>
@@ -44,4 +39,15 @@
    </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_call_to_action.xml b/theme_buzzy/views/snippets/s_call_to_action.xml
index 8c5d8b2d1..0021ff348 100644
--- a/theme_buzzy/views/snippets/s_call_to_action.xml
+++ b/theme_buzzy/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 pt88 pb48" remove="o_cc3 pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
@@ -33,4 +28,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_cover.xml b/theme_buzzy/views/snippets/s_cover.xml
index 75f4636f4..7ce9b1602 100644
--- a/theme_buzzy/views/snippets/s_cover.xml
+++ b/theme_buzzy/views/snippets/s_cover.xml
@@ -5,16 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt96 pb96 bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter" style="background-color: rgba(52,54,67,0.75) !important;"/>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Airy_03_001"/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Faster, lighter and more powerful
@@ -28,4 +23,14 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
+        <div class="o_we_shape o_web_editor_Airy_03_001"/>
+    </xpath>
+</template>
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_features.xml b/theme_buzzy/views/snippets/s_features.xml
index c386afadd..fab03588a 100644
--- a/theme_buzzy/views/snippets/s_features.xml
+++ b/theme_buzzy/views/snippets/s_features.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
     </xpath>
     <!-- Feature #2 - Icon -->
     <xpath expr="//div[hasclass('row')]//div[2]//i" position="attributes">
@@ -21,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_features" inherit_id="website.configurator_s_features">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_numbers.xml b/theme_buzzy/views/snippets/s_numbers.xml
index 141c2c75f..26a2d626f 100644
--- a/theme_buzzy/views/snippets/s_numbers.xml
+++ b/theme_buzzy/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt96 pb96" remove="o_cc2 pt24 pb24" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/02_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_buzzy/views/snippets/s_process_steps.xml b/theme_buzzy/views/snippets/s_process_steps.xml
index 7b8484ce6..6b152fb3a 100644
--- a/theme_buzzy/views/snippets/s_process_steps.xml
+++ b/theme_buzzy/views/snippets/s_process_steps.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
     </xpath>
     <!-- Icon #2 -->
     <xpath expr="(//i)[2]" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_product_catalog.xml b/theme_buzzy/views/snippets/s_product_catalog.xml
index b14776c19..abc87be64 100644
--- a/theme_buzzy/views/snippets/s_product_catalog.xml
+++ b/theme_buzzy/views/snippets/s_product_catalog.xml
@@ -5,10 +5,16 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pb88 pt88" remove="pb32 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07","flip":[]}</attribute>
         <!-- Enable SVG dynamic color functionality -->
         <attribute name="style">background-image: url('/web_editor/shape/theme_buzzy/s_product_catalog.svg?c1=o-color-1'); background-position: 50% 0%;</attribute>
     </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07","flip":[]}</attribute>
+    </xpath>
     <!-- Shape -->
     <xpath expr="//section/*" position="before">
         <div class="o_we_shape o_web_editor_Airy_07"/>
diff --git a/theme_buzzy/views/snippets/s_quotes_carousel.xml b/theme_buzzy/views/snippets/s_quotes_carousel.xml
index 0f1ac3844..fd99d75af 100644
--- a/theme_buzzy/views/snippets/s_quotes_carousel.xml
+++ b/theme_buzzy/views/snippets/s_quotes_carousel.xml
@@ -5,11 +5,6 @@
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_rounded o_cc5" remove="s_carousel_default o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_10"/>
     </xpath>
     <!-- Icons quote -->
     <xpath expr="//i" position="attributes">
@@ -33,4 +28,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
+    <!-- Shape option -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_10"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_showcase.xml b/theme_buzzy/views/snippets/s_showcase.xml
index 20ffa57cf..e1904f8d2 100644
--- a/theme_buzzy/views/snippets/s_showcase.xml
+++ b/theme_buzzy/views/snippets/s_showcase.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/03","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_03"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_three_columns.xml b/theme_buzzy/views/snippets/s_three_columns.xml
index d52c966b2..4b58065ae 100644
--- a/theme_buzzy/views/snippets/s_three_columns.xml
+++ b/theme_buzzy/views/snippets/s_three_columns.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_12_001"/>
     </xpath>
 
     <!-- Column #1 -->
@@ -61,4 +56,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_12_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_title.xml b/theme_buzzy/views/snippets/s_title.xml
index ca070e971..e792f16c2 100644
--- a/theme_buzzy/views/snippets/s_title.xml
+++ b/theme_buzzy/views/snippets/s_title.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pt152 pb152 oe_img_bg o_bg_img_center" remove="pb40 pt40" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//section/*" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -17,4 +12,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_title" inherit_id="website.configurator_s_title">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//section/*" position="before">
+        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_clean/views/snippets/s_call_to_action.xml b/theme_clean/views/snippets/s_call_to_action.xml
index df17f2b52..e50da57c8 100644
--- a/theme_clean/views/snippets/s_call_to_action.xml
+++ b/theme_clean/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 o_cc2" remove="pt48 o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001", "flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-4&amp;c4=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Paragraph -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
@@ -23,4 +18,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001", "flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-4&amp;c4=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_clean/views/snippets/s_comparisons.xml b/theme_clean/views/snippets/s_comparisons.xml
index 3a7bf2f67..9e21c9f69 100644
--- a/theme_clean/views/snippets/s_comparisons.xml
+++ b/theme_clean/views/snippets/s_comparisons.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_05" style="background-image: url('/web_editor/shape/web_editor/Wavy/05.svg?c1=o-color-1&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Left card -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
@@ -21,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_05" style="background-image: url('/web_editor/shape/web_editor/Wavy/05.svg?c1=o-color-1&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_clean/views/snippets/s_cover.xml b/theme_clean/views/snippets/s_cover.xml
index 70034ae9e..5263de432 100644
--- a/theme_clean/views/snippets/s_cover.xml
+++ b/theme_clean/views/snippets/s_cover.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
@@ -26,4 +21,15 @@
     <xpath expr="//p[2]" position="replace"/>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_clean/views/snippets/s_numbers.xml b/theme_clean/views/snippets/s_numbers.xml
index a976a5c58..cc103bf95 100644
--- a/theme_clean/views/snippets/s_numbers.xml
+++ b/theme_clean/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt64" remove="o_cc2 pt24" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_clean/views/snippets/s_three_columns.xml b/theme_clean/views/snippets/s_three_columns.xml
index d3196b0d1..dbcfde178 100644
--- a/theme_clean/views/snippets/s_three_columns.xml
+++ b/theme_clean/views/snippets/s_three_columns.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_04_001"/>
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
@@ -43,4 +38,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_04_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_clean/views/snippets/s_title.xml b/theme_clean/views/snippets/s_title.xml
index c8b69cbc9..f1c694f04 100644
--- a/theme_clean/views/snippets/s_title.xml
+++ b/theme_clean/views/snippets/s_title.xml
@@ -6,13 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 o_full_screen_height parallax s_parallax_is_fixed" separator=" "/>
         <attribute name="data-scroll-background-ratio">1</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
     </xpath>
-    <!-- Shape, filter & background image -->
+    <!-- Filter & background image -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_banner_default_image');"/>
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -20,4 +18,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_title" inherit_id="website.configurator_s_title">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 21b980f17..63f5fcf95 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -6,10 +6,6 @@
     <!-- Content -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt152 pb128" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/11_001","flip":["y"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_11_001" style="background-image: url('/web_editor/shape/web_editor/Origins/11_001.svg?c3=o-color-4&amp;c4=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Row - remove grid mode -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -50,16 +46,20 @@
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner" name="Cobalt s_banner">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/11_001","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Origins_11_001" style="background-image: url('/web_editor/shape/web_editor/Origins/11_001.svg?c3=o-color-4&amp;c4=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Cobalt s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt152 pb128" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/03","flip":[]}</attribute>
-    </xpath>
-
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_03"/>
     </xpath>
     <!-- Layout -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -80,6 +80,15 @@
     <xpath expr="//a[hasclass('btn')]" position="replace"/>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text" name="Cobalt s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/03","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_03"/>
+    </xpath>
+</template>
+
 <!-- ==== Text-Image ===== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Cobalt s_text_image">
     <!-- Section -->
@@ -152,10 +161,6 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Cobalt s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc o_cc2 pt32 pb32" add="pt72 pb120" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["x"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]" position="before">
         <h2 style="text-align: center;">Latest projects</h2>
@@ -163,6 +168,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns" name="Cobalt s_three_columns">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 <!-- ==== Call To Action ===== -->
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Cobalt s_call_to_action">
     <xpath expr="//t[@t-esc='cta_btn_text']" position="replace" mode="inner">
@@ -174,10 +188,6 @@
 <template id="s_picture" inherit_id="website.s_picture" name="Cobalt s_picture">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 overflow-hidden" remove="o_cc o_cc2 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="attributes">
         <attribute name="class" add="container-fluid px-5 px-lg-0" remove="container" separator=" "/>
@@ -190,6 +200,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture" name="Cobalt s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Bold_01" style="background-image: url('/web_editor/shape/web_editor/Bold/01.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
+    </xpath>
+</template>
+
 <!-- ==== Images Gallery ===== -->
  <template id="s_image_gallery" inherit_id="website.s_image_gallery">
     <!-- Section -->
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 4c5d34a71..1339539bc 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -5,10 +5,6 @@
 <template id="s_cover" inherit_id="website.s_cover" name="Graphene s_cover">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt160 pb240 s_parallax_no_overflow_hidden" remove="pt96 pb96 s_parallax_is_fixed s_parallax" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
     </xpath>
     <xpath expr="//h1" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -30,14 +26,19 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover" name="Graphene s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+    </xpath>
+</template>
+
 <!-- ======== TEXT-IMAGE ======== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Graphene s_text_image">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb96 pt0" remove="pb32 pt32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x","y"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-3&amp;c5=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//h2" position="replace">
         <h3>Unique experiences to drive engagement</h3>
@@ -65,6 +66,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image" name="Graphene s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x","y"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-3&amp;c5=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=xy'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 <!-- ======== IMAGE-TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Graphene s_image_text">
     <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
@@ -91,10 +101,6 @@
 <!-- ======== STEPS ======== -->
 <template id="s_process_steps" inherit_id="website.s_process_steps" name="Graphene s_process_steps">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Add to Cart
@@ -126,12 +132,8 @@
 <!-- ======== COMPANY TEAM ======== -->
 <template id="s_company_team" inherit_id="website.s_company_team" name="Graphene s_company_team">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
         <attribute name="class" add="pb64" remove="pb48" separator=" "/>
     </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
-    </xpath>
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
         Tony Fred, <small><b>CEO</b></small>
     </xpath>
@@ -158,6 +160,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team" name="Graphene s_company_team">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_05"/>
+    </xpath>
+</template>
+
 <!-- ======== 3 COLUMNS ======== -->
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Graphene s_three_columns">
     <xpath expr="//div[hasclass('row')]/div//h3[1]" position="replace">
@@ -209,10 +220,6 @@
 <template id="s_comparisons" inherit_id="website.s_comparisons" name="Graphene s_comparisons">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb48 pt24 o_cc o_cc4" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/06_001","flip":["x"]}</attribute>
-    </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_06_001" style="background-image: url('/web_editor/shape/web_editor/Origins/06_001.svg?c3=o-color-3&amp;c4=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div//a" position="replace">
         <a href="/contactus" class="btn btn-primary">Start Now</a>
@@ -234,6 +241,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons" name="Graphene s_comparisons">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/06_001","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//section/div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_06_001" style="background-image: url('/web_editor/shape/web_editor/Origins/06_001.svg?c3=o-color-3&amp;c4=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 <!-- ======== NUMBERS ======== -->
 <template id="s_numbers" inherit_id="website.s_numbers" name="Graphene s_numbers">
     <xpath expr="//section" position="attributes">
@@ -262,10 +278,6 @@
 <template id="s_picture" inherit_id="website.s_picture" name="Graphene s_picture">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0 pt48" remove="pb24 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_01_001"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -279,4 +291,13 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture" name="Graphene s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Zigs_01_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kea/views/snippets/s_cover.xml b/theme_kea/views/snippets/s_cover.xml
index f8d09a053..0d22d0c26 100644
--- a/theme_kea/views/snippets/s_cover.xml
+++ b/theme_kea/views/snippets/s_cover.xml
@@ -6,13 +6,8 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="oe_img_bg o_full_screen_height" remove="parallax s_parallax_is_fixed" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
     </xpath>
-    <!-- Update Filter & Add Shape -->
-    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Floats_02"/>
-    </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <!-- Title -->
@@ -29,4 +24,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
+        <div class="o_we_shape o_web_editor_Floats_02"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kea/views/snippets/s_image_text.xml b/theme_kea/views/snippets/s_image_text.xml
index 6d5e16e67..80b07c91c 100644
--- a/theme_kea/views/snippets/s_image_text.xml
+++ b/theme_kea/views/snippets/s_image_text.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt232" remove="pt32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
@@ -21,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_22" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kea/views/snippets/s_media_list.xml b/theme_kea/views/snippets/s_media_list.xml
index 80853113b..8be38c908 100644
--- a/theme_kea/views/snippets/s_media_list.xml
+++ b/theme_kea/views/snippets/s_media_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2 pt64 pb64" remove="o_cc1 pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
-    </xpath>
-    <!-- Shapes -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_01"/>
     </xpath>
     <!-- Row 1 -->
     <xpath expr="(//div[hasclass('row')])[2]" position="attributes">
@@ -85,4 +80,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_01"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kea/views/snippets/s_picture.xml b/theme_kea/views/snippets/s_picture.xml
index a2a35fbf4..17754007a 100644
--- a/theme_kea/views/snippets/s_picture.xml
+++ b/theme_kea/views/snippets/s_picture.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -36,4 +31,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kea/views/snippets/s_references.xml b/theme_kea/views/snippets/s_references.xml
index bcab698af..7d7e68d3c 100644
--- a/theme_kea/views/snippets/s_references.xml
+++ b/theme_kea/views/snippets/s_references.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pb64" remove="pb32" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_references" inherit_id="website.configurator_s_references">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_kea/views/snippets/s_text_image.xml b/theme_kea/views/snippets/s_text_image.xml
index 302d89da4..88e7aa1d0 100644
--- a/theme_kea/views/snippets/s_text_image.xml
+++ b/theme_kea/views/snippets/s_text_image.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt64 pb232" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
@@ -24,4 +19,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_22 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_banner.xml b/theme_kiddo/views/snippets/s_banner.xml
index 642b6a54c..5735aa430 100644
--- a/theme_kiddo/views/snippets/s_banner.xml
+++ b/theme_kiddo/views/snippets/s_banner.xml
@@ -7,7 +7,6 @@
         <attribute name="class" add="s_parallax_no_overflow_hidden o_full_screen_height oe_img_bg o_bg_img_center pb216 pt72 o_cc o_cc5" remove="pt96 pb96" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
         <attribute name="style">background-image: url("/web/image/website.s_banner_default_image");</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
     </xpath>
 
     <!-- Row - remove grid mode -->
@@ -23,10 +22,9 @@
     <!-- Remove hr -->
     <xpath expr="//div[hasclass('s_hr')]" position="replace"/>
 
-    <!-- Shape & filter -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter" style="background-image: linear-gradient(135deg, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.15) 100%) !important;"/>
-        <div class="o_we_shape o_web_editor_Wavy_22" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 
     <!-- Paragraph -->
@@ -45,4 +43,15 @@
     </xpath>  
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_22" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_call_to_action.xml b/theme_kiddo/views/snippets/s_call_to_action.xml
index 098422d5d..1b9678308 100644
--- a/theme_kiddo/views/snippets/s_call_to_action.xml
+++ b/theme_kiddo/views/snippets/s_call_to_action.xml
@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2 pt152 pb152 o_colored_level" remove="pt48 pb24 o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
-    </xpath>
-
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_14"/>
     </xpath>
 
     <!-- Paragraph -->
@@ -27,4 +21,16 @@
     <xpath expr="//div[hasclass('col-lg-3')]" position="replace"/>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_14"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_cover.xml b/theme_kiddo/views/snippets/s_cover.xml
index 5b5855b4c..ab71f0737 100644
--- a/theme_kiddo/views/snippets/s_cover.xml
+++ b/theme_kiddo/views/snippets/s_cover.xml
@@ -5,7 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height o_cc o_cc1" remove="bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
     </xpath>
 
     <!-- Filter -->
@@ -13,11 +12,6 @@
         <attribute name="class" add="bg-white-75" remove="bg-black-50" separator=" "/>
     </xpath>
 
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_14"/>
-    </xpath>
-
     <!-- Heading -->
     <xpath expr="//font" position="replace" mode="inner">
         Kiddo Nursery
@@ -49,4 +43,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_14"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
index 0b1b94b7a..2c4b963e2 100644
--- a/theme_kiddo/views/snippets/s_image_text.xml
+++ b/theme_kiddo/views/snippets/s_image_text.xml
@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pb64 pt64" remove="pb32 pt32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["x"]}</attribute>
-    </xpath>
-
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Last column -->
@@ -47,4 +41,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["x"]}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_picture.xml b/theme_kiddo/views/snippets/s_picture.xml
index e54694b6b..0f4c054f8 100644
--- a/theme_kiddo/views/snippets/s_picture.xml
+++ b/theme_kiddo/views/snippets/s_picture.xml
@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_colored_level o_cc4 pt96" remove="o_cc2 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
-    </xpath>
-
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Heading -->
@@ -30,4 +24,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_16" style="background-image: url('/web_editor/shape/web_editor/Origins/16.svg?c3=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_text_image.xml b/theme_kiddo/views/snippets/s_text_image.xml
index efb1b6bac..332f89b50 100644
--- a/theme_kiddo/views/snippets/s_text_image.xml
+++ b/theme_kiddo/views/snippets/s_text_image.xml
@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb64 pt64" remove="pb32 pt32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
-    </xpath>
-
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- First column -->
@@ -35,4 +29,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_three_columns.xml b/theme_kiddo/views/snippets/s_three_columns.xml
index 30f94b4b8..0a82602b7 100644
--- a/theme_kiddo/views/snippets/s_three_columns.xml
+++ b/theme_kiddo/views/snippets/s_three_columns.xml
@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt112 pb0" remove="o_cc2 pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
-    </xpath>
-
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 
     <!-- Column n°1 -->
@@ -110,4 +104,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
+    </xpath>
+
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001" style="background-image: url('/web_editor/shape/web_editor/Origins/14_001.svg?c3=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_loftspace/views/snippets/s_call_to_action.xml b/theme_loftspace/views/snippets/s_call_to_action.xml
index 780e33a42..cd20e3720 100644
--- a/theme_loftspace/views/snippets/s_call_to_action.xml
+++ b/theme_loftspace/views/snippets/s_call_to_action.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt128 pb128 o_cc4" remove="pt48 pb24 o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Add shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
     </xpath>
     <!-- Layout -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
@@ -36,4 +31,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Add shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_loftspace/views/snippets/s_image_text.xml b/theme_loftspace/views/snippets/s_image_text.xml
index 62c527f01..5fa153e04 100644
--- a/theme_loftspace/views/snippets/s_image_text.xml
+++ b/theme_loftspace/views/snippets/s_image_text.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
-    </xpath>
-    <!-- Add shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
@@ -21,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_10" style="background-image: url('/web_editor/shape/web_editor/Airy/10.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_loftspace/views/snippets/s_numbers.xml b/theme_loftspace/views/snippets/s_numbers.xml
index 11c3206f2..3a87e162c 100644
--- a/theme_loftspace/views/snippets/s_numbers.xml
+++ b/theme_loftspace/views/snippets/s_numbers.xml
@@ -5,9 +5,15 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 pb192 o_cc5" remove="pt24 pb24 o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":["y"]}</attribute>
     </xpath>
-    <!-- Add shape -->
+    <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Airy_03_001" style="background-image: url('/web_editor/shape/web_editor/Airy/03_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
diff --git a/theme_loftspace/views/snippets/s_product_catalog.xml b/theme_loftspace/views/snippets/s_product_catalog.xml
index 5be019eba..22c8960c0 100644
--- a/theme_loftspace/views/snippets/s_product_catalog.xml
+++ b/theme_loftspace/views/snippets/s_product_catalog.xml
@@ -5,11 +5,20 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt48 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
     </xpath>
-    <!-- Filter & shape -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
+    </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Floats_09"/>
     </xpath>
 </template>
diff --git a/theme_loftspace/views/snippets/s_text_image.xml b/theme_loftspace/views/snippets/s_text_image.xml
index 4ac49c444..644db10e7 100644
--- a/theme_loftspace/views/snippets/s_text_image.xml
+++ b/theme_loftspace/views/snippets/s_text_image.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64 o_cc o_cc5" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
-    </xpath>
-    <!-- Add shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
@@ -17,4 +12,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_10"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 40b51d3db..f81519a25 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -93,10 +93,6 @@
  <template id="s_text_image" inherit_id="website.s_text_image" name="Monglia s_text_image">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt56 pb40 o_cc o_cc1" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" remove="col-lg-6" add="col-lg-5 offset-lg-1" separator=" "/>
@@ -120,6 +116,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image" name="Monglia s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 <!-- ======== IMAGE - TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Monglia s_image_text">
     <xpath expr="//section" position="attributes">
@@ -191,10 +196,6 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0 o_cc o_cc5" remove="pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04"></div>
     </xpath>
     <xpath expr="//h3" position="replace" mode="inner">
         Wilson Holt
@@ -207,6 +208,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_04"></div>
+    </xpath>
+</template>
+
 <!-- ======== GALLERY ======== -->
 <template id="s_images_wall" inherit_id="website.s_images_wall">
     <!-- Section -->
diff --git a/theme_nano/views/snippets/s_cover.xml b/theme_nano/views/snippets/s_cover.xml
index 2b9299fbb..74601df84 100644
--- a/theme_nano/views/snippets/s_cover.xml
+++ b/theme_nano/views/snippets/s_cover.xml
@@ -6,12 +6,8 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt200 pb200" remove="parallax s_parallax_is_fixed bg-black-50 pt96 pb96" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
     </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_12_001" style="background-image: url('/web_editor/shape/web_editor/Bold/12_001.svg?c1=rgba%280%2C%200%2C%200%2C%200.5%29&amp;c2=rgba%280%2C%200%2C%200%2C%200.25%29&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
-    </xpath>
     <xpath expr="//*[hasclass('s_parallax_bg')]" position="replace"/>
     <!-- Title & Text -->
     <xpath expr="//h1//font" position="replace" mode="inner">
@@ -22,4 +18,14 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Bold_12_001" style="background-image: url('/web_editor/shape/web_editor/Bold/12_001.svg?c1=rgba%280%2C%200%2C%200%2C%200.5%29&amp;c2=rgba%280%2C%200%2C%200%2C%200.25%29&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_nano/views/snippets/s_features.xml b/theme_nano/views/snippets/s_features.xml
index 203cbf6d5..1bb341c66 100644
--- a/theme_nano/views/snippets/s_features.xml
+++ b/theme_nano/views/snippets/s_features.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt40 pb48 o_cc o_cc5" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
-    </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//h3" position="replace" mode="inner">
@@ -36,4 +32,14 @@
     </xpath>
 </template>
 
+<template id="configurator_s_features" inherit_id="website.configurator_s_features">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_nano/views/snippets/s_parallax.xml b/theme_nano/views/snippets/s_parallax.xml
index 3312d270e..573a47da1 100644
--- a/theme_nano/views/snippets/s_parallax.xml
+++ b/theme_nano/views/snippets/s_parallax.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10", "flip":["x","y"]}</attribute>
-    </xpath>
-    <xpath expr="//*[hasclass('oe_structure')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_10" style="background-image: url('/web_editor/shape/web_editor/Rainy/10.svg?c1=o-color-1&amp;c3=o-color-3&amp;flip=xy'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//*[hasclass('oe_structure')]" position="inside">
@@ -20,4 +16,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10", "flip":["x","y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('oe_structure')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_10" style="background-image: url('/web_editor/shape/web_editor/Rainy/10.svg?c1=o-color-1&amp;c3=o-color-3&amp;flip=xy'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_banner.xml b/theme_notes/views/snippets/s_banner.xml
index 0224f4351..a33423d68 100644
--- a/theme_notes/views/snippets/s_banner.xml
+++ b/theme_notes/views/snippets/s_banner.xml
@@ -5,17 +5,22 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
     </xpath>
-    <!-- Filter & Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
-    </xpath>
-    <!-- Jumbotron -->
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Enjoy the atmosphere
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_call_to_action.xml b/theme_notes/views/snippets/s_call_to_action.xml
index 274789af4..9166d7b09 100644
--- a/theme_notes/views/snippets/s_call_to_action.xml
+++ b/theme_notes/views/snippets/s_call_to_action.xml
@@ -5,13 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb72 pt96 oe_img_bg o_bg_img_center" remove="pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_call_to_action_default_image'); background-position: 50% 34%;</attribute>
     </xpath>
-    <!-- Shape & filter -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h3" position="replace">
@@ -30,4 +28,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_carousel.xml b/theme_notes/views/snippets/s_carousel.xml
index 33208626b..2769fe1c0 100644
--- a/theme_notes/views/snippets/s_carousel.xml
+++ b/theme_notes/views/snippets/s_carousel.xml
@@ -5,7 +5,6 @@
     <!-- Slide #1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
         <attribute name="class" add="pb224 pt224 o_cc o_cc5" remove="pb152 pt152" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-content')]" position="replace">
         <div class="carousel-content col-lg-6">
@@ -15,14 +14,9 @@
             <p><a href="/contactus" class="btn btn-primary btn-lg">More Info</a></p>
         </div>
     </xpath>
-    <!-- Slide #1 - Shape -->
-    <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_25" style="background-image: url('/web_editor/shape/web_editor/Wavy/25.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
-    </xpath>
     <!-- Slide #2 -->
     <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
         <attribute name="class" add="pb224 pt224 o_cc o_cc2" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":[]}</attribute>
     </xpath>
     <xpath expr="(//div[hasclass('carousel-content')])[2]" position="replace">
         <div class="carousel-content col-lg-6">
@@ -32,14 +26,9 @@
             <p><a href="/" class="btn btn-primary btn-lg">More Info</a></p>
         </div>
     </xpath>
-    <!-- Slide #2 - Shape -->
-    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_25 o_second_extra_shape_mapping"/>
-    </xpath>
     <!-- Slide #3 -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
         <attribute name="class" add="pb224 pt224 o_cc o_cc5" remove="pt128 pb128" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="(//div[hasclass('carousel-content')])[3]" position="replace">
         <div class="carousel-content col-lg-6">
@@ -49,6 +38,29 @@
             <p><a href="/" class="btn btn-primary btn-lg">More Info</a></p>
         </div>
     </xpath>
+</template>
+
+<template id="configurator_s_carousel" inherit_id="website.configurator_s_carousel">
+    <!-- Slide #1 - Shape option -->
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Slide #1 - Shape -->
+    <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_25" style="background-image: url('/web_editor/shape/web_editor/Wavy/25.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+    <!-- Slide #2 - Shape option -->
+    <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":[]}</attribute>
+    </xpath>
+    <!-- Slide #2 - Shape -->
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_25 o_second_extra_shape_mapping"/>
+    </xpath>
+    <!-- Slide #3 - Shape option -->
+    <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
+    </xpath>
     <!-- Slide #3 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Wavy_25 o_third_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/25.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
diff --git a/theme_notes/views/snippets/s_company_team.xml b/theme_notes/views/snippets/s_company_team.xml
index 02cb55c8a..8598be7ec 100644
--- a/theme_notes/views/snippets/s_company_team.xml
+++ b/theme_notes/views/snippets/s_company_team.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pb128" remove="pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_13_001"/>
     </xpath>
     <!-- Member #1 -->
     <xpath expr="//div[hasclass('col-lg-8')]//h4" position="replace" mode="inner">
@@ -41,4 +36,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_13_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_comparisons.xml b/theme_notes/views/snippets/s_comparisons.xml
index 9a6aaa1dc..acdc78da4 100644
--- a/theme_notes/views/snippets/s_comparisons.xml
+++ b/theme_notes/views/snippets/s_comparisons.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="s_comparisons" inherit_id="website.s_comparisons">
-    <!-- Section -->
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
+    <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
     </xpath>
diff --git a/theme_notes/views/snippets/s_cover.xml b/theme_notes/views/snippets/s_cover.xml
index 78cbe1ceb..5c77923df 100644
--- a/theme_notes/views/snippets/s_cover.xml
+++ b/theme_notes/views/snippets/s_cover.xml
@@ -2,7 +2,14 @@
 <odoo>
 
 <template id="s_cover" inherit_id="website.s_cover">
-    <!-- Section -->
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        <b>Discover <br/>the Miraillet Festival</b>
+    </xpath>
+</template>
+
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
     </xpath>
@@ -10,10 +17,6 @@
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
-    <!-- Title -->
-    <xpath expr="//h1" position="replace" mode="inner">
-        <b>Discover <br/>the Miraillet Festival</b>
-    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_notes/views/snippets/s_features_grid.xml b/theme_notes/views/snippets/s_features_grid.xml
index ea57ced19..20345e768 100644
--- a/theme_notes/views/snippets/s_features_grid.xml
+++ b/theme_notes/views/snippets/s_features_grid.xml
@@ -5,7 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pb72 pt96" remove="pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":[]}</attribute>
     </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
diff --git a/theme_notes/views/snippets/s_image_text.xml b/theme_notes/views/snippets/s_image_text.xml
index 99d3a53d0..4fa5d6155 100644
--- a/theme_notes/views/snippets/s_image_text.xml
+++ b/theme_notes/views/snippets/s_image_text.xml
@@ -5,7 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt80 pb80" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
     </xpath>
     <!-- Text wrapper -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -27,4 +26,11 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_media_list.xml b/theme_notes/views/snippets/s_media_list.xml
index a69e3536c..f2d5a2d0c 100644
--- a/theme_notes/views/snippets/s_media_list.xml
+++ b/theme_notes/views/snippets/s_media_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pb96 pt96" remove="o_cc2 pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/01_001","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_01_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/01_001.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 
     <!-- Row #1 -->
@@ -96,4 +91,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/01_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_01_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/01_001.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_parallax.xml b/theme_notes/views/snippets/s_parallax.xml
index 193e9147c..378d5258b 100644
--- a/theme_notes/views/snippets/s_parallax.xml
+++ b/theme_notes/views/snippets/s_parallax.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="s_parallax" inherit_id="website.s_parallax">
-    <!-- Section -->
+<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
+    <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
     </xpath>
diff --git a/theme_notes/views/snippets/s_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
index e57e96bb1..1c25757ae 100644
--- a/theme_notes/views/snippets/s_product_catalog.xml
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -6,12 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb32 pt48" separator=" "/>
         <attribute name="data-scroll-background-ratio">1</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
     </xpath>
-    <!-- Shape & Background image -->
+    <!-- Background image -->
     <xpath expr="//section/*" position="before">
         <span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
-        <div class="o_we_shape o_web_editor_Wavy_10"/>
     </xpath>
     <!-- Title & subtitles -->
     <xpath expr="//h2" position="replace">
@@ -69,4 +67,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//section/*" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_10"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_text_image.xml b/theme_notes/views/snippets/s_text_image.xml
index e6a146f2f..f6178b029 100644
--- a/theme_notes/views/snippets/s_text_image.xml
+++ b/theme_notes/views/snippets/s_text_image.xml
@@ -5,7 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc1 pt80 pb80" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -26,4 +25,11 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_company_team.xml b/theme_odoo_experts/views/snippets/s_company_team.xml
index 6d304c791..a8d0331b1 100644
--- a/theme_odoo_experts/views/snippets/s_company_team.xml
+++ b/theme_odoo_experts/views/snippets/s_company_team.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_odoo_experts/views/snippets/s_comparisons.xml b/theme_odoo_experts/views/snippets/s_comparisons.xml
index f674d6e1f..c59841139 100644
--- a/theme_odoo_experts/views/snippets/s_comparisons.xml
+++ b/theme_odoo_experts/views/snippets/s_comparisons.xml
@@ -2,14 +2,6 @@
 <odoo>
 
 <template id="s_comparisons" inherit_id="website.s_comparisons">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04"/>
-    </xpath>
     <!-- Box #01 -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
         <attribute name="class" add="pt80" remove="pt32" separator=" "/>
@@ -33,4 +25,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_cover.xml b/theme_odoo_experts/views/snippets/s_cover.xml
index 982bd04d3..5301200c5 100644
--- a/theme_odoo_experts/views/snippets/s_cover.xml
+++ b/theme_odoo_experts/views/snippets/s_cover.xml
@@ -5,16 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
-    </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
         <attribute name="class" add="o_container_small" remove="container" separator=" "/>
@@ -34,4 +29,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_image_text.xml b/theme_odoo_experts/views/snippets/s_image_text.xml
index 3390fe5e4..0c848902f 100644
--- a/theme_odoo_experts/views/snippets/s_image_text.xml
+++ b/theme_odoo_experts/views/snippets/s_image_text.xml
@@ -2,14 +2,6 @@
 <odoo>
 
 <template id="s_image_text" inherit_id="website.s_image_text">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_01"/>
-    </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
@@ -40,4 +32,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Bold_01"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_media_list.xml b/theme_odoo_experts/views/snippets/s_media_list.xml
index ad7c9f900..bb1c5b10e 100644
--- a/theme_odoo_experts/views/snippets/s_media_list.xml
+++ b/theme_odoo_experts/views/snippets/s_media_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120 o_cc4 o_colored_level" remove="pt32 pb32 o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_09_001"/>
     </xpath>
 
     <!-- Row #1 -->
@@ -62,4 +57,14 @@
     <xpath expr="(//div[hasclass('s_media_list_body')])[3]//a" position="replace"/>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_09_001"/>
+    </xpath>
+</template>
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_numbers.xml b/theme_odoo_experts/views/snippets/s_numbers.xml
index a89036f6b..796451b9d 100644
--- a/theme_odoo_experts/views/snippets/s_numbers.xml
+++ b/theme_odoo_experts/views/snippets/s_numbers.xml
@@ -5,13 +5,8 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt200 pb200 oe_img_bg o_bg_img_center o_cc4" remove="pt24 pb24 o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
         <attribute name="style">background-image:url('/web_editor/shape/theme_odoo_experts/s_numbers.svg?c1=o-color-1');</attribute>
     </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_16"/>
-    </xpath>
     <!-- Numbers -->
     <xpath expr="//span[hasclass('s_number')]" position="replace" mode="inner">
         <b>12</b>
@@ -27,4 +22,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_16"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_picture.xml b/theme_odoo_experts/views/snippets/s_picture.xml
index 27649c674..eedadd3fa 100644
--- a/theme_odoo_experts/views/snippets/s_picture.xml
+++ b/theme_odoo_experts/views/snippets/s_picture.xml
@@ -5,13 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" add="o_cc1 oe_img_bg" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_picture_default_image_bg'); background-position: center;</attribute>
     </xpath>
-    <!-- Shape & filter -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-white-75"/>
-        <div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace">
@@ -46,4 +44,15 @@
     <xpath expr="//figcaption" position="replace"/>
 </template>
 
+<template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_product_catalog.xml b/theme_odoo_experts/views/snippets/s_product_catalog.xml
index a22d3850a..c5afcce8b 100644
--- a/theme_odoo_experts/views/snippets/s_product_catalog.xml
+++ b/theme_odoo_experts/views/snippets/s_product_catalog.xml
@@ -5,11 +5,20 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt96 pb96" remove="pt48 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
     </xpath>
-    <!-- Filter & shape -->
+    <!-- Filter -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
+    </xpath>
+</template>
+
+<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Airy_03_001"/>
     </xpath>
 </template>
diff --git a/theme_odoo_experts/views/snippets/s_text_image.xml b/theme_odoo_experts/views/snippets/s_text_image.xml
index 9ea522e3e..41e284d07 100644
--- a/theme_odoo_experts/views/snippets/s_text_image.xml
+++ b/theme_odoo_experts/views/snippets/s_text_image.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
@@ -45,4 +40,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_three_columns.xml b/theme_odoo_experts/views/snippets/s_three_columns.xml
index 4a673c237..b9ac8335e 100644
--- a/theme_odoo_experts/views/snippets/s_three_columns.xml
+++ b/theme_odoo_experts/views/snippets/s_three_columns.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 pb72 o_colored_level" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_04"/>
     </xpath>
     <!-- Card #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
@@ -25,4 +20,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_04"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_cover.xml b/theme_orchid/views/snippets/s_cover.xml
index 61239e0d7..d52cc157a 100644
--- a/theme_orchid/views/snippets/s_cover.xml
+++ b/theme_orchid/views/snippets/s_cover.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/01_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_01_001"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -20,4 +15,15 @@
     <xpath expr="//p" position="replace"/>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/01_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_01_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_image_text.xml b/theme_orchid/views/snippets/s_image_text.xml
index 6021dc401..084c12b68 100644
--- a/theme_orchid/views/snippets/s_image_text.xml
+++ b/theme_orchid/views/snippets/s_image_text.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pb104" remove="pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Text wrapper -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -36,4 +31,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_numbers.xml b/theme_orchid/views/snippets/s_numbers.xml
index 1f1f6ae38..0d09ca249 100644
--- a/theme_orchid/views/snippets/s_numbers.xml
+++ b/theme_orchid/views/snippets/s_numbers.xml
@@ -5,6 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_orchid/views/snippets/s_quotes_carousel.xml b/theme_orchid/views/snippets/s_quotes_carousel.xml
index 7176c5c06..cb8f06ed3 100644
--- a/theme_orchid/views/snippets/s_quotes_carousel.xml
+++ b/theme_orchid/views/snippets/s_quotes_carousel.xml
@@ -5,11 +5,6 @@
     <!-- Quotes carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
     </xpath>
     <!-- Quote 1 -->
     <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
@@ -50,4 +45,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
+    <!-- Shape option -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_22"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_text_image.xml b/theme_orchid/views/snippets/s_text_image.xml
index dc0789a08..1964a3e26 100644
--- a/theme_orchid/views/snippets/s_text_image.xml
+++ b/theme_orchid/views/snippets/s_text_image.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/07","flip":["x"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_07" style="background-image: url('/web_editor/shape/web_editor/Wavy/07.svg?c3=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Row -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -45,4 +40,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/07","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_07" style="background-image: url('/web_editor/shape/web_editor/Wavy/07.svg?c3=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_three_columns.xml b/theme_orchid/views/snippets/s_three_columns.xml
index 5d4e137e6..aa922bded 100644
--- a/theme_orchid/views/snippets/s_three_columns.xml
+++ b/theme_orchid/views/snippets/s_three_columns.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04"/>
     </xpath>
     <!-- Row -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -80,4 +75,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 6d949f8d2..0a79d1d17 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -17,11 +17,6 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0 pt192 o_cc o_cc5" remove="pt96 pb96 bg-black-50 s_parallax_is_fixed s_parallax" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["x"]}</attribute>
-    </xpath>
-
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-4&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 
     <!-- Enable SVG dynamic color functionality -->
@@ -65,15 +60,20 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover" name="Paptic s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["x"]}</attribute>
+    </xpath>
+
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_04" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-4&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Paptic s_image_text">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt160 pb16 o_cc o_cc3" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["y"]}</attribute>
-    </xpath>
-
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-4&amp;c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"></div>
     </xpath>
 
     <xpath expr="//img" position="attributes">
@@ -113,6 +113,16 @@
     </xpath>
 </template>
 
+<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text" name="Paptic s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["y"]}</attribute>
+    </xpath>
+
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-4&amp;c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"></div>
+    </xpath>
+</template>
+
 <!-- ==== Text-Image ===== -->
 <template id="s_text_image" inherit_id="website.s_text_image" name="Paptic s_text_image">
     <xpath expr="//section" position="attributes">
@@ -209,10 +219,6 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Paptic s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt32 pb32 o_cc2" add="pt120 pb120 o_cc3 o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"></div>
     </xpath>
     <xpath expr="//div[hasclass('row')]" position="before">
         <h3 style="text-align: center;"><font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">SUCCESS STORIES</font></h3>
@@ -268,6 +274,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns" name="Paptic s_three_columns">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//section/div" position="before">
+        <div class="o_we_shape o_web_editor_Origins_02_001"></div>
+    </xpath>
+</template>
+
 <!-- ==== Picture ===== -->
 <template id="s_picture" inherit_id="website.s_picture" name="Paptic s_picture">
     <xpath expr="//section" position="attributes">
@@ -283,11 +298,6 @@
 <template id="s_comparisons" inherit_id="website.s_comparisons" name="Paptic s_comparisons">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt0 pb80" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/03","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_03"/>
     </xpath>
     <!-- Left card -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
@@ -295,20 +305,37 @@
     </xpath>
 </template>
 
+<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons" name="Paptic s_comparisons">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/03","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_03"/>
+    </xpath>
+</template>
+
 <!-- ==== Call to action ===== -->
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Paptic s_call_to_action">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120 o_cc1" remove="pt48 pb24 o_cc3" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        <b>50,000+ companies</b> run Paptic to grow their businesses.
+    </xpath>
+</template>
+
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Paptic s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Airy_12_001" style="background-image: url('/web_editor/shape/web_editor/Airy/12_001.svg?c1=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
-    <!-- Title -->
-    <xpath expr="//h3" position="replace" mode="inner">
-        <b>50,000+ companies</b> run Paptic to grow their businesses.
-    </xpath>
 </template>
 
 <!-- ==== Banner ===== -->
@@ -322,6 +349,12 @@
 <template id="s_numbers" inherit_id="website.s_numbers" name="Paptic s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 pb80 o_cc4" remove="pt24 pb24 o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers" name="Paptic s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/01_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -378,11 +411,6 @@
 <template id="s_media_list" inherit_id="website.s_media_list" name="Paptic s_media_list">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":["x"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002" style="background-image: url('/web_editor/shape/web_editor/Origins/07_002.svg?c3=o-color-4&amp;c4=o-color-2&amp;c5=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
@@ -402,6 +430,17 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list" name="Paptic s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_07_002" style="background-image: url('/web_editor/shape/web_editor/Origins/07_002.svg?c3=o-color-4&amp;c4=o-color-2&amp;c5=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 <!-- ==== Features Grid ===== -->
 <template id="s_features_grid" inherit_id="website.s_features_grid" name="Paptic s_features_grid">
     <!-- Icon #4 -->
diff --git a/theme_real_estate/views/snippets/s_banner.xml b/theme_real_estate/views/snippets/s_banner.xml
index ce81841c5..70240cb95 100644
--- a/theme_real_estate/views/snippets/s_banner.xml
+++ b/theme_real_estate/views/snippets/s_banner.xml
@@ -5,13 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3 parallax s_parallax_is_fixed" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Row - remove grid mode -->
@@ -55,4 +53,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//span[hasclass('s_parallax_bg')]" position="after">
+        <div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_banner.xml b/theme_treehouse/views/snippets/s_banner.xml
index 3e8553a59..4d73682c4 100644
--- a/theme_treehouse/views/snippets/s_banner.xml
+++ b/theme_treehouse/views/snippets/s_banner.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
-    </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -16,4 +12,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_call_to_action.xml b/theme_treehouse/views/snippets/s_call_to_action.xml
index ffc71055e..39a339f9d 100644
--- a/theme_treehouse/views/snippets/s_call_to_action.xml
+++ b/theme_treehouse/views/snippets/s_call_to_action.xml
@@ -5,10 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 pb48" remove="pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001"}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//div[hasclass('row')]/*[1]" position="attributes">
@@ -29,4 +25,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index ad2a39669..dfcc1a77d 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -74,6 +74,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt48 pb48" remove="o_cc2 pt24 pb24" separator=" "/>
+    </xpath>
+</template>
+
+<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -112,10 +118,6 @@
 <template id="s_references" inherit_id="website.s_references" name="Vehicle s_references">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc1 pt120 pb112" remove="pt48 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Our Partners
@@ -123,16 +125,20 @@
     <xpath expr="//p" position="replace"/>
 </template>
 
-    <!-- ======== CALL TO ACTION ======== -->
+<template id="configurator_s_references" inherit_id="website.configurator_s_references" name="Vehicle s_references">
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_05"/>
+    </xpath>
+</template>
+
+<!-- ======== CALL TO ACTION ======== -->
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Vehicle s_call_to_action">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 pt96 pb64" remove="o_cc3 pt48 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_09"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//h3" position="replace" mode="inner">
@@ -152,6 +158,17 @@
     </xpath>
 </template>
 
+<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Vehicle s_call_to_action">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_09"/>
+    </xpath>
+</template>
+
 <!-- ======== PICTURE ======== -->
 <template id="s_picture" inherit_id="website.s_picture" name="Vehicle s_picture">
     <!-- Section -->
diff --git a/theme_yes/views/snippets/s_company_team.xml b/theme_yes/views/snippets/s_company_team.xml
index 1a395b87d..8db52cbc5 100644
--- a/theme_yes/views/snippets/s_company_team.xml
+++ b/theme_yes/views/snippets/s_company_team.xml
@@ -2,14 +2,6 @@
 <odoo>
 
 <template id="s_company_team" inherit_id="website.s_company_team">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001 o_second_extra_shape_mapping bg-o-color-3"/>
-    </xpath>
     <!-- Row #1 - Col #1 -->
     <xpath expr="//h4" position="replace" mode="inner">
         Livia Sailor
@@ -31,4 +23,15 @@
     <xpath expr="//*[hasclass('col-lg-6')][3]" position="replace"/>
 </template>
 
+<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001 o_second_extra_shape_mapping bg-o-color-3"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_cover.xml b/theme_yes/views/snippets/s_cover.xml
index 49ec0e8d9..ece5576d3 100644
--- a/theme_yes/views/snippets/s_cover.xml
+++ b/theme_yes/views/snippets/s_cover.xml
@@ -5,12 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height pt208 pb256" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
     </xpath>
-    <!-- Filter & shape -->
+    <!-- Filter -->
     <xpath expr="//*[hasclass('container')]" position="before">
         <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
-        <div class="o_we_shape o_web_editor_Origins_14_001"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -32,4 +30,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_image_gallery.xml b/theme_yes/views/snippets/s_image_gallery.xml
index 4fcd3dfaa..0825aed5e 100644
--- a/theme_yes/views/snippets/s_image_gallery.xml
+++ b/theme_yes/views/snippets/s_image_gallery.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="s_image_gallery_indicators_dots" remove="s_image_gallery_indicators_rounded" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12", "flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//*[hasclass('container')]" position="attributes">
diff --git a/theme_yes/views/snippets/s_images_wall.xml b/theme_yes/views/snippets/s_images_wall.xml
index 61fce6484..db44fa8c4 100644
--- a/theme_yes/views/snippets/s_images_wall.xml
+++ b/theme_yes/views/snippets/s_images_wall.xml
@@ -2,14 +2,6 @@
 <odoo>
 
 <template id="s_images_wall" inherit_id="website.s_images_wall">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
-    </xpath>
     <!-- Images -->
     <xpath expr="//img" position="attributes">
         <attribute name="class" add="rounded" separator=" "/>
@@ -31,4 +23,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_images_wall" inherit_id="website.configurator_s_images_wall">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_media_list.xml b/theme_yes/views/snippets/s_media_list.xml
index c803ae957..f52a9aa77 100644
--- a/theme_yes/views/snippets/s_media_list.xml
+++ b/theme_yes/views/snippets/s_media_list.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64 o_cc1" remove="pt32 pb32 o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Row #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
@@ -70,4 +65,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_three_columns.xml b/theme_yes/views/snippets/s_three_columns.xml
index f271129ea..641f9e1b6 100644
--- a/theme_yes/views/snippets/s_three_columns.xml
+++ b/theme_yes/views/snippets/s_three_columns.xml
@@ -5,11 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_18"/>
     </xpath>
     <!-- Column 1 -->
     <xpath expr="//*[hasclass('card-title')]" position="replace" mode="inner">
@@ -25,4 +20,15 @@
     </xpath>
 </template>
 
+<template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_18"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_banner.xml b/theme_zap/views/snippets/s_banner.xml
index 49f226def..b77a21386 100644
--- a/theme_zap/views/snippets/s_banner.xml
+++ b/theme_zap/views/snippets/s_banner.xml
@@ -5,12 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt256 pb48 parallax s_parallax_is_fixed" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001","flip":["y"]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;"/>
-        <div class="o_we_shape o_web_editor_Origins_04_001" style="background-image: url('/web_editor/shape/web_editor/Origins/04_001.svg?c3=o-color-1&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Row - remove grid mode -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -50,4 +48,14 @@
     </xpath>
 </template>
 
+<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
+    <!-- Shape option -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_04_001" style="background-image: url('/web_editor/shape/web_editor/Origins/04_001.svg?c3=o-color-1&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+</template>
+
 </odoo>