diff --git a/theme_anelusia/views/snippets/s_comparisons.xml b/theme_anelusia/views/snippets/s_comparisons.xml
index f856f57c6..b9bd565be 100644
--- a/theme_anelusia/views/snippets/s_comparisons.xml
+++ b/theme_anelusia/views/snippets/s_comparisons.xml
@@ -29,15 +29,4 @@
     </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_artists/views/snippets/s_image_text.xml b/theme_artists/views/snippets/s_image_text.xml
index ff23a561c..69bc716c8 100644
--- a/theme_artists/views/snippets/s_image_text.xml
+++ b/theme_artists/views/snippets/s_image_text.xml
@@ -27,15 +27,4 @@
     </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 9158ffd43..1bf457e93 100644
--- a/theme_artists/views/snippets/s_numbers.xml
+++ b/theme_artists/views/snippets/s_numbers.xml
@@ -8,15 +8,4 @@
     </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 -->
-    <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=x'); background-position: 50% 0%;"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_artists/views/snippets/s_parallax.xml b/theme_artists/views/snippets/s_parallax.xml
index 1c7d4b79b..a174bd52a 100644
--- a/theme_artists/views/snippets/s_parallax.xml
+++ b/theme_artists/views/snippets/s_parallax.xml
@@ -8,15 +8,4 @@
     </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%;"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_artists/views/snippets/s_product_catalog.xml b/theme_artists/views/snippets/s_product_catalog.xml
index a8f1571ca..77eb28fd4 100644
--- a/theme_artists/views/snippets/s_product_catalog.xml
+++ b/theme_artists/views/snippets/s_product_catalog.xml
@@ -9,15 +9,4 @@
     </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"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_artists/views/snippets/s_quotes_carousel.xml b/theme_artists/views/snippets/s_quotes_carousel.xml
index 0a49d2853..ee774d32b 100644
--- a/theme_artists/views/snippets/s_quotes_carousel.xml
+++ b/theme_artists/views/snippets/s_quotes_carousel.xml
@@ -28,15 +28,4 @@
     </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_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 80f590cc2..dc0156458 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -244,15 +244,6 @@
     </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 -->
diff --git a/theme_bistro/views/snippets/s_banner.xml b/theme_bistro/views/snippets/s_banner.xml
index efb64587a..a3d9229df 100644
--- a/theme_bistro/views/snippets/s_banner.xml
+++ b/theme_bistro/views/snippets/s_banner.xml
@@ -12,14 +12,4 @@
     </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_bookstore/views/snippets/s_product_catalog.xml b/theme_bookstore/views/snippets/s_product_catalog.xml
index 78fd95fe8..098f4b55c 100644
--- a/theme_bookstore/views/snippets/s_product_catalog.xml
+++ b/theme_bookstore/views/snippets/s_product_catalog.xml
@@ -12,15 +12,4 @@
     </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>
-
 </odoo>
diff --git a/theme_buzzy/views/snippets/s_title.xml b/theme_buzzy/views/snippets/s_title.xml
index 02ddda373..7a380f789 100644
--- a/theme_buzzy/views/snippets/s_title.xml
+++ b/theme_buzzy/views/snippets/s_title.xml
@@ -12,15 +12,4 @@
     </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_comparisons.xml b/theme_clean/views/snippets/s_comparisons.xml
index 9e21c9f69..809ededcd 100644
--- a/theme_clean/views/snippets/s_comparisons.xml
+++ b/theme_clean/views/snippets/s_comparisons.xml
@@ -16,15 +16,4 @@
     </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_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 2d28f8a51..85a0c9523 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -80,15 +80,6 @@
     <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 -->
@@ -168,15 +159,6 @@
     </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">
@@ -200,15 +182,6 @@
     </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 60bf17883..200b6e15d 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -160,15 +160,6 @@
     </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">
diff --git a/theme_kea/views/snippets/s_references.xml b/theme_kea/views/snippets/s_references.xml
index 7d7e68d3c..4a46b49a1 100644
--- a/theme_kea/views/snippets/s_references.xml
+++ b/theme_kea/views/snippets/s_references.xml
@@ -8,15 +8,4 @@
     </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 -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_kiddo/views/snippets/s_picture.xml b/theme_kiddo/views/snippets/s_picture.xml
index 50d42279c..a7abb7e03 100644
--- a/theme_kiddo/views/snippets/s_picture.xml
+++ b/theme_kiddo/views/snippets/s_picture.xml
@@ -24,16 +24,4 @@
     </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_notes/views/snippets/s_cover.xml b/theme_notes/views/snippets/s_cover.xml
index 5c77923df..2f0cd1315 100644
--- a/theme_notes/views/snippets/s_cover.xml
+++ b/theme_notes/views/snippets/s_cover.xml
@@ -8,15 +8,4 @@
     </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>
-    <!-- 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_odoo_experts/views/snippets/s_company_team.xml b/theme_odoo_experts/views/snippets/s_company_team.xml
index a8d0331b1..542e177aa 100644
--- a/theme_odoo_experts/views/snippets/s_company_team.xml
+++ b/theme_odoo_experts/views/snippets/s_company_team.xml
@@ -8,15 +8,4 @@
     </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 -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001 o_third_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Origins/02_001.svg?c4=o-color-3&amp;c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_odoo_experts/views/snippets/s_cover.xml b/theme_odoo_experts/views/snippets/s_cover.xml
index ff08e9509..fe23fb37c 100644
--- a/theme_odoo_experts/views/snippets/s_cover.xml
+++ b/theme_odoo_experts/views/snippets/s_cover.xml
@@ -29,15 +29,4 @@
     </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('o_container_small')]" 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_media_list.xml b/theme_odoo_experts/views/snippets/s_media_list.xml
index eb5740bf8..42e742d37 100644
--- a/theme_odoo_experts/views/snippets/s_media_list.xml
+++ b/theme_odoo_experts/views/snippets/s_media_list.xml
@@ -57,14 +57,4 @@
     <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 796451b9d..c220ddb6c 100644
--- a/theme_odoo_experts/views/snippets/s_numbers.xml
+++ b/theme_odoo_experts/views/snippets/s_numbers.xml
@@ -22,15 +22,4 @@
     </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_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index f1120869b..7e250c62e 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -418,17 +418,6 @@
     </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('o_container_small')]" 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_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 5c38442ce..e246f864e 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -77,17 +77,6 @@
     </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 -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
-    </xpath>
-</template>
-
 <!-- ======== MASONRY BLOCK ======== -->
 <template id="s_masonry_block" inherit_id="website.s_masonry_block">
     <xpath expr="//t[@t-call]" position="attributes">
@@ -125,15 +114,6 @@
     <xpath expr="//p" position="replace"/>
 </template>
 
-<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 -->