diff --git a/theme_anelusia/views/new_page_template.xml b/theme_anelusia/views/new_page_template.xml
index 941a9df0f..4315b215a 100644
--- a/theme_anelusia/views/new_page_template.xml
+++ b/theme_anelusia/views/new_page_template.xml
@@ -6,11 +6,11 @@
 <template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/17","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Containers/06","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_17"/>
+        <div class="o_we_shape o_web_editor_Containers_06" style="background-image: url('/web_editor/shape/web_editor/Containers/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_anelusia/views/snippets/s_big_number.xml b/theme_anelusia/views/snippets/s_big_number.xml
index 97d4f0b54..a665241a3 100644
--- a/theme_anelusia/views/snippets/s_big_number.xml
+++ b/theme_anelusia/views/snippets/s_big_number.xml
@@ -4,12 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06_001"}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_06"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_anelusia/views/snippets/s_numbers.xml b/theme_anelusia/views/snippets/s_numbers.xml
index 0e978cf42..593c102bf 100644
--- a/theme_anelusia/views/snippets/s_numbers.xml
+++ b/theme_anelusia/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height o_cc4" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
 </template>
 
diff --git a/theme_anelusia/views/snippets/s_numbers_boxed.xml b/theme_anelusia/views/snippets/s_numbers_boxed.xml
index 05f793384..a5c282f78 100644
--- a/theme_anelusia/views/snippets/s_numbers_boxed.xml
+++ b/theme_anelusia/views/snippets/s_numbers_boxed.xml
@@ -4,11 +4,11 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/28", "colors":{"c1": "o-color-1", "c3": "o-color-5"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Patterns/05", "colors":{"c5": "o-color-4"}, "flip":[], "showOnMobile":true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_28 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Wavy/28.svg?c1=o-color-1&amp;c3=o-color-5&amp;);"/>
+        <div class="o_we_shape o_web_editor_Patterns_05" style="background-image: url('/web_editor/shape/web_editor/Patterns/05.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_anelusia/views/snippets/s_product_catalog.xml b/theme_anelusia/views/snippets/s_product_catalog.xml
index 462eca6cd..64a0aff3e 100644
--- a/theme_anelusia/views/snippets/s_product_catalog.xml
+++ b/theme_anelusia/views/snippets/s_product_catalog.xml
@@ -5,13 +5,13 @@
     <!-- 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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/11_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
         <!-- Remove the background image -->
         <attribute name="style"/>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_11"/>
+        <div class="o_we_shape o_web_editor_Airy_11_001" style="background-image: url('/web_editor/shape/web_editor/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Remove filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
diff --git a/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml b/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
index 1230856d6..b50abfa08 100644
--- a/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_anelusia/views/snippets/s_quotes_carousel_minimal.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
         <attribute name="class" add="o_cc o_cc5" remove="carousel-dark" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Zigs/04','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_04"/>
+        <div class="o_we_shape o_web_editor_Airy_01_001" style="background-image: url('/web_editor/shape/web_editor/Airy/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
         <attribute name="class" add="pb144" remove="pb80" separator=" "/>
diff --git a/theme_artists/views/new_page_template.xml b/theme_artists/views/new_page_template.xml
index 0f2910e9d..ce88e9d52 100644
--- a/theme_artists/views/new_page_template.xml
+++ b/theme_artists/views/new_page_template.xml
@@ -6,22 +6,22 @@
 <template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -34,11 +34,11 @@
 <template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -72,11 +72,11 @@
 <template id="new_page_template_s_numbers" inherit_id="website.new_page_template_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_big_number.xml b/theme_artists/views/snippets/s_big_number.xml
index b43940d64..caf89662b 100644
--- a/theme_artists/views/snippets/s_big_number.xml
+++ b/theme_artists/views/snippets/s_big_number.xml
@@ -4,12 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_14"/>
+        <div class="o_we_shape o_web_editor_Airy_14_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_artists/views/snippets/s_features.xml b/theme_artists/views/snippets/s_features.xml
index 26b36d00d..cd2f38ead 100644
--- a/theme_artists/views/snippets/s_features.xml
+++ b/theme_artists/views/snippets/s_features.xml
@@ -5,11 +5,11 @@
     <!-- 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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_14"/>
+        <div class="o_we_shape o_web_editor_Airy_14_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Feature #01 - Icon -->
     <xpath expr="//i" position="attributes">
diff --git a/theme_artists/views/snippets/s_quotes_carousel_minimal.xml b/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
index 5cfda5c8c..9d8e917d5 100644
--- a/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
         <attribute name="class" add="o_cc o_cc5" remove="carousel-dark" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/08','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/17','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_08"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_aviato/views/snippets/s_numbers_boxed.xml b/theme_aviato/views/snippets/s_numbers_boxed.xml
index e79da25da..55a11ff33 100644
--- a/theme_aviato/views/snippets/s_numbers_boxed.xml
+++ b/theme_aviato/views/snippets/s_numbers_boxed.xml
@@ -4,11 +4,11 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06", "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06_001", "flip":[], "showOnMobile":true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_06"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_beauty/views/new_page_template.xml b/theme_beauty/views/new_page_template.xml
index 0697dc019..028d9c9ab 100644
--- a/theme_beauty/views/new_page_template.xml
+++ b/theme_beauty/views/new_page_template.xml
@@ -5,37 +5,37 @@
 
 <template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_s_call_to_action">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_digital" inherit_id="website.new_page_template_s_call_to_action_digital">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -92,19 +92,19 @@
 
 <template id="new_page_template_landing_2_s_call_to_action" inherit_id="website.new_page_template_landing_2_s_call_to_action">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_3_s_call_to_action" inherit_id="website.new_page_template_landing_3_s_call_to_action">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_big_number.xml b/theme_beauty/views/snippets/s_big_number.xml
index 7efefd07c..cc344a46c 100644
--- a/theme_beauty/views/snippets/s_big_number.xml
+++ b/theme_beauty/views/snippets/s_big_number.xml
@@ -4,13 +4,13 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/12"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17","colors":{"c5":"o-color-3"}}</attribute>
         <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_12"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index 893f2a49b..64a8f67b4 100644
--- a/theme_beauty/views/snippets/s_cover.xml
+++ b/theme_beauty/views/snippets/s_cover.xml
@@ -26,11 +26,11 @@
 <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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blurry/06","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_09"/>
+        <div class="o_we_shape o_web_editor_Blurry_06"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_features_wall.xml b/theme_beauty/views/snippets/s_features_wall.xml
index ac1874747..ad44f6290 100644
--- a/theme_beauty/views/snippets/s_features_wall.xml
+++ b/theme_beauty/views/snippets/s_features_wall.xml
@@ -4,10 +4,10 @@
 <template id="s_features_wall" inherit_id="website.s_features_wall">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-4','c4':'o-color-4','c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-4','c1':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
-    <xpath expr="//div[hasclass('o_web_editor_Airy_04_001')]" position="replace">
-        <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-4&amp;c5=o-color-1');"/>
+    <xpath expr="//div[hasclass('o_web_editor_Grids_02')]" position="replace">
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1&amp;flip=x');"/>
     </xpath>
     <xpath expr="//img" position="attributes">
         <attribute name="class" add="rounded-circle" separator=" "/>
diff --git a/theme_beauty/views/snippets/s_image_frame.xml b/theme_beauty/views/snippets/s_image_frame.xml
index cc71c6611..f6b1af95a 100644
--- a/theme_beauty/views/snippets/s_image_frame.xml
+++ b/theme_beauty/views/snippets/s_image_frame.xml
@@ -4,10 +4,10 @@
 <template id="s_image_frame" inherit_id="website.s_image_frame">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/02_001','colors':{'c4':'o-color-5','c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/13','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" 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-5&amp;c5=o-color-1');"/>
+        <div class="o_we_shape o_web_editor_Bold_13"/>
     </xpath>
     <xpath expr="//img" position="attributes">
         <attribute name="style"/>
diff --git a/theme_beauty/views/snippets/s_numbers_boxed.xml b/theme_beauty/views/snippets/s_numbers_boxed.xml
index f2d48a5d8..ee56fb03e 100644
--- a/theme_beauty/views/snippets/s_numbers_boxed.xml
+++ b/theme_beauty/views/snippets/s_numbers_boxed.xml
@@ -4,11 +4,11 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/12", "colors":{"c1": "o-color-2"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17", "colors":{"c5": "rgba(255,255,255,0.25)"}, "flip":[], "showOnMobile":true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_12" style="background-image: url('/web_editor/shape/web_editor/Blobs/12.svg?c1=o-color-2&amp;);"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_beauty/views/snippets/s_numbers_showcase.xml b/theme_beauty/views/snippets/s_numbers_showcase.xml
index 54010df3a..b0e9c9cc0 100644
--- a/theme_beauty/views/snippets/s_numbers_showcase.xml
+++ b/theme_beauty/views/snippets/s_numbers_showcase.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/11','flip':['x']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/11_001','colors':{'c5':'o-color-1'},'flip':['x']}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_11" style="background-image: url('/web_editor/shape/web_editor/Wavy/11.svg?c1=o-color-1&amp;c4=o-color-4&amp;flip=x');"/>
+        <div class="o_we_shape o_web_editor_Wavy_11_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1&amp;flip=x');"/>
     </xpath>
     <!-- Grid items -->
     <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
diff --git a/theme_beauty/views/snippets/s_pricelist_boxed.xml b/theme_beauty/views/snippets/s_pricelist_boxed.xml
index 6ec90ed5b..24b4cc9ea 100644
--- a/theme_beauty/views/snippets/s_pricelist_boxed.xml
+++ b/theme_beauty/views/snippets/s_pricelist_boxed.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt0 pb0" remove="pt72 pb72" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/06_001','colors':{'c3':'o-color-4','c4':'rgba(255, 0, 0, 0)'},'flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-4', 'c1':'o-color-4'},'flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//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-4&amp;c4=rgba(255, 0, 0, 0)');"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div" position="attributes">
         <attribute name="class" add="o_cc2 col-lg-5 border" remove="o_cc1 offset-lg-2 col-lg-8" separator=" "/>
diff --git a/theme_beauty/views/snippets/s_wavy_grid.xml b/theme_beauty/views/snippets/s_wavy_grid.xml
index b78812eda..f1f7b2aa2 100644
--- a/theme_beauty/views/snippets/s_wavy_grid.xml
+++ b/theme_beauty/views/snippets/s_wavy_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/17','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_12"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index e14bbb1c6..fc8b57ec4 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -132,10 +132,10 @@
 <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_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/05_001"}</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%;"/>
+        <div class="o_we_shape o_web_editor_Blobs_05_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         Faculties
@@ -243,11 +243,11 @@
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Be Wise s_call_to_action">
     <!-- Shape options -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/05_001","flip":["x","y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_11"/>
+        <div class="o_we_shape o_web_editor_Blobs_05_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h3" position="replace">
@@ -524,11 +524,11 @@
 <template id="s_media_list" inherit_id="website.s_media_list" name="Be Wise s_media_list">
     <!-- Shape options -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/04_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Grids/02","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_04_001"/>
+        <div class="o_we_shape o_web_editor_Grids_02" style="background-image: url('/web_editor/shape/web_editor/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
@@ -898,17 +898,17 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/06_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/20","colors":{"c5":"o-color-4","c1":"o-color-4"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Bold_06_001 bg-o-color-4" style="background-image: url('/web_editor/shape/web_editor/Bold/06_001.svg?c3=o-color-1&amp;');"/>
+        <div class="o_we_shape o_web_editor_Bold_20 bg-rgba(0,0,0,0.25)" style="background-image: url('/web_editor/shape/web_editor/Bold/20.svg?c5=o-color-4&amp;c1=o-color-4');"/>
     </xpath>
 
     <!-- Text -->
     <xpath expr="//h2/span" position="replace" mode="inner">
-        <font class="text-gradient" style="background-image: linear-gradient(0deg, var(--o-color-1) 0%, var(--o-color-4) 90%);">60+</font>
+        <font class="text-gradient" style="background-image: linear-gradient(0deg, var(--rgba(0,0,0,0.25)) 0%, var(--o-color-4) 90%);">60+</font>
     </xpath>
     <xpath expr="//p/span" position="replace" mode="inner">
         academic programs available
@@ -919,10 +919,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/06','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/06_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_06"/>
+        <div class="o_we_shape o_web_editor_Airy_06_001" style="background-image: url('/web_editor/shape/web_editor/Airy/06_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
@@ -1137,11 +1137,11 @@
 <!-- ======== COMPANY TEAM SHAPES ======== -->
 <template id="configurator_s_company_team_shapes" inherit_id="website.configurator_s_company_team_shapes">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05",'colors':{'c3': 'o-color-4'}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/15", "colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05" style="background-image: url('/web_editor/shape/web_editor%2FOrigins%2F05.svg?c3=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -1149,12 +1149,12 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/08", "colors":{"c1": "o-color-1"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17", "colors":{"c5": "rgba(0,0,0,0.25)"}, "flip":[], "showOnMobile":true}</attribute>
         <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_08" style="background-image: url('/web_editor/shape/web_editor/Blobs/08.svg?c1=o-color-1&amp;);"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_bistro/views/new_page_template.xml b/theme_bistro/views/new_page_template.xml
index 515b25a92..513eb70e1 100644
--- a/theme_bistro/views/new_page_template.xml
+++ b/theme_bistro/views/new_page_template.xml
@@ -6,10 +6,10 @@
 <template id="new_page_template_s_banner" inherit_id="website.new_page_template_s_banner">
     <!-- Shape option -->
     <xpath expr="section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/26","colors":{"c5": "o-color-1"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_features_wall.xml b/theme_bistro/views/snippets/s_features_wall.xml
index b27f2e8dd..c7a914259 100644
--- a/theme_bistro/views/snippets/s_features_wall.xml
+++ b/theme_bistro/views/snippets/s_features_wall.xml
@@ -4,11 +4,11 @@
 <template id="s_features_wall" inherit_id="website.s_features_wall">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06_001"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_06 o_we_animated"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001 o_we_animated"/>
     </xpath>
     <!-- Card 1 -->
     <xpath expr="//div[hasclass('g-col-lg-3')]//h3" position="replace" mode="inner">
diff --git a/theme_bistro/views/snippets/s_quotes_carousel.xml b/theme_bistro/views/snippets/s_quotes_carousel.xml
index cac2d6de7..f49558346 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel.xml
+++ b/theme_bistro/views/snippets/s_quotes_carousel.xml
@@ -6,13 +6,13 @@
     <xpath expr="//*[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_default oe_img_bg o_bg_img_center" remove="s_carousel_boxed carousel-dark o_cc o_cc2" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_quotes_carousel_demo_image_1');</attribute>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/19','colors':{'c5':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/16','colors':{'c5':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-indicators')]" position="attributes">
         <attribute name="class" remove="s_carousel_indicators_dots" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_19" style="background-image: url('/web_editor/shape/web_editor/Origins/19.svg?c5=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_web_editor_Bold_16" style="background-image: url('/web_editor/shape/web_editor/Bold/16.svg?c5=o-color-1&amp;flip=x');"/>
     </xpath>
     <xpath expr="//blockquote" position="attributes">
         <attribute name="class" add="s_blockquote_default" remove="s_blockquote_with_icon" separator=" "/>
diff --git a/theme_bistro/views/snippets/s_wavy_grid.xml b/theme_bistro/views/snippets/s_wavy_grid.xml
index 1935a20b2..32dbf8d72 100644
--- a/theme_bistro/views/snippets/s_wavy_grid.xml
+++ b/theme_bistro/views/snippets/s_wavy_grid.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <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':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/26','colors':{'c5': 'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Origins_09_001"/>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bookstore/views/snippets/s_big_number.xml b/theme_bookstore/views/snippets/s_big_number.xml
index 460361c5e..d8c513522 100644
--- a/theme_bookstore/views/snippets/s_big_number.xml
+++ b/theme_bookstore/views/snippets/s_big_number.xml
@@ -4,12 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06_001"}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_06"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml
index 1147e8382..b301cbe33 100644
--- a/theme_bookstore/views/snippets/s_cover.xml
+++ b/theme_bookstore/views/snippets/s_cover.xml
@@ -6,12 +6,12 @@
     <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/Origins/09_001', 'colors':{'c3':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/26', 'colors':{'c5':'o-color-1'}}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 55%;</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[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-1');"/>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
diff --git a/theme_bookstore/views/snippets/s_numbers.xml b/theme_bookstore/views/snippets/s_numbers.xml
index 52134d05f..2866b9666 100644
--- a/theme_bookstore/views/snippets/s_numbers.xml
+++ b/theme_bookstore/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt112 pb112" remove="pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-5"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5&amp;flip=x');"/>
     </xpath>
     <!-- Titles -->
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
diff --git a/theme_bookstore/views/snippets/s_numbers_boxed.xml b/theme_bookstore/views/snippets/s_numbers_boxed.xml
index 1d8b46c16..632055788 100644
--- a/theme_bookstore/views/snippets/s_numbers_boxed.xml
+++ b/theme_bookstore/views/snippets/s_numbers_boxed.xml
@@ -4,11 +4,11 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/08", "colors":{"c1": "o-color-1"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17", "colors":{"c5": "o-color-1"}, "flip":[], "showOnMobile":true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_08" style="background-image: url('/web_editor/shape/web_editor/Blobs/08.svg?c1=o-color-1&amp;);"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_bookstore/views/snippets/s_pricelist_boxed.xml b/theme_bookstore/views/snippets/s_pricelist_boxed.xml
index e08fa0447..0a3d047f1 100644
--- a/theme_bookstore/views/snippets/s_pricelist_boxed.xml
+++ b/theme_bookstore/views/snippets/s_pricelist_boxed.xml
@@ -6,10 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_002','colors':{'c5':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001 o_we_animated"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002 o_we_animated"  style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc1 rounded" separator=" "/>
diff --git a/theme_bookstore/views/snippets/s_wavy_grid.xml b/theme_bookstore/views/snippets/s_wavy_grid.xml
index b3eca056d..0bba0646e 100644
--- a/theme_bookstore/views/snippets/s_wavy_grid.xml
+++ b/theme_bookstore/views/snippets/s_wavy_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/09","flip":[],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/03","colors":{"c2":"o-color-3"},"flip":["x","y"],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_09"/>
+        <div class="o_we_shape o_web_editor_Blobs_03" style="background-image: url('/web_editor/shape/web_editor/Blobs/03.svg?c2=o-color-3&amp;flip=xy');  background-position: 50% 100%;"/>
     </xpath>
     <xpath expr="//h3" position="attributes">
         <attribute name="class" add="h4-fs" remove="h5-fs" separator=" "/>
diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml
index 663ee4b4d..104c836dd 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -75,11 +75,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/12_001','colors':{'c1':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/12_002','colors':{'c5':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</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-4');"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
@@ -103,11 +103,11 @@
 <template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -122,11 +122,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pt40 pb40" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_001','colors':{'c1':'o-color-4','c4':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_002','colors':{'c5':'o-color-4','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001" style="background-image: url('/web_editor/shape/web_editor/Airy/13_001.svg?c1=o-color-4&amp;c4=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
@@ -231,11 +231,11 @@
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -284,11 +284,11 @@
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -303,11 +303,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pt40 pb0" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_001','colors':{'c1':'o-color-4','c4':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_002','colors':{'c5':'o-color-4','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001" style="background-image: url('/web_editor/shape/web_editor/Airy/13_001.svg?c1=o-color-4&amp;c4=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_color_blocks_2.xml b/theme_buzzy/views/snippets/s_color_blocks_2.xml
index b728677aa..90093ef7c 100644
--- a/theme_buzzy/views/snippets/s_color_blocks_2.xml
+++ b/theme_buzzy/views/snippets/s_color_blocks_2.xml
@@ -4,19 +4,19 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Left block -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["y","x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11_001","flip":["y","x"]}</attribute>
     </xpath>
     <!-- Left block - Shape -->
     <xpath expr="//div[hasclass('row')]//div//h2" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_11" style="background-image: url('/web_editor/shape/web_editor/Wavy/11.svg?c1=o-color-5&amp;c4=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_11_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Right block -->
     <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11_001","colors":{"c5":"o-color-1"},"flip":[]}</attribute>
     </xpath>
     <!-- Right block - Shape -->
     <xpath expr="//div[hasclass('row')]//div[2]//h2" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_11 o_second_extra_shape_mapping"/>
+        <div class="o_we_shape o_web_editor_Wavy_11_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_cover.xml b/theme_buzzy/views/snippets/s_cover.xml
index a198f3618..30bec7b4a 100644
--- a/theme_buzzy/views/snippets/s_cover.xml
+++ b/theme_buzzy/views/snippets/s_cover.xml
@@ -5,7 +5,7 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt112 pb112" remove="pt232 pb232 bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"rgba(255,255,255,0.25)","c3":"rgba(255,255,255,0)"},"flip":[]}</attribute>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
@@ -13,7 +13,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Airy_03_001"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=rgba(255,255,255,0.25)&amp;c3=rgba(255,255,255,0)');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_buzzy/views/snippets/s_cta_box.xml b/theme_buzzy/views/snippets/s_cta_box.xml
index bde94b598..a25b52552 100644
--- a/theme_buzzy/views/snippets/s_cta_box.xml
+++ b/theme_buzzy/views/snippets/s_cta_box.xml
@@ -31,10 +31,10 @@
 
 <template id="configurator_s_cta_box" inherit_id="website.configurator_s_cta_box">
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/10_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/10_002','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_10_001"/>
+        <div class="o_we_shape o_web_editor_Blobs_10_002" style="background-image: url('/web_editor/shape/web_editor/Blobs/10_002.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_discovery.xml b/theme_buzzy/views/snippets/s_discovery.xml
index 0cd860ab3..25d6b60ce 100644
--- a/theme_buzzy/views/snippets/s_discovery.xml
+++ b/theme_buzzy/views/snippets/s_discovery.xml
@@ -4,10 +4,10 @@
 <template id="s_discovery" inherit_id="website.s_discovery">
    <xpath expr="//section" position="attributes">
       <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
-      <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/17','colors':{'c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+      <attribute name="data-oe-shape-data">{'shape':'web_editor/Containers/06','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
    </xpath>
    <xpath expr="//div[hasclass('container')]" position="before">
-      <div class="o_we_shape o_web_editor_Origins_17 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Origins/17.svg?c3=o-color-4');"/>
+      <div class="o_we_shape o_web_editor_Containers_06 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Containers/06.svg?c5=o-color-4');"/>
    </xpath>
    <xpath expr="//h1" position="replace">
       <h2 class="display-4-fs" style="text-align: center;"><span style="font-weight: normal;">Discover our solutions</span></h2>
diff --git a/theme_buzzy/views/snippets/s_image_title.xml b/theme_buzzy/views/snippets/s_image_title.xml
index 6f459d925..ce340d564 100644
--- a/theme_buzzy/views/snippets/s_image_title.xml
+++ b/theme_buzzy/views/snippets/s_image_title.xml
@@ -5,10 +5,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc5 oe_img_bg" separator=" "/>
         <attribute name="style"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/04','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/04_001','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_04" style="background-image: url('/web_editor/shape/web_editor/Blobs/04.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Blobs_04_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/04_001.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
diff --git a/theme_buzzy/views/snippets/s_numbers.xml b/theme_buzzy/views/snippets/s_numbers.xml
index f730c92eb..ab9098af8 100644
--- a/theme_buzzy/views/snippets/s_numbers.xml
+++ b/theme_buzzy/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt96 pb96" remove="o_cc1 pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_02_001"/>
+        <div class="o_we_shape o_web_editor_Zigs_01_001"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_pricelist_boxed.xml b/theme_buzzy/views/snippets/s_pricelist_boxed.xml
index 98729f9cd..d3e2808ef 100644
--- a/theme_buzzy/views/snippets/s_pricelist_boxed.xml
+++ b/theme_buzzy/views/snippets/s_pricelist_boxed.xml
@@ -6,10 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc3" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/05','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_buzzy/views/snippets/s_product_catalog.xml b/theme_buzzy/views/snippets/s_product_catalog.xml
index 4e8346aa3..3e0e55074 100644
--- a/theme_buzzy/views/snippets/s_product_catalog.xml
+++ b/theme_buzzy/views/snippets/s_product_catalog.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pb88 pt88" remove="pb64 pt64 oe_img_bg o_bg_img_center oe_custom_bg" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07_001","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
         <attribute name="style"/>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_07"/>
+        <div class="o_we_shape o_web_editor_Airy_07_001" style="background-image: url('/web_editor/shape/web_editor/Airy/07_001.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_three_columns.xml b/theme_buzzy/views/snippets/s_three_columns.xml
index dcc032217..c4912d3af 100644
--- a/theme_buzzy/views/snippets/s_three_columns.xml
+++ b/theme_buzzy/views/snippets/s_three_columns.xml
@@ -63,11 +63,11 @@
 <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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_12_001"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/new_page_template.xml b/theme_clean/views/new_page_template.xml
index 455bbb5a5..218e861d5 100644
--- a/theme_clean/views/new_page_template.xml
+++ b/theme_clean/views/new_page_template.xml
@@ -39,11 +39,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -105,11 +105,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -131,11 +131,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -165,11 +165,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3&amp;flip=x');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_numbers.xml b/theme_clean/views/snippets/s_numbers.xml
index 3779a7ef6..8229b36e3 100644
--- a/theme_clean/views/snippets/s_numbers.xml
+++ b/theme_clean/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt64" remove="o_cc1 pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10_001","colors":{"c5":"rgba(255,255,255,0.25)"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 7a73efde1..50fb43cbd 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -343,10 +343,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/08','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_08"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
@@ -455,10 +455,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc5 oe_img_bg" separator=" "/>
         <attribute name="style"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
@@ -583,10 +583,10 @@
 <!-- ===== WAVY GRID ======== -->
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/06_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Origins_06_001"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 <!-- ======== CARD OFFSET ======== -->
diff --git a/theme_cobalt/views/new_page_template.xml b/theme_cobalt/views/new_page_template.xml
index 138752b5d..8bbcdca96 100644
--- a/theme_cobalt/views/new_page_template.xml
+++ b/theme_cobalt/views/new_page_template.xml
@@ -5,10 +5,10 @@
 
 <template id="new_page_template_s_three_columns" inherit_id="website.new_page_template_s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01_001","colors":{"c5":"o-color-3"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -16,10 +16,10 @@
 
 <template id="new_page_template_s_three_columns_2nd" inherit_id="website.new_page_template_s_three_columns_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01_001","colors":{"c5":"o-color-3"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -29,10 +29,10 @@
 
 <template id="new_page_template_basic_s_picture" inherit_id="website.new_page_template_basic_s_picture">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01_001","colors":{"c5":"o-color-3"},"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>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
@@ -56,10 +56,10 @@
 
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01_001","colors":{"c5":"o-color-3"},"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>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
diff --git a/theme_enark/views/snippets/s_features_wall.xml b/theme_enark/views/snippets/s_features_wall.xml
index 1e28452ea..1fd45212f 100644
--- a/theme_enark/views/snippets/s_features_wall.xml
+++ b/theme_enark/views/snippets/s_features_wall.xml
@@ -4,10 +4,10 @@
 <template id="s_features_wall" inherit_id="website.s_features_wall">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001"/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_mode')]" position="attributes">
         <attribute name="style">gap: 0px 16px;</attribute>
diff --git a/theme_enark/views/snippets/s_wavy_grid.xml b/theme_enark/views/snippets/s_wavy_grid.xml
index 8de602b8b..10430bb83 100644
--- a/theme_enark/views/snippets/s_wavy_grid.xml
+++ b/theme_enark/views/snippets/s_wavy_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/02','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/02_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_02"/>
+        <div class="o_we_shape o_web_editor_Airy_02_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 4b5788800..d0da54d88 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -31,10 +31,10 @@
 
 <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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5": "o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-7')]" position="attributes">
         <attribute name="class" add="pb128" separator=" "/>
@@ -81,10 +81,10 @@
 <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="class" add="pb96 pt0" remove="pb80 pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/05','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -126,11 +126,11 @@
 
 <template id="configurator_s_mockup_image" inherit_id="website.configurator_s_mockup_image" name="Graphene s_mockup_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/02_001','colors':{'c4':'o-color-3','c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/13','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
     <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-3&amp;c5=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -315,10 +315,10 @@
 <template id="configurator_s_references" inherit_id="website.configurator_s_references" name="Graphene s_configurator_references">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt96 pb96" remove="pt80 pb80" separator=" "/>
-    <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/02_001','colors':{'c4':'o-color-3','c5':'o-color-4'},'flip':['x','y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+    <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/13','colors':{'c5':'o-color-3'},'flip':['x','y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</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-3&amp;c5=o-color-4&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -424,10 +424,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/11','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/11_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_11"/>
+        <div class="o_we_shape o_web_editor_Airy_11_001" style="background-image: url('/web_editor/shape/web_editor/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" remove="rounded" separator=" "/>
diff --git a/theme_graphene/views/new_page_template.xml b/theme_graphene/views/new_page_template.xml
index d24e5361a..b48cae36d 100644
--- a/theme_graphene/views/new_page_template.xml
+++ b/theme_graphene/views/new_page_template.xml
@@ -13,10 +13,10 @@
 
 <template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/06_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 
@@ -44,19 +44,19 @@
 
 <template id="new_page_template_about_s_company_team" inherit_id="website.new_page_template_about_s_company_team">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -123,10 +123,10 @@
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt0 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x","y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -138,10 +138,10 @@
 
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -149,10 +149,10 @@
 
 <template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -168,19 +168,19 @@
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_s_text_block_2nd" inherit_id="website.new_page_template_pricing_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/new_page_template.xml b/theme_kea/views/new_page_template.xml
index ee0902203..df0bfd287 100644
--- a/theme_kea/views/new_page_template.xml
+++ b/theme_kea/views/new_page_template.xml
@@ -13,10 +13,10 @@
 
 <template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/06_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 
@@ -88,11 +88,11 @@
 <template id="new_page_template_about_s_features" inherit_id="website.new_page_template_about_s_features">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -122,11 +122,11 @@
 <template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -151,11 +151,11 @@
 <template id="new_page_template_about_personal_s_image_text" inherit_id="website.new_page_template_about_personal_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -172,11 +172,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -224,10 +224,10 @@
 
 <template id="new_page_template_pricing_s_text_block_2nd" inherit_id="website.new_page_template_pricing_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_cards_grid.xml b/theme_kea/views/snippets/s_cards_grid.xml
index 4c1cccbf0..d27983434 100644
--- a/theme_kea/views/snippets/s_cards_grid.xml
+++ b/theme_kea/views/snippets/s_cards_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_cards_grid" inherit_id="website.s_cards_grid">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/07_001','flip':[],'showOnMobile':false}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_07_001"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h3" position="replace" mode="inner">
diff --git a/theme_kea/views/snippets/s_image_text.xml b/theme_kea/views/snippets/s_image_text.xml
index adc590993..f66a9b8bb 100644
--- a/theme_kea/views/snippets/s_image_text.xml
+++ b/theme_kea/views/snippets/s_image_text.xml
@@ -16,11 +16,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt232" remove="pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_image_title.xml b/theme_kea/views/snippets/s_image_title.xml
index 40d5ab00e..6f0cb51a0 100644
--- a/theme_kea/views/snippets/s_image_title.xml
+++ b/theme_kea/views/snippets/s_image_title.xml
@@ -2,12 +2,6 @@
 <odoo>
 
 <template id="s_image_title" inherit_id="website.s_image_title">
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
-    </xpath>
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_12"/>
-    </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         A Deep Dive into Virtual Reality and Innovation
     </xpath>
diff --git a/theme_kea/views/snippets/s_quotes_carousel_minimal.xml b/theme_kea/views/snippets/s_quotes_carousel_minimal.xml
index 1dcf580b6..e894e14e0 100644
--- a/theme_kea/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_kea/views/snippets/s_quotes_carousel_minimal.xml
@@ -4,10 +4,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/06','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/06_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_06"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kea/views/snippets/s_text_image.xml b/theme_kea/views/snippets/s_text_image.xml
index d56b269c9..0c03b8ea3 100644
--- a/theme_kea/views/snippets/s_text_image.xml
+++ b/theme_kea/views/snippets/s_text_image.xml
@@ -19,11 +19,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pb232" remove="pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_wavy_grid.xml b/theme_kea/views/snippets/s_wavy_grid.xml
index 73afb9813..57c293095 100644
--- a/theme_kea/views/snippets/s_wavy_grid.xml
+++ b/theme_kea/views/snippets/s_wavy_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Bold_01"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kiddo/views/new_page_template.xml b/theme_kiddo/views/new_page_template.xml
index 9a9f99abd..5b76fdcb5 100644
--- a/theme_kiddo/views/new_page_template.xml
+++ b/theme_kiddo/views/new_page_template.xml
@@ -16,11 +16,11 @@
     <xpath expr="//section" position="attributes">
         <!-- Added by both theme and new page template -->
         <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" 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%;"/>
+        <div class="o_we_shape o_web_editor_Containers_05" style="background-image: url('/web_editor/shape/web_editor/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -40,11 +40,11 @@
     <xpath expr="//section" position="attributes">
         <!-- Added by both theme and new page template -->
         <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" 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%;"/>
+        <div class="o_we_shape o_web_editor_Containers_05" style="background-image: url('/web_editor/shape/web_editor/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -68,11 +68,11 @@
 <template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-4"},"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-4&amp;flip=x'); background-position: 50% 100%;"/>
+    <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -87,11 +87,11 @@
     <xpath expr="//section" position="attributes">
         <!-- Added by both theme and new page template -->
         <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" 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%;"/>
+        <div class="o_we_shape o_web_editor_Containers_05" style="background-image: url('/web_editor/shape/web_editor/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -162,11 +162,11 @@
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-3"},"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 expr="//div[hasclass('o_we_shape')]" position="replace">
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -220,11 +220,11 @@
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-4"},"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-4&amp;flip=x'); background-position: 50% 100%;"/>
+    <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_banner.xml b/theme_kiddo/views/snippets/s_banner.xml
index f91586802..0e6c2401e 100644
--- a/theme_kiddo/views/snippets/s_banner.xml
+++ b/theme_kiddo/views/snippets/s_banner.xml
@@ -6,7 +6,7 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height oe_img_bg o_bg_img_center pb216 pt72 o_cc o_cc5" remove="pt96 pb96" separator=" "/>
         <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','colors':{'c3':'o-color-3'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/22_001','colors':{'c5':'o-color-3'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
 
     <!-- Row - remove grid mode -->
@@ -27,7 +27,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Wavy_22 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Wavy/22.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 
     <!-- Paragraph -->
@@ -49,11 +49,11 @@
 <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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml b/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
index f342c3fe6..6adaf5da6 100644
--- a/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/22','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/22_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_loftspace/views/new_page_template.xml b/theme_loftspace/views/new_page_template.xml
index d204ac08f..49f3274bf 100644
--- a/theme_loftspace/views/new_page_template.xml
+++ b/theme_loftspace/views/new_page_template.xml
@@ -51,44 +51,44 @@
 <template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_digital" inherit_id="website.new_page_template_s_call_to_action_digital">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
     </xpath>
     <!-- Add shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=rgba(0,0,0,0.25)&amp;c3=o-color-5');"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_big_number.xml b/theme_loftspace/views/snippets/s_big_number.xml
index b5afbbaf3..4441b2d69 100644
--- a/theme_loftspace/views/snippets/s_big_number.xml
+++ b/theme_loftspace/views/snippets/s_big_number.xml
@@ -4,13 +4,13 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/12"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17","colors":{"c5":"o-color-3"}}</attribute>
         <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_12"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_loftspace/views/snippets/s_color_blocks_2.xml b/theme_loftspace/views/snippets/s_color_blocks_2.xml
index ba095b873..d43675226 100644
--- a/theme_loftspace/views/snippets/s_color_blocks_2.xml
+++ b/theme_loftspace/views/snippets/s_color_blocks_2.xml
@@ -5,18 +5,18 @@
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc4" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[]}</attribute>
     </xpath>
     <xpath expr="//h2" position="before">
-        <div class="o_we_shape o_web_editor_Airy_04_001"/>
+        <div class="o_we_shape o_web_editor_Grids_02" style="background-image: url('/web_editor/shape/web_editor/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Right column -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':['x']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':['x']}</attribute>
     </xpath>
     <xpath expr="(//h2)[2]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_04_001 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Airy/04_001.svg?c1=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_web_editor_Grids_02" style="background-image: url('/web_editor/shape/web_editor/Grids/02.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 0% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_company_team_shapes.xml b/theme_loftspace/views/snippets/s_company_team_shapes.xml
index 06333e844..601faedb3 100644
--- a/theme_loftspace/views/snippets/s_company_team_shapes.xml
+++ b/theme_loftspace/views/snippets/s_company_team_shapes.xml
@@ -3,10 +3,10 @@
 
 <template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/03_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/12_002','colors':{'c5':'o-color-1','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_03_001 o_we_animated"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_image_text.xml b/theme_loftspace/views/snippets/s_image_text.xml
index 30e7b7abc..965399ffd 100644
--- a/theme_loftspace/views/snippets/s_image_text.xml
+++ b/theme_loftspace/views/snippets/s_image_text.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10_001","colors":{"c5":"rgba(0,0,0,0.25)"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
diff --git a/theme_loftspace/views/snippets/s_numbers.xml b/theme_loftspace/views/snippets/s_numbers.xml
index da757f912..611e1d6f7 100644
--- a/theme_loftspace/views/snippets/s_numbers.xml
+++ b/theme_loftspace/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb192" remove="pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"o-color-4"},"flip":["y"]}</attribute>
     </xpath>
     <!-- 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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_text_image.xml b/theme_loftspace/views/snippets/s_text_image.xml
index 9dff94052..548c6a4f1 100644
--- a/theme_loftspace/views/snippets/s_text_image.xml
+++ b/theme_loftspace/views/snippets/s_text_image.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Img wrapper -->
     <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
diff --git a/theme_loftspace/views/snippets/s_wavy_grid.xml b/theme_loftspace/views/snippets/s_wavy_grid.xml
index 3237fa9f1..1ba5fc9ba 100644
--- a/theme_loftspace/views/snippets/s_wavy_grid.xml
+++ b/theme_loftspace/views/snippets/s_wavy_grid.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/10_001','colors':{'c5':'o-color-1'},'flip':["y"],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_10"/>
+        <div class="o_we_shape o_web_editor_Airy_10_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 839a7aff6..aca847186 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -13,10 +13,10 @@
         <attribute name="class" remove="pt40 pb40" add="o_cc o_cc5 pt104 pb16" separator=" "/>
     </xpath>
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-5','c4':'o-color-5','c5':'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-1","c1":"o-color-5"},"flip":["x"]}</attribute>
     </xpath>
     <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-5&amp;c4=o-color-5&amp;c5=o-color-1&amp;flip=y'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-1&amp;c1=o-color-5&amp;flip=x');"/>
     </xpath>
 </template>
 
@@ -244,10 +244,10 @@
 <template id="s_carousel_intro" inherit_id="website.s_carousel_intro" name="Monglia s_carousel_intro">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/08','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/08_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_08"/>
+        <div class="o_we_shape o_web_editor_Wavy_08_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/08_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
         <attribute name="class" remove="o_cc o_cc1" separator=" "/>
@@ -365,10 +365,10 @@
 
 <template id="configurator_s_cta_box" inherit_id="website.configurator_s_cta_box" name="Monglia s_cta_box">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/14","colors":{"c5":"o-color-4","c1":"o-color-1"}}</attribute>
     </xpath>
     <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?c5=o-color-1&amp;c4=o-color-4&amp;c3=o-color-4&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
     </xpath>
 </template>
 
@@ -520,10 +520,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/12_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/21','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_12_001"/>
+        <div class="o_we_shape o_web_editor_Bold_21"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
@@ -663,10 +663,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="oe_img_bg" separator=" "/>
         <attribute name="style"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/08','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_08"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
     <xpath expr="//h1" position="replace" mode="inner">
@@ -681,10 +681,10 @@
 <template id="s_key_images" inherit_id="website.s_key_images" name="Monglia s_key_images">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/04",'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/18','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_04"/>
+        <div class="o_we_shape o_web_editor_Bold_18" style="background-image: url('/web_editor/shape/web_editor/Bold/18.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
@@ -754,10 +754,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/08','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/08_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Wavy_08"/>
+        <div class="o_we_shape o_web_editor_Wavy_08_001"/>
     </xpath>
     <xpath expr="//h3" position="attributes">
         <attribute name="class" add="h4-fs" remove="h5-fs" separator=" "/>
diff --git a/theme_nano/views/new_page_template.xml b/theme_nano/views/new_page_template.xml
index 561c6292d..f94f94d4b 100644
--- a/theme_nano/views/new_page_template.xml
+++ b/theme_nano/views/new_page_template.xml
@@ -86,10 +86,10 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -228,10 +228,10 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt200 pb200" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -239,10 +239,10 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -261,10 +261,10 @@
 <template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -280,10 +280,10 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -344,10 +344,10 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/25","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%;"/>
+        <div class="o_we_shape o_web_editor_Bold_25" style="background-image: url('/web_editor/shape/web_editor/Bold/25.svg?c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/snippets/s_big_number.xml b/theme_nano/views/snippets/s_big_number.xml
index 041827ffd..72b923364 100644
--- a/theme_nano/views/snippets/s_big_number.xml
+++ b/theme_nano/views/snippets/s_big_number.xml
@@ -4,13 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/06_001','colors':{'c3':'o-color-5'}}</attribute>
-        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/20','colors':{'c5':'o-color-1','c1':'o-color-1'}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Bold_06_001" style="background-image: url('/web_editor/shape/web_editor%2FBold%2F06_001.svg?c3=o-color-5');"/>
+        <div class="o_we_shape o_web_editor_Bold_20" style="background-image: url('/web_editor/shape/web_editor/Bold/20.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_notes/views/new_page_template.xml b/theme_notes/views/new_page_template.xml
index 934ee8268..eb86e0d25 100644
--- a/theme_notes/views/new_page_template.xml
+++ b/theme_notes/views/new_page_template.xml
@@ -139,7 +139,6 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
 
@@ -166,7 +165,6 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
 
@@ -237,7 +235,6 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
 
@@ -273,7 +270,6 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_big_number.xml b/theme_notes/views/snippets/s_big_number.xml
index 981e4b67b..5c1007bec 100644
--- a/theme_notes/views/snippets/s_big_number.xml
+++ b/theme_notes/views/snippets/s_big_number.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/04"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/04_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_04"/>
+        <div class="o_we_shape o_web_editor_Blobs_04_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/04_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_notes/views/snippets/s_company_team_shapes.xml b/theme_notes/views/snippets/s_company_team_shapes.xml
index 644632182..9e2b6b3c8 100644
--- a/theme_notes/views/snippets/s_company_team_shapes.xml
+++ b/theme_notes/views/snippets/s_company_team_shapes.xml
@@ -4,10 +4,10 @@
 <template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt80 pb80" remove="o_cc2 pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/05','colors':{'c3':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05" style="background-image: url('/web_editor/shape/web_editor/Origins/05.svg?c3=o-color-1');"></div>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-1');"></div>
     </xpath>
     <xpath expr="//h2" position="replace">
             <h2 style="text-align: center;"><span class="o_text_highlight o_translate_inline o_text_highlight_underline" style="--text-highlight-width: 4px; --text-highlight-color: var(--o-color-4);">Meet The Band</span></h2>
diff --git a/theme_notes/views/snippets/s_image_gallery.xml b/theme_notes/views/snippets/s_image_gallery.xml
index 5f0ca237b..265d987a7 100644
--- a/theme_notes/views/snippets/s_image_gallery.xml
+++ b/theme_notes/views/snippets/s_image_gallery.xml
@@ -11,10 +11,10 @@
 <template id="s_images_wall" inherit_id="website.s_images_wall">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb80" remove="pt24 pb24" separator=" "/>
-        <attribute name="data-oe-shape-data" add="{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-1','c4':'o-color-4','c5':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}"/>
+        <attribute name="data-oe-shape-data" add="{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'showOnMobile':false,'shapeAnimationSpeed':'0'}"/>
     </xpath>
     <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-1&amp;c4=o-color-4&amp;c5=o-color-1&amp;flip=x');"></div>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/." position="before">
         <div class="col-lg-12">
diff --git a/theme_notes/views/snippets/s_image_text.xml b/theme_notes/views/snippets/s_image_text.xml
index cb1aa930a..8428b5263 100644
--- a/theme_notes/views/snippets/s_image_text.xml
+++ b/theme_notes/views/snippets/s_image_text.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/02_001','colors':{'c4':'o-color-1','c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/13','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</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-1&amp;c5=o-color-4');"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Text wrapper -->
     <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
diff --git a/theme_notes/views/snippets/s_key_images.xml b/theme_notes/views/snippets/s_key_images.xml
index 44eaeb281..92e76dfae 100644
--- a/theme_notes/views/snippets/s_key_images.xml
+++ b/theme_notes/views/snippets/s_key_images.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11",'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11_001","colors":{"c5":"o-color-1"},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_11"/>
+        <div class="o_we_shape o_web_editor_Wavy_11_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_notes/views/snippets/s_pricelist_cafe.xml b/theme_notes/views/snippets/s_pricelist_cafe.xml
index 045941937..87e34683f 100644
--- a/theme_notes/views/snippets/s_pricelist_cafe.xml
+++ b/theme_notes/views/snippets/s_pricelist_cafe.xml
@@ -4,10 +4,10 @@
 <template id="s_pricelist_cafe" inherit_id="website.s_pricelist_cafe">
     <!-- Shape Color -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/19','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Origins/19.svg?c5=o-color-2');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Bold/16.svg?c5=o-color-2');</attribute>
     </xpath>
     <!-- Col colors -->
     <xpath expr="//div[hasclass('o_cc5')]" position="attributes">
diff --git a/theme_notes/views/snippets/s_quotes_carousel_minimal.xml b/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
index 033bdd83e..7ce75596b 100644
--- a/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
@@ -4,10 +4,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/13_002','colors':{'c5':'o-color-3','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_13_001 o_we_animated"/>
+        <div class="o_we_shape o_web_editor_Airy_13_002 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-3&amp;c3=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_notes/views/snippets/s_text_image.xml b/theme_notes/views/snippets/s_text_image.xml
index 28f0752b2..013b5018c 100644
--- a/theme_notes/views/snippets/s_text_image.xml
+++ b/theme_notes/views/snippets/s_text_image.xml
@@ -5,7 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11_001","colors":{"c5":"o-color-1"},"flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_11_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_notes/views/snippets/s_title.xml b/theme_notes/views/snippets/s_title.xml
index d4482d777..aede8ffde 100644
--- a/theme_notes/views/snippets/s_title.xml
+++ b/theme_notes/views/snippets/s_title.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1 pt80 pb80" remove="o_cc2 pt40 pb40" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/05','colors':{'c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05 bg-o-color-1" style="background-image: url('/web_editor/shape/web_editor/Origins/05.svg?c3=o-color-4');"></div>
+        <div class="o_we_shape o_web_editor_Bold_15 bg-o-color-1" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-4');"></div>
     </xpath>
     <xpath expr="//h2" position="replace">
         <h2 style="text-align: center;">#PulseOfTheFuture</h2>
diff --git a/theme_odoo_experts/views/new_page_template.xml b/theme_odoo_experts/views/new_page_template.xml
index 6301b78e0..329366260 100644
--- a/theme_odoo_experts/views/new_page_template.xml
+++ b/theme_odoo_experts/views/new_page_template.xml
@@ -25,11 +25,11 @@
 <template id="new_page_template_s_numbers" inherit_id="website.new_page_template_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Containers/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_16"/>
+        <div class="o_we_shape o_web_editor_Containers_05" style="background-image: url('/web_editor/shape/web_editor/Containers/05.svg?c5=o-color-4')"/>
     </xpath>
 </template>
 
@@ -45,11 +45,11 @@
 <template id="new_page_template_s_text_image" inherit_id="website.new_page_template_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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -78,11 +78,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" 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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_08_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -105,11 +105,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" 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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_08_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/08_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_image_title.xml b/theme_odoo_experts/views/snippets/s_image_title.xml
index df6b03c52..25341fabb 100644
--- a/theme_odoo_experts/views/snippets/s_image_title.xml
+++ b/theme_odoo_experts/views/snippets/s_image_title.xml
@@ -5,10 +5,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1" remove="o_cc5 oe_img_bg" separator=" "/>
         <attribute name="style"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/09_001','colors':{'c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/26','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_09_001" style="background-image: url('/web_editor/shape/web_editor%2FOrigins%2F09_001.svg?c3=o-color-3');"></div>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-3');"></div>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
diff --git a/theme_odoo_experts/views/snippets/s_key_images.xml b/theme_odoo_experts/views/snippets/s_key_images.xml
index 369ff7525..0a46f2674 100644
--- a/theme_odoo_experts/views/snippets/s_key_images.xml
+++ b/theme_odoo_experts/views/snippets/s_key_images.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/06_001','colors':{'c3':'o-color-1','c4':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//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-1&amp;c4=o-color-5');"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_odoo_experts/views/snippets/s_product_catalog.xml b/theme_odoo_experts/views/snippets/s_product_catalog.xml
index dece2ecd6..aff0894b5 100644
--- a/theme_odoo_experts/views/snippets/s_product_catalog.xml
+++ b/theme_odoo_experts/views/snippets/s_product_catalog.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt96 pb96" remove="pt64 pb64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-1","c3":"rgba(255,255,255,0)"},"flip":[]}</attribute>
     </xpath>
     <!-- Filter & shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Airy_03_001"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=rgba(255,255,255,0)');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/new_page_template.xml b/theme_orchid/views/new_page_template.xml
index 149b29be5..4a24f2d5f 100644
--- a/theme_orchid/views/new_page_template.xml
+++ b/theme_orchid/views/new_page_template.xml
@@ -42,11 +42,11 @@
 <template id="new_page_template_s_text_image" inherit_id="website.new_page_template_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/07","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-1"},"flip":["y"]}</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%;"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -79,11 +79,11 @@
 <template id="new_page_template_about_s_features" inherit_id="website.new_page_template_about_s_features">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -198,11 +198,11 @@
 <template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -215,11 +215,11 @@
 <template id="new_page_template_landing_3_s_three_columns" inherit_id="website.new_page_template_landing_3_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -330,11 +330,11 @@
 <template id="new_page_template_team_0_s_three_columns" inherit_id="website.new_page_template_team_0_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_22"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_big_number.xml b/theme_orchid/views/snippets/s_big_number.xml
index 30f028ffe..a83fa2cf7 100644
--- a/theme_orchid/views/snippets/s_big_number.xml
+++ b/theme_orchid/views/snippets/s_big_number.xml
@@ -4,12 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/08"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/17","colors":{"c5": "o-color-1"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_08"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_orchid/views/snippets/s_company_team_shapes.xml b/theme_orchid/views/snippets/s_company_team_shapes.xml
index 6bd36fd47..b2178d034 100644
--- a/theme_orchid/views/snippets/s_company_team_shapes.xml
+++ b/theme_orchid/views/snippets/s_company_team_shapes.xml
@@ -3,10 +3,10 @@
 
 <template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/05_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_05_001 o_we_animated"/>
+        <div class="o_we_shape o_web_editor_Airy_16" style="background-image: url('/web_editor/shape/web_editor/Airy/16.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_image_text_overlap.xml b/theme_orchid/views/snippets/s_image_text_overlap.xml
index 5332a0243..3db80a3ad 100644
--- a/theme_orchid/views/snippets/s_image_text_overlap.xml
+++ b/theme_orchid/views/snippets/s_image_text_overlap.xml
@@ -21,12 +21,12 @@
 
 <template id="configurator_s_image_text_overlap" inherit_id="website.configurator_s_image_text_overlap">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/19','flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/16','flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
     </xpath>
 
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_19 o_shape_show_mobile"/>
+        <div class="o_we_shape o_web_editor_Bold_16 o_shape_show_mobile"/>
     </xpath>
 
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_orchid/views/snippets/s_numbers_showcase.xml b/theme_orchid/views/snippets/s_numbers_showcase.xml
index 258a3ea3f..bbfa270d3 100644
--- a/theme_orchid/views/snippets/s_numbers_showcase.xml
+++ b/theme_orchid/views/snippets/s_numbers_showcase.xml
@@ -4,11 +4,11 @@
 <template id="s_numbers_showcase" inherit_id="website.s_numbers_showcase">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/12','flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/17','colors':{'c5':'o-color-3'},'flip':[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_12"/>
+        <div class="o_we_shape o_web_editor_Blobs_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml b/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
index 5a8e84c01..396c6c7e2 100644
--- a/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_orchid/views/snippets/s_quotes_carousel_minimal.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/06','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/06_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_06"/>
+        <div class="o_we_shape o_web_editor_Airy_06_001" style="background-image: url('/web_editor/shape/web_editor/Airy/06_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_orchid/views/snippets/s_references.xml b/theme_orchid/views/snippets/s_references.xml
index cf90aa537..df9d3f8d7 100644
--- a/theme_orchid/views/snippets/s_references.xml
+++ b/theme_orchid/views/snippets/s_references.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2 o_colored_level pt136" remove="o_cc1 pt40 pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-5','c4':'o-color-3','c5':'o-color-3'},'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-5','c1':'o-color-5'},'flip':['x'],'showOnMobile':true}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor%2FOrigins%2F07_002.svg?c3=o-color-5&amp;c4=o-color-3&amp;c5=o-color-3');"></div>
+        <div class="o_we_shape o_web_editor_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-5&amp;c1=o-color-5&amp;flip=x');"></div>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_title.xml b/theme_orchid/views/snippets/s_title.xml
index cc27cb85f..f2ffd58f5 100644
--- a/theme_orchid/views/snippets/s_title.xml
+++ b/theme_orchid/views/snippets/s_title.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 o_colored_level pt160" remove="pt40" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-3','c4':'o-color-5','c5':'o-color-5'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-5'},'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_07_002 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor%2FOrigins%2F07_002.svg?c3=o-color-3&amp;c4=o-color-5&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-5'); background-position: 50% 50%;"/>
     </xpath>
     <xpath expr="//h2" position="attributes">
         <attribute name="class" remove="display-3-fs" separator=" "/>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 407e170ba..33b5032f0 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -324,11 +324,11 @@
 <template id="s_numbers" inherit_id="website.s_numbers" name="Paptic s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/06_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_06"/>
+        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
     </xpath>
 </template>
 
@@ -495,10 +495,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/07_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_07_001"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
@@ -599,10 +599,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc5 oe_img_bg" separator=" "/>
         <attribute name="style"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/02_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/13','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"/>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
diff --git a/theme_paptic/views/new_page_template.xml b/theme_paptic/views/new_page_template.xml
index 43582f15e..ac54cda4f 100644
--- a/theme_paptic/views/new_page_template.xml
+++ b/theme_paptic/views/new_page_template.xml
@@ -14,22 +14,22 @@
 <template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_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>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -37,32 +37,32 @@
 <template id="new_page_template_s_call_to_action_digital" inherit_id="website.new_page_template_s_call_to_action_digital">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"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%;"/>
+        <div class="o_we_shape o_web_editor_Airy_12_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-5&amp;c3=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_three_columns" inherit_id="website.new_page_template_s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt0 pb0" remove="pb120 pt120" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"></div>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
 </template>
@@ -70,10 +70,10 @@
 <template id="new_page_template_s_three_columns_2nd" inherit_id="website.new_page_template_s_three_columns_2nd">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt0 pb0" remove="pb120 pt120" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Origins_02_001"></div>
+        <div class="o_we_shape o_web_editor_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
 </template>
diff --git a/theme_real_estate/views/snippets/s_title.xml b/theme_real_estate/views/snippets/s_title.xml
index 9db35662d..7110d13c3 100644
--- a/theme_real_estate/views/snippets/s_title.xml
+++ b/theme_real_estate/views/snippets/s_title.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120 o_cc o_cc4" remove="pt40 pb40" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/07','showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/07_001','colors':{'c5':'rgba(255,255,255,0.25)'},'showOnMobile':true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Airy_07" style="background-image: url('/web_editor/shape/web_editor/Airy/07.svg"/>
+        <div class="o_we_shape o_web_editor_Airy_07_001" style="background-image: url('/web_editor/shape/web_editor/Airy/07_001.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_real_estate/views/snippets/s_wavy_grid.xml b/theme_real_estate/views/snippets/s_wavy_grid.xml
index 17e529d35..43b3be819 100644
--- a/theme_real_estate/views/snippets/s_wavy_grid.xml
+++ b/theme_real_estate/views/snippets/s_wavy_grid.xml
@@ -5,10 +5,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/09_001','colors':{'c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/26','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <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-4');"/>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-4');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml b/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
index a427dee94..3bbca102a 100644
--- a/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
@@ -4,10 +4,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/05','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_treehouse/views/snippets/s_sidegrid.xml b/theme_treehouse/views/snippets/s_sidegrid.xml
index 8381c3e70..34b9b0350 100644
--- a/theme_treehouse/views/snippets/s_sidegrid.xml
+++ b/theme_treehouse/views/snippets/s_sidegrid.xml
@@ -4,10 +4,10 @@
 <template id="s_sidegrid" inherit_id="website.s_sidegrid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/22','colors':{'c3':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/22_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <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');"/>
+        <div class="o_we_shape o_web_editor_Wavy_22_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 6bab0c3cf..8b82a36f9 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -708,12 +708,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/08"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/01_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Bold_08"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
@@ -837,10 +837,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal" name="Vehicle s_quotes_carousel_minimal">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/09_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/26','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_09_001"/>
+        <div class="o_we_shape o_web_editor_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_vehicle/views/new_page_template.xml b/theme_vehicle/views/new_page_template.xml
index 4d8a1ce55..291a54995 100644
--- a/theme_vehicle/views/new_page_template.xml
+++ b/theme_vehicle/views/new_page_template.xml
@@ -19,10 +19,10 @@
 
 <template id="new_page_template_s_references" inherit_id="website.new_page_template_s_references">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_05"/>
+        <div class="o_we_shape o_web_editor_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_zap/views/snippets/s_big_number.xml b/theme_zap/views/snippets/s_big_number.xml
index 8701e4ae7..3442760c7 100644
--- a/theme_zap/views/snippets/s_big_number.xml
+++ b/theme_zap/views/snippets/s_big_number.xml
@@ -4,12 +4,12 @@
 <template id="s_big_number" inherit_id="website.s_big_number">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/14_001","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Airy_14"/>
+        <div class="o_we_shape o_web_editor_Airy_14_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_zap/views/snippets/s_cta_card.xml b/theme_zap/views/snippets/s_cta_card.xml
index 67d963325..0c160a891 100644
--- a/theme_zap/views/snippets/s_cta_card.xml
+++ b/theme_zap/views/snippets/s_cta_card.xml
@@ -5,11 +5,11 @@
    <!-- Section -->
    <xpath expr="//section" position="attributes">
       <attribute name="class" add="o_cc4 o_colored_level pt136" remove="o_cc2 pt64" separator=" "/>
-      <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-4','c4':'rgba(0,0,0,0)','c5':'o-color-1'},'flip':['x']}</attribute>
+      <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c5':'o-color-4','c1':'o-color-1'}}</attribute>
    </xpath>
    <!-- Shape -->
    <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-      <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=rgba(0,0,0,0)&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+      <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
    </xpath>
    <!-- Text Col -->
    <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
diff --git a/theme_zap/views/snippets/s_discovery.xml b/theme_zap/views/snippets/s_discovery.xml
index 2576ad268..4d97b834f 100644
--- a/theme_zap/views/snippets/s_discovery.xml
+++ b/theme_zap/views/snippets/s_discovery.xml
@@ -6,12 +6,12 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_colored_level oe_img_bg o_bg_img_center o_cc5 pb216" remove="o_cc1 pb136" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_kickoff_default_image'); background-position: 50% 75%;</attribute>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-3','c4':'rgba(0,0,0,0)','c5':'rgba(0,0,0,0)'},'flip':['x','y']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c1':'o-color-3','c5':'rgba(0,0,0,0)'}}</attribute>
     </xpath>
     <!-- Shape and 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_Origins_07_002" style="background-image: url('/web_editor/shape/web_editor/Origins/07_002.svg?c3=o-color-3&amp;c4=rgba(0,0,0,0)&amp;c5=rgba(0,0,0,0)&amp;flip=xy'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c1=o-color-3&amp;c5=rgba(0,0,0,0)');"/>
     </xpath>
     <!-- CTA -->
     <xpath expr="//span[hasclass('s_cta_badge')]" position="replace" mode="inner">
diff --git a/theme_zap/views/snippets/s_image_title.xml b/theme_zap/views/snippets/s_image_title.xml
index 6501ad8cf..c70471a44 100644
--- a/theme_zap/views/snippets/s_image_title.xml
+++ b/theme_zap/views/snippets/s_image_title.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt144 pb144" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Origins/07_002','colors':{'c3':'o-color-4','c4':'rgba(0,0,0,0)','c5':'o-color-4'},'flip':['y']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/14','colors':{'c1':'o-color-4','c5':'o-color-4'}}</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=rgba(0,0,0,0)&amp;c5=o-color-4&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_web_editor_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c1=o-color-4&amp;c5=o-color-4');"/>
     </xpath>
 
 </template>
diff --git a/theme_zap/views/snippets/s_pricelist_boxed.xml b/theme_zap/views/snippets/s_pricelist_boxed.xml
index f5b28ba94..450114da4 100644
--- a/theme_zap/views/snippets/s_pricelist_boxed.xml
+++ b/theme_zap/views/snippets/s_pricelist_boxed.xml
@@ -6,10 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc4" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/07_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_07_001"/>
+        <div class="o_we_shape o_web_editor_Bold_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>