diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py
index 7f51b8cf9..fbe12179e 100644
--- a/test_themes/tests/test_new_page_templates.py
+++ b/test_themes/tests/test_new_page_templates.py
@@ -77,7 +77,7 @@ CONFLICTUAL_CLASSES_RE = {
     # Shadow
     re.compile(r'^shadow-.+'): [],
     # Shapes
-    re.compile(r'^o_web_editor_[A-Z].+'): [],
+    re.compile(r'^o_html_builder_[A-Z].+'): [],
     # Text
     re.compile(r'^text-(?!(center|end|start|bg-|lg-)).*$'): [
         'text-break', 'text-decoration-none', 'text-reset',
diff --git a/theme_anelusia/views/new_page_template.xml b/theme_anelusia/views/new_page_template.xml
index 4315b215a..efc73b231 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/Containers/06","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Containers_06" style="background-image: url('/web_editor/shape/web_editor/Containers/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Containers_06" style="background-image: url('/web_editor/shape/html_builder/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 a665241a3..61637af26 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_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_Blobs_06_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_anelusia/views/snippets/s_call_to_action.xml b/theme_anelusia/views/snippets/s_call_to_action.xml
index 23c8c0077..da12cc87a 100644
--- a/theme_anelusia/views/snippets/s_call_to_action.xml
+++ b/theme_anelusia/views/snippets/s_call_to_action.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb104 o_cc4" remove="pt64 pb64 o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/02","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_02"/>
+        <div class="o_we_shape o_html_builder_Floats_02"/>
     </xpath>
     <!-- Title & subtitle -->
     <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
diff --git a/theme_anelusia/views/snippets/s_features_wall.xml b/theme_anelusia/views/snippets/s_features_wall.xml
index d29fd9400..b2eadbe01 100644
--- a/theme_anelusia/views/snippets/s_features_wall.xml
+++ b/theme_anelusia/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/Floats/09"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/09"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_09 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_09 o_we_animated"/>
     </xpath>
     <!-- Card 1 -->
     <xpath expr="//div[hasclass('g-col-lg-3')]//h3" position="replace" mode="inner">
diff --git a/theme_anelusia/views/snippets/s_numbers.xml b/theme_anelusia/views/snippets/s_numbers.xml
index 593c102bf..be7d410d2 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_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/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 a5c282f78..cf94ccbd4 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/Patterns/05", "colors":{"c5": "o-color-4"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Patterns_05" style="background-image: url('/web_editor/shape/web_editor/Patterns/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Patterns_05" style="background-image: url('/web_editor/shape/html_builder/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_pricelist_boxed.xml b/theme_anelusia/views/snippets/s_pricelist_boxed.xml
index af32225ee..bb91ab70d 100644
--- a/theme_anelusia/views/snippets/s_pricelist_boxed.xml
+++ b/theme_anelusia/views/snippets/s_pricelist_boxed.xml
@@ -6,11 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc5" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_12 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_anelusia/views/snippets/s_product_catalog.xml b/theme_anelusia/views/snippets/s_product_catalog.xml
index 64a0aff3e..dc2f1a135 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_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/web_editor/shape/html_builder/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 b50abfa08..f89b99361 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/Airy/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Airy_01_001" style="background-image: url('/web_editor/shape/web_editor/Airy/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_01_001" style="background-image: url('/web_editor/shape/html_builder/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_anelusia/views/snippets/s_showcase.xml b/theme_anelusia/views/snippets/s_showcase.xml
index 4c9f8d122..75c9426d6 100644
--- a/theme_anelusia/views/snippets/s_showcase.xml
+++ b/theme_anelusia/views/snippets/s_showcase.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt120 pb120" remove="pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/05","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_05"/>
+        <div class="o_we_shape o_html_builder_Floats_05"/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/new_page_template.xml b/theme_artists/views/new_page_template.xml
index 850528310..8fc61d11d 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_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-1","c3":"o-color-5"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-5&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -93,11 +93,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/Connections/16","colors":{"c5":"o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","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_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -178,11 +178,11 @@
 <template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/16","colors":{"c5":"o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","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_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -191,11 +191,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/Connections/16","colors":{"c5":"o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","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_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -216,11 +216,11 @@
 <template id="new_page_template_services_s_image_text_2nd" inherit_id="website.new_page_template_services_s_image_text_2nd">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["y","x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["y","x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -228,11 +228,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" />
+        <div class="o_we_shape o_html_builder_Wavy_04" />
     </xpath>
 </template>
 
@@ -274,11 +274,11 @@
 <template id="new_page_template_team_s_image_text_2nd" inherit_id="website.new_page_template_team_s_image_text_2nd">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["y","x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["y","x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -292,11 +292,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" />
+        <div class="o_we_shape o_html_builder_Wavy_04" />
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_big_number.xml b/theme_artists/views/snippets/s_big_number.xml
index caf89662b..f29499b70 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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/Airy/14_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_artists/views/snippets/s_color_blocks_2.xml b/theme_artists/views/snippets/s_color_blocks_2.xml
index 58b702aee..d30ce16a5 100644
--- a/theme_artists/views/snippets/s_color_blocks_2.xml
+++ b/theme_artists/views/snippets/s_color_blocks_2.xml
@@ -5,11 +5,11 @@
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="pt208 pb208 text-center" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":["x","y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/27","flip":["x","y"]}</attribute>
     </xpath>
     <!-- Left column - Shape -->
     <xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Left column - Button -->
     <xpath expr="//div[hasclass('col-lg-6')]//a[hasclass('btn')]" position="attributes">
@@ -18,11 +18,11 @@
     <!-- Right column -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
         <attribute name="class" add="pt208 pb208 text-center" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/27","flip":[]}</attribute>
     </xpath>
     <!-- Right column - Shape -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_27"/>
+        <div class="o_we_shape o_html_builder_Wavy_27"/>
     </xpath>
     <!-- Right column - Button -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//a[hasclass('btn')]" position="attributes">
diff --git a/theme_artists/views/snippets/s_cover.xml b/theme_artists/views/snippets/s_cover.xml
index 923e147a7..507e3b608 100644
--- a/theme_artists/views/snippets/s_cover.xml
+++ b/theme_artists/views/snippets/s_cover.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt224 pb200" remove="pt232 pb232 s_parallax_bg parallax s_parallax_is_fixed bg-black-50" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-1'},'flip':['y'], 'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':['y'], 'showOnMobile':true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Remove filter & parallax -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
diff --git a/theme_artists/views/snippets/s_features.xml b/theme_artists/views/snippets/s_features.xml
index cd2f38ead..881354165 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_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/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_image_text_box.xml b/theme_artists/views/snippets/s_image_text_box.xml
index 58cc68f17..28a9cffc8 100644
--- a/theme_artists/views/snippets/s_image_text_box.xml
+++ b/theme_artists/views/snippets/s_image_text_box.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape': 'web_editor/Connections/08','colors':{'c5':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape': 'html_builder/Connections/08','colors':{'c5':'o-color-1'}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/08.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Text box -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_artists/views/snippets/s_key_benefits.xml b/theme_artists/views/snippets/s_key_benefits.xml
index 4bcb58585..53a2f3eb7 100644
--- a/theme_artists/views/snippets/s_key_benefits.xml
+++ b/theme_artists/views/snippets/s_key_benefits.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt56 pb56" remove="pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape': 'web_editor/Connections/14','colors':{'c5':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape': 'html_builder/Connections/14','colors':{'c5':'o-color-1'}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/14.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/14.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Titles -->
     <xpath expr="(//h3)[1]" position="replace" mode="inner">
diff --git a/theme_artists/views/snippets/s_kickoff.xml b/theme_artists/views/snippets/s_kickoff.xml
index 1ed71ef02..9ea8ce440 100644
--- a/theme_artists/views/snippets/s_kickoff.xml
+++ b/theme_artists/views/snippets/s_kickoff.xml
@@ -4,7 +4,7 @@
 <template id="s_kickoff" inherit_id="website.s_kickoff">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape': 'web_editor/Connections/06', 'flip': [], 'showOnMobile': false}</attribute>
+        <attribute name="data-oe-shape-data">{'shape': 'html_builder/Connections/06', 'flip': [], 'showOnMobile': false}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
diff --git a/theme_artists/views/snippets/s_numbers_boxed.xml b/theme_artists/views/snippets/s_numbers_boxed.xml
index 81a34412c..20d713048 100644
--- a/theme_artists/views/snippets/s_numbers_boxed.xml
+++ b/theme_artists/views/snippets/s_numbers_boxed.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_12 o_we_animated"/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_pricelist_boxed.xml b/theme_artists/views/snippets/s_pricelist_boxed.xml
index e3b8536c8..b0665941c 100644
--- a/theme_artists/views/snippets/s_pricelist_boxed.xml
+++ b/theme_artists/views/snippets/s_pricelist_boxed.xml
@@ -6,11 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
         <attribute name="class" add="o_cc o_cc5" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Wavy/27','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/27','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_27 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Wavy_27 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_artists/views/snippets/s_quotes_carousel_minimal.xml b/theme_artists/views/snippets/s_quotes_carousel_minimal.xml
index 9d8e917d5..467e04c08 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/17','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_artists/views/snippets/s_striped.xml b/theme_artists/views/snippets/s_striped.xml
index 0bf1d23ca..4ebf01949 100644
--- a/theme_artists/views/snippets/s_striped.xml
+++ b/theme_artists/views/snippets/s_striped.xml
@@ -4,11 +4,11 @@
 <template id="s_striped" inherit_id="website.s_striped">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_striped_center_top.xml b/theme_artists/views/snippets/s_striped_center_top.xml
index caa067105..cfc92f0b2 100644
--- a/theme_artists/views/snippets/s_striped_center_top.xml
+++ b/theme_artists/views/snippets/s_striped_center_top.xml
@@ -4,11 +4,11 @@
 <template id="s_striped_center_top" inherit_id="website.s_striped_center_top">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_artists/views/snippets/s_striped_top.xml b/theme_artists/views/snippets/s_striped_top.xml
index 07bade626..fbb831746 100644
--- a/theme_artists/views/snippets/s_striped_top.xml
+++ b/theme_artists/views/snippets/s_striped_top.xml
@@ -4,11 +4,11 @@
 <template id="s_striped_top" inherit_id="website.s_striped_top">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':[], 'showOnMobile':true}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1');</attribute>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="attributes">
diff --git a/theme_artists/views/snippets/s_text_image.xml b/theme_artists/views/snippets/s_text_image.xml
index c2c61830c..f0a041ff6 100644
--- a/theme_artists/views/snippets/s_text_image.xml
+++ b/theme_artists/views/snippets/s_text_image.xml
@@ -33,11 +33,11 @@
 <template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" />
+        <div class="o_we_shape o_html_builder_Wavy_04" />
     </xpath>
 </template>
 
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index a727a1db9..530affda6 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -175,10 +175,10 @@
 
 <template id="configurator_s_three_columns" inherit_id="website.configurator_s_three_columns" name="Avantgarde s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/02","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/02","colors":{"c5":"o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_02" style="background-image: url('/web_editor/shape/web_editor/Connections/02.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/web_editor/shape/html_builder/Connections/02.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
@@ -587,13 +587,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/Blocks/04"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04"}</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_Blocks_04"/>
+        <div class="o_we_shape o_html_builder_Blocks_04"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_avantgarde/views/new_page_template.xml b/theme_avantgarde/views/new_page_template.xml
index b0889d6e9..c8563986e 100644
--- a/theme_avantgarde/views/new_page_template.xml
+++ b/theme_avantgarde/views/new_page_template.xml
@@ -5,28 +5,28 @@
 
 <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/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.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/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.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/Connections/06",""colors": {"c5": "o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06",""colors": {"c5": "o-color-1"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-1')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-1')"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/new_page_template.xml b/theme_aviato/views/new_page_template.xml
index 096310e79..3140c0955 100644
--- a/theme_aviato/views/new_page_template.xml
+++ b/theme_aviato/views/new_page_template.xml
@@ -15,10 +15,10 @@
 
 <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/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -63,10 +63,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="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -84,10 +84,10 @@
 
 <template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -95,10 +95,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/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -120,10 +120,10 @@
 
 <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/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_banner.xml b/theme_aviato/views/snippets/s_banner.xml
index ff63b3121..de3fb5f94 100644
--- a/theme_aviato/views/snippets/s_banner.xml
+++ b/theme_aviato/views/snippets/s_banner.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pt80 pb144" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape": "web_editor/Connections/06", "colors": {"c5": "o-color-4"}, "flip": [], "showOnMobile": false, "shapeAnimationSpeed": "0"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape": "html_builder/Connections/06", "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_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace">
diff --git a/theme_aviato/views/snippets/s_big_number.xml b/theme_aviato/views/snippets/s_big_number.xml
index 99d24ef84..9a5fa1796 100644
--- a/theme_aviato/views/snippets/s_big_number.xml
+++ b/theme_aviato/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/Connections/06", "colors": {"c5": "o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06", "colors": {"c5": "o-color-3"}}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_aviato/views/snippets/s_cover.xml b/theme_aviato/views/snippets/s_cover.xml
index 594200f74..1a97dae71 100644
--- a/theme_aviato/views/snippets/s_cover.xml
+++ b/theme_aviato/views/snippets/s_cover.xml
@@ -27,11 +27,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/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/09","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_09" style="background-image: url('/web_editor/shape/web_editor/Connections/09.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_09" style="background-image: url('/web_editor/shape/html_builder/Connections/09.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_key_images.xml b/theme_aviato/views/snippets/s_key_images.xml
index 8491da062..80e83eacd 100644
--- a/theme_aviato/views/snippets/s_key_images.xml
+++ b/theme_aviato/views/snippets/s_key_images.xml
@@ -4,10 +4,10 @@
 <template id="s_key_images" inherit_id="website.s_key_images">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5": "o-color-3"},"flip":[],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","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_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_aviato/views/snippets/s_masonry_block.xml b/theme_aviato/views/snippets/s_masonry_block.xml
index ff3ad6901..b28a2c345 100644
--- a/theme_aviato/views/snippets/s_masonry_block.xml
+++ b/theme_aviato/views/snippets/s_masonry_block.xml
@@ -4,10 +4,10 @@
 <template id="s_masonry_block" inherit_id="website.s_masonry_block" name="Masonry">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc1 pt24 pb104" remove="pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':true}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_motto.xml b/theme_aviato/views/snippets/s_motto.xml
index 6acd8c988..2e8923501 100644
--- a/theme_aviato/views/snippets/s_motto.xml
+++ b/theme_aviato/views/snippets/s_motto.xml
@@ -4,10 +4,10 @@
 <template id="s_motto" inherit_id="website.s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_numbers_boxed.xml b/theme_aviato/views/snippets/s_numbers_boxed.xml
index 55a11ff33..385e8b592 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_001", "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_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 028d9c9ab..5cba1fc92 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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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 cc344a46c..ddf6b9578 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/17","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index 05ede311b..08151ce63 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -37,11 +37,11 @@
 <template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/02","colors":{"c5":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/02","colors":{"c5":"o-color-4"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_02" style="background-image: url('/web_editor/shape/web_editor/Connections/02.svg?c5=o-color-4&amp;flip=y');"/>
+        <div class="o_we_shape o_html_builder_Connections_02" style="background-image: url('/web_editor/shape/html_builder/Connections/02.svg?c5=o-color-4&amp;flip=y');"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index 64a8f67b4..cc21a8b41 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/Blurry/06","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blurry/06","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blurry_06"/>
+        <div class="o_we_shape o_html_builder_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 ad44f6290..115201ef8 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/Bold/14','colors':{'c5':'o-color-4','c1':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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 expr="//div[hasclass('o_html_builder_Grids_02')]" position="replace">
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 f6b1af95a..56a9815c4 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/Bold/13','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/13','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_13"/>
+        <div class="o_we_shape o_html_builder_Bold_13"/>
     </xpath>
     <xpath expr="//img" position="attributes">
         <attribute name="style"/>
diff --git a/theme_beauty/views/snippets/s_numbers.xml b/theme_beauty/views/snippets/s_numbers.xml
index a13c73f22..67f131464 100644
--- a/theme_beauty/views/snippets/s_numbers.xml
+++ b/theme_beauty/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/10","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_10"/>
+        <div class="o_we_shape o_html_builder_Rainy_10"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_numbers_boxed.xml b/theme_beauty/views/snippets/s_numbers_boxed.xml
index ee56fb03e..ffccece39 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/17", "colors":{"c5": "rgba(255,255,255,0.25)"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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 b0e9c9cc0..a580fda53 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_001','colors':{'c5':'o-color-1'},'flip':['x']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/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_picture.xml b/theme_beauty/views/snippets/s_picture.xml
index d1e94fc3d..ecb954fea 100644
--- a/theme_beauty/views/snippets/s_picture.xml
+++ b/theme_beauty/views/snippets/s_picture.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/06","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/06","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_06" style="background-image: url('/web_editor/shape/web_editor/Rainy/06.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Rainy_06" style="background-image: url('/web_editor/shape/html_builder/Rainy/06.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_pricelist_boxed.xml b/theme_beauty/views/snippets/s_pricelist_boxed.xml
index 24b4cc9ea..7113927d4 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/Bold/14','colors':{'c5':'o-color-4', 'c1':'o-color-4'},'flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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_title.xml b/theme_beauty/views/snippets/s_title.xml
index 3fae3ba55..1cb6fa12b 100644
--- a/theme_beauty/views/snippets/s_title.xml
+++ b/theme_beauty/views/snippets/s_title.xml
@@ -15,11 +15,11 @@
 <template id="configurator_s_title" inherit_id="website.configurator_s_title">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/10","colors":{"c5":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/10","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_Connections_10" style="background-image: url('/web_editor/shape/web_editor/Connections/10.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_beauty/views/snippets/s_wavy_grid.xml b/theme_beauty/views/snippets/s_wavy_grid.xml
index f1f7b2aa2..ffbab086c 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/17','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/Blobs/17.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 396fca955..bab1b36dd 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -6,12 +6,12 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt200 pb200 oe_img_bg o_bg_img_center" remove="bg-black-50 s_parallax_is_fixed parallax pt232 pb232" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;</attribute>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/08_001","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">0</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_08_001"/>
     </xpath>
     <!-- Remove the background image for parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
@@ -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/05_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/05_001"}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <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)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//span[hasclass('h5-fs')]" position="replace" mode="inner">
         Faculties
@@ -215,11 +215,11 @@
 <template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel" name="Be Wise s_quotes_carousel">
     <!-- Shape option -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5": "o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5": "o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -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/05_001","flip":["x","y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/05_001","flip":["x","y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//section/div" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_05_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/05_001.svg?c1=rgba(0,0,0,0.25)&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" 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/Grids/02","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Grids_02" style="background-image: url('/web_editor/shape/web_editor/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
@@ -608,12 +608,12 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Be Wise s_product_catalog">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt120 pb120" remove="pt64 pb64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/06","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/06","flip":[]}</attribute>
     </xpath>
     <!-- Filter & shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-75"/>
-        <div class="o_we_shape o_web_editor_Floats_06"/>
+        <div class="o_we_shape o_html_builder_Floats_06"/>
     </xpath>
 </template>
 
@@ -898,12 +898,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/20","colors":{"c5":"o-color-4","c1":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_20 bg-rgba(0,0,0,0.25)" style="background-image: url('/web_editor/shape/html_builder/Bold/20.svg?c5=o-color-4&amp;c1=o-color-4');"/>
     </xpath>
 
     <!-- Text -->
@@ -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_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/06_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/web_editor/shape/html_builder/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/Bold/15", "colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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/17", "colors":{"c5": "rgba(0,0,0,0.25)"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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_bewise/views/new_page_template.xml b/theme_bewise/views/new_page_template.xml
index 1e8058710..dc78f0712 100644
--- a/theme_bewise/views/new_page_template.xml
+++ b/theme_bewise/views/new_page_template.xml
@@ -37,12 +37,12 @@
 <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/Connections/08","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/08","colors":{"c5":"o-color-4"}}</attribute>
         <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_08" style="background-image: url('/web_editor/shape/web_editor/Connections/08.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -87,12 +87,12 @@
 <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/Connections/08","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/08","colors":{"c5":"o-color-4"}}</attribute>
         <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_08" style="background-image: url('/web_editor/shape/web_editor/Connections/08.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_08" style="background-image: url('/web_editor/shape/html_builder/Connections/08.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/new_page_template.xml b/theme_bistro/views/new_page_template.xml
index 513eb70e1..213f8c492 100644
--- a/theme_bistro/views/new_page_template.xml
+++ b/theme_bistro/views/new_page_template.xml
@@ -6,21 +6,21 @@
 <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/Bold/26","colors":{"c5": "o-color-1"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-1&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/20","colors":{"c5": "o-color-5"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-5"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -62,22 +62,22 @@
     <!-- 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/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/20","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -185,11 +185,11 @@
 <template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <!-- Shape option -->
     <xpath expr="section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -197,11 +197,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/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -232,11 +232,11 @@
 <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/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -252,11 +252,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/Connections/18"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18"/>
+        <div class="o_we_shape o_html_builder_Connections_18"/>
     </xpath>
 </template>
 
@@ -304,11 +304,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/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_big_number.xml b/theme_bistro/views/snippets/s_big_number.xml
index 93f872545..40f2853d9 100644
--- a/theme_bistro/views/snippets/s_big_number.xml
+++ b/theme_bistro/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/02","colors":{"c1":"o-color-1","c2":"o-color-1"},"flip":[],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/02","colors":{"c1":"o-color-1","c2":"o-color-1"},"flip":[],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_02" style="background-image: url('/web_editor/shape/web_editor/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/web_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_bistro/views/snippets/s_cover.xml b/theme_bistro/views/snippets/s_cover.xml
index 4b583e330..40c058772 100644
--- a/theme_bistro/views/snippets/s_cover.xml
+++ b/theme_bistro/views/snippets/s_cover.xml
@@ -29,11 +29,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/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_features_wall.xml b/theme_bistro/views/snippets/s_features_wall.xml
index c7a914259..223be9da4 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_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_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_motto.xml b/theme_bistro/views/snippets/s_motto.xml
index 6acd8c988..2e8923501 100644
--- a/theme_bistro/views/snippets/s_motto.xml
+++ b/theme_bistro/views/snippets/s_motto.xml
@@ -4,10 +4,10 @@
 <template id="s_motto" inherit_id="website.s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index 709ef5ced..f903a11e7 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -20,11 +20,11 @@
 <template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/18","colors":{"c5": "o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_18" style="background-image: url('/web_editor/shape/web_editor/Connections/18.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_18" style="background-image: url('/web_editor/shape/html_builder/Connections/18.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_quotes_carousel.xml b/theme_bistro/views/snippets/s_quotes_carousel.xml
index f49558346..83f49f7e7 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/Bold/16','colors':{'c5':'o-color-1'},'flip':['x'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_16" style="background-image: url('/web_editor/shape/web_editor/Bold/16.svg?c5=o-color-1&amp;flip=x');"/>
+        <div class="o_we_shape o_html_builder_Bold_16" style="background-image: url('/web_editor/shape/html_builder/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_quotes_carousel_minimal.xml b/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml
index ad273be0b..b7ad8e5f8 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_bistro/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/Connections/06','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','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_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bistro/views/snippets/s_wavy_grid.xml b/theme_bistro/views/snippets/s_wavy_grid.xml
index 32dbf8d72..fe8570d3e 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/Bold/26','colors':{'c5': 'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-2');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_bookstore/views/snippets/s_banner.xml b/theme_bookstore/views/snippets/s_banner.xml
index 28b1f19ac..3b31ad055 100644
--- a/theme_bookstore/views/snippets/s_banner.xml
+++ b/theme_bookstore/views/snippets/s_banner.xml
@@ -30,11 +30,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/Connections/06', 'colors':{'c5':'o-color-3'}, 'flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06', 'colors':{'c5':'o-color-3'}, 'flip':[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3')"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3')"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_big_number.xml b/theme_bookstore/views/snippets/s_big_number.xml
index d8c513522..ecd95836f 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_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_Blobs_06_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_bookstore/views/snippets/s_cover.xml b/theme_bookstore/views/snippets/s_cover.xml
index b301cbe33..b092818db 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/Bold/26', 'colors':{'c5':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/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_cta_box.xml b/theme_bookstore/views/snippets/s_cta_box.xml
index d598273a2..566128d54 100644
--- a/theme_bookstore/views/snippets/s_cta_box.xml
+++ b/theme_bookstore/views/snippets/s_cta_box.xml
@@ -23,11 +23,11 @@
 <template id="configurator_s_cta_box" inherit_id="website.configurator_s_cta_box">
     <!-- Shape option -->
     <xpath expr="section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20', 'colors':{'c5':'o-color-4'},'flip':['y']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20', 'colors':{'c5':'o-color-4'},'flip':['y']}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_media_list.xml b/theme_bookstore/views/snippets/s_media_list.xml
index 37fca909d..efefd156d 100644
--- a/theme_bookstore/views/snippets/s_media_list.xml
+++ b/theme_bookstore/views/snippets/s_media_list.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/05', 'colors':{'c5':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Bold/05', 'colors':{'c5':'o-color-1'}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Bold_05" style="background-image: url('/web_editor/shape/web_editor/Bold/05.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_05" style="background-image: url('/web_editor/shape/html_builder/Bold/05.svg?c5=o-color-1');"/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
diff --git a/theme_bookstore/views/snippets/s_numbers.xml b/theme_bookstore/views/snippets/s_numbers.xml
index 2866b9666..5a52a4b11 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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-5"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 632055788..a6bf67d8e 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/17", "colors":{"c5": "o-color-1"}, "flip":[], "showOnMobile":true}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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 0a3d047f1..d3a3c14b4 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_002','colors':{'c5':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated"  style="background-image: url('/web_editor/shape/html_builder/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_title.xml b/theme_bookstore/views/snippets/s_title.xml
index d21953b4f..5b32c3cbe 100644
--- a/theme_bookstore/views/snippets/s_title.xml
+++ b/theme_bookstore/views/snippets/s_title.xml
@@ -21,11 +21,11 @@
 <template id="configurator_s_title" inherit_id="website.configurator_s_title">
     <!-- Shape option -->
     <xpath expr="section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/05','colors':{'c5':'o-color-4'},'flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/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_Connections_05" style="background-image: url('/web_editor/shape/web_editor/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_wavy_grid.xml b/theme_bookstore/views/snippets/s_wavy_grid.xml
index 0bba0646e..184e6f252 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/03","colors":{"c2":"o-color-3"},"flip":["x","y"],"showOnMobile":false,"shapeAnimationSpeed":"0"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_03" style="background-image: url('/web_editor/shape/web_editor/Blobs/03.svg?c2=o-color-3&amp;flip=xy');  background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_03" style="background-image: url('/web_editor/shape/html_builder/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 f749b828c..dff09581c 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -51,11 +51,11 @@
 <template id="new_page_template_s_showcase" inherit_id="website.new_page_template_s_showcase">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04",'colors':{'c1':'o-color-1','c2':'o-color-2','c3':'rgba(0,0,0,0)','c5':'o-color-5'},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04",'colors':{'c1':'o-color-1','c2':'o-color-2','c3':'rgba(0,0,0,0)','c5':'o-color-5'},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=rgba(0,0,0,0)&amp;c5=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Blocks_04" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=rgba(0,0,0,0)&amp;c5=o-color-5');"/>
     </xpath>
 </template>
 
@@ -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_002','colors':{'c5':'o-color-1','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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_002','colors':{'c5':'o-color-4','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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_002','colors':{'c5':'o-color-4','c3':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_002" style="background-image: url('/web_editor/shape/web_editor/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/Airy/13_002.svg?c5=o-color-4&amp;c3=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_big_number.xml b/theme_buzzy/views/snippets/s_big_number.xml
index 70861c30b..7acfe7516 100644
--- a/theme_buzzy/views/snippets/s_big_number.xml
+++ b/theme_buzzy/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/Blocks/01_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/01_001"}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blocks_01_001"/>
+        <div class="o_we_shape o_html_builder_Blocks_01_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_buzzy/views/snippets/s_color_blocks_2.xml b/theme_buzzy/views/snippets/s_color_blocks_2.xml
index 90093ef7c..19f8002bc 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_001","flip":["y","x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-1"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/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 30bec7b4a..e6bec3f6c 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/12_002","colors":{"c5":"rgba(255,255,255,0.25)","c3":"rgba(255,255,255,0)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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)');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/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 a25b52552..3584f33e3 100644
--- a/theme_buzzy/views/snippets/s_cta_box.xml
+++ b/theme_buzzy/views/snippets/s_cta_box.xml
@@ -6,10 +6,10 @@
     <xpath expr="//div[hasclass('card')]" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
         <attribute name="style" add="border-radius: 12px !important;" separator=";"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/02','colors':{'c1':'o-color-1','c2':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/02','colors':{'c1':'o-color-1','c2':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('card-body')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_02" style="background-image: url('/web_editor/shape/web_editor/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Blobs_02" style="background-image: url('/web_editor/shape/html_builder/Blobs/02.svg?c1=o-color-1&amp;c2=o-color-5');"/>
     </xpath>
     <xpath expr="//div[hasclass('card-body')]" position="attributes">
         <attribute name="style">text-align: center;</attribute>
@@ -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_002','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_002" style="background-image: url('/web_editor/shape/web_editor/Blobs/10_002.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_10_002" style="background-image: url('/web_editor/shape/html_builder/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 25d6b60ce..8c49be4ca 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/Containers/06','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+      <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Containers_06 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Containers/06.svg?c5=o-color-4');"/>
+      <div class="o_we_shape o_html_builder_Containers_06 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/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_features.xml b/theme_buzzy/views/snippets/s_features.xml
index ddc1414ca..1c743e0c2 100644
--- a/theme_buzzy/views/snippets/s_features.xml
+++ b/theme_buzzy/views/snippets/s_features.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/09_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_09_001"/>
     </xpath>
     <!-- Feature #1 - Icon -->
     <xpath expr="//div[hasclass('row')]//div[1]//i" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_image_title.xml b/theme_buzzy/views/snippets/s_image_title.xml
index ce340d564..82658690b 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_001','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/04_001.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/web_editor/shape/html_builder/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 ab9098af8..27b9c9156 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/01_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Zigs/01_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_01_001"/>
+        <div class="o_we_shape o_html_builder_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 d3e2808ef..01542437d 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/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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_process_steps.xml b/theme_buzzy/views/snippets/s_process_steps.xml
index e9f5d7917..04a84a740 100644
--- a/theme_buzzy/views/snippets/s_process_steps.xml
+++ b/theme_buzzy/views/snippets/s_process_steps.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/08_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_08_001"/>
     </xpath>
     <xpath expr="//div[hasclass('s_process_step_number')]" position="attributes">
         <attribute name="class" add="bg-black-15" remove="bg-primary-light" separator=" "/>
diff --git a/theme_buzzy/views/snippets/s_product_catalog.xml b/theme_buzzy/views/snippets/s_product_catalog.xml
index 3e0e55074..48941e8a7 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_001","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/07_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/web_editor/shape/html_builder/Airy/07_001.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_quotes_carousel.xml b/theme_buzzy/views/snippets/s_quotes_carousel.xml
index 3ceb5470a..ae08697e6 100644
--- a/theme_buzzy/views/snippets/s_quotes_carousel.xml
+++ b/theme_buzzy/views/snippets/s_quotes_carousel.xml
@@ -5,11 +5,11 @@
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_rounded o_cc5" remove="s_carousel_boxed o_cc2 carousel-dark" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/10","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_10"/>
+        <div class="o_we_shape o_html_builder_Rainy_10"/>
     </xpath>
     <!-- Carousel items - Remove background image -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_quotes_carousel_minimal.xml b/theme_buzzy/views/snippets/s_quotes_carousel_minimal.xml
index 79d5a6f3f..b182b1794 100644
--- a/theme_buzzy/views/snippets/s_quotes_carousel_minimal.xml
+++ b/theme_buzzy/views/snippets/s_quotes_carousel_minimal.xml
@@ -4,10 +4,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal">
     <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/Blocks/04','colors':{'c1':'#637bbe','c2':'#8eb9c7','c3':'#f6f0ea','c5':'#637bbe'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blocks/04','colors':{'c1':'#637bbe','c2':'#8eb9c7','c3':'#f6f0ea','c5':'#637bbe'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04"/>
+        <div class="o_we_shape o_html_builder_Blocks_04"/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_three_columns.xml b/theme_buzzy/views/snippets/s_three_columns.xml
index 370ce18a2..57e3f57f3 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_002","colors":{"c5":"o-color-1","c3":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_002" style="background-image: url('/web_editor/shape/web_editor/Airy/12_002.svg?c5=o-color-1&amp;c3=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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 218e861d5..547d81cf8 100644
--- a/theme_clean/views/new_page_template.xml
+++ b/theme_clean/views/new_page_template.xml
@@ -6,11 +6,11 @@
 <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/Connections/06","colors":{"c5":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -23,11 +23,11 @@
 <template id="new_page_template_s_three_columns" inherit_id="website.new_page_template_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/20","colors":{"c5":"o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","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_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
 </template>
 
@@ -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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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_big_number.xml b/theme_clean/views/snippets/s_big_number.xml
index 70861c30b..7acfe7516 100644
--- a/theme_clean/views/snippets/s_big_number.xml
+++ b/theme_clean/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/Blocks/01_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/01_001"}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blocks_01_001"/>
+        <div class="o_we_shape o_html_builder_Blocks_01_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_clean/views/snippets/s_numbers.xml b/theme_clean/views/snippets/s_numbers.xml
index 8229b36e3..4c14e34e6 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_001","colors":{"c5":"rgba(255,255,255,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(255,255,255,0.25)');"/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_numbers_showcase.xml b/theme_clean/views/snippets/s_numbers_showcase.xml
index fb54ccfcf..5af1f75eb 100644
--- a/theme_clean/views/snippets/s_numbers_showcase.xml
+++ b/theme_clean/views/snippets/s_numbers_showcase.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pt88" remove="pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Grid items -->
     <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
diff --git a/theme_clean/views/snippets/s_pricelist_boxed.xml b/theme_clean/views/snippets/s_pricelist_boxed.xml
index f3caefa87..3dc191155 100644
--- a/theme_clean/views/snippets/s_pricelist_boxed.xml
+++ b/theme_clean/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_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1&amp;flip=y');  background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y');  background-position: 50% 0%"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_clean/views/snippets/s_three_columns.xml b/theme_clean/views/snippets/s_three_columns.xml
index 8357f1fc8..e414d460c 100644
--- a/theme_clean/views/snippets/s_three_columns.xml
+++ b/theme_clean/views/snippets/s_three_columns.xml
@@ -41,11 +41,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/Connections/20","colors":{"c5": "o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","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_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index c589627b1..f2180d5a5 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -6,10 +6,10 @@
     <!-- Content -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt24 pb80" remove="pt96 pb96" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','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_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3');"/>
     </xpath>
     <!-- Row - remove grid mode -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
@@ -345,10 +345,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/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-1');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
@@ -457,10 +457,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_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
@@ -470,10 +470,10 @@
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt112" remove="pt72" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/06','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 
     <!-- Numbers -->
@@ -567,13 +567,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/Blocks/01_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/01_001"}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blocks_01_001"/>
+        <div class="o_we_shape o_html_builder_Blocks_01_001"/>
     </xpath>
 
     <!-- Text -->
@@ -585,10 +585,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/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 <!-- ======== CARD OFFSET ======== -->
@@ -676,10 +676,10 @@
 <template id="s_company_team_detail" inherit_id="website.s_company_team_detail">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 pt96" remove="o_cc1 pt64" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/05','colors':{'c5':'o-color-4'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/05','colors':{'c5':'o-color-4'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_05" style="background-image: url('/web_editor/shape/web_editor/Connections/05.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
         <attribute name="class" add="col-lg-3" remove="col-lg-4" separator=" "/>
@@ -701,10 +701,10 @@
 <template id="s_references_grid" inherit_id="website.s_references_grid">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt112" remove="pt64" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/06','flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_cobalt/views/new_page_template.xml b/theme_cobalt/views/new_page_template.xml
index 8bbcdca96..a656369b6 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_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
@@ -47,19 +47,19 @@
 <template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Connections_05" style="background-image: url('/web_editor/shape/web_editor/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
 <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_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 100%;"></div>
     </xpath>
 </template>
 
@@ -98,10 +98,10 @@
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Connections_05" style="background-image: url('/web_editor/shape/web_editor/Connections/05.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_enark/views/snippets/s_big_number.xml b/theme_enark/views/snippets/s_big_number.xml
index 9b2cd036c..7eb48bc34 100644
--- a/theme_enark/views/snippets/s_big_number.xml
+++ b/theme_enark/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/Rainy/09_001"</attribute>
+        <attribute name="data-oe-shape-data">"shape":"html_builder/Rainy/09_001"</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_Rainy_09_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_09_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_enark/views/snippets/s_features_wall.xml b/theme_enark/views/snippets/s_features_wall.xml
index 1fd45212f..9b396e833 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_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_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_freegrid.xml b/theme_enark/views/snippets/s_freegrid.xml
index d0ac9a0ca..15464dbfc 100644
--- a/theme_enark/views/snippets/s_freegrid.xml
+++ b/theme_enark/views/snippets/s_freegrid.xml
@@ -4,14 +4,14 @@
 <template id="s_freegrid" inherit_id="website.s_freegrid">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','flip':['y'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','flip':['y'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
         <attribute name="class" add="pt128" remove="pt64" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_mode')]" position="attributes">
         <attribute name="data-row-count">17</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container-fluid')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <xpath expr="//div[hasclass('container-fluid')]" position="attributes">
         <attribute name="class" add="container" remove="container-fluid" separator=" "/>
diff --git a/theme_enark/views/snippets/s_wavy_grid.xml b/theme_enark/views/snippets/s_wavy_grid.xml
index 10430bb83..888e5ffac 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_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/02_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_02_001" style="background-image: url('/web_editor/shape/html_builder/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 c3a3806ab..ba701849e 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/Bold/13","colors":{"c5": "o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/15','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -281,10 +281,10 @@
 <template id="s_numbers_grid" inherit_id="website.s_numbers_grid" name="Graphene s_numbers_grid">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 pt96 pb96" remove="o_cc2 pb56 pt56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/01_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/01_001","flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_01_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_01_001"/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[1]" position="attributes">
         <attribute name="class" add="o_cc5 bg-black-50" remove="o_cc1" separator=" "/>
@@ -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/Bold/13','colors':{'c5':'o-color-3'},'flip':['x','y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+    <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-3&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -326,10 +326,10 @@
 <template id="s_picture" inherit_id="website.s_picture" name="Graphene s_picture">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0 pt48" remove="pb64 pt64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/02_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/02_001","flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_02_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_02_001"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -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_001','colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/11_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_11_001" style="background-image: url('/web_editor/shape/html_builder/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=" "/>
@@ -534,10 +534,10 @@
 <template id="s_key_images" inherit_id="website.s_key_images" name="Graphene s_key_images">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0;"/>
     </xpath>
 
     <!-- Texts -->
@@ -577,13 +577,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/Blocks/01_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/01_001"}</attribute>
         <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blocks_01_001"/>
+        <div class="o_we_shape o_html_builder_Blocks_01_001"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_graphene/views/new_page_template.xml b/theme_graphene/views/new_page_template.xml
index b48cae36d..aa2ed8f04 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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":["x","y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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 df0bfd287..c414191b3 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/Bold/14","colors":{"c5":"o-color-3","c1":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-3&amp;c1=o-color-3');"/>
     </xpath>
 </template>
 
@@ -38,11 +38,11 @@
 <template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/03","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -63,11 +63,11 @@
 <template id="new_page_template_basic_s_picture" inherit_id="website.new_page_template_basic_s_picture">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/03","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -88,22 +88,22 @@
 <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_001","colors":{"c5":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/03","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </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_001","colors":{"c5":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_accordion_image.xml b/theme_kea/views/snippets/s_accordion_image.xml
index aa1abb12b..808b6a8ce 100644
--- a/theme_kea/views/snippets/s_accordion_image.xml
+++ b/theme_kea/views/snippets/s_accordion_image.xml
@@ -4,10 +4,10 @@
 <template id="s_accordion_image" inherit_id="website.s_accordion_image">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb128" remove="pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/10','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/10','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_Connections_10" style="background-image: url('/web_editor/shape/web_editor/Connections/10.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_big_number.xml b/theme_kea/views/snippets/s_big_number.xml
index 24f5c3b39..340536d97 100644
--- a/theme_kea/views/snippets/s_big_number.xml
+++ b/theme_kea/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/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/02"}</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_02"/>
+        <div class="o_we_shape o_html_builder_Blobs_02"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_kea/views/snippets/s_cards_grid.xml b/theme_kea/views/snippets/s_cards_grid.xml
index 72bab0d35..6fbbf5ca0 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/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_kea/views/snippets/s_comparisons_horizontal.xml b/theme_kea/views/snippets/s_comparisons_horizontal.xml
index 1ca4c758d..dfbbcf5fe 100644
--- a/theme_kea/views/snippets/s_comparisons_horizontal.xml
+++ b/theme_kea/views/snippets/s_comparisons_horizontal.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/04","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_04"/>
+        <div class="o_we_shape o_html_builder_Floats_04"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_cover.xml b/theme_kea/views/snippets/s_cover.xml
index b5757b740..8cd076aed 100644
--- a/theme_kea/views/snippets/s_cover.xml
+++ b/theme_kea/views/snippets/s_cover.xml
@@ -6,11 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="oe_img_bg o_full_screen_height" remove="parallax s_parallax_is_fixed" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/02','colors':{'c1':'o-color-1','c2':'o-color-1','c3':'o-color-5','c4':'o-color-1','c5':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/02','colors':{'c1':'o-color-1','c2':'o-color-1','c3':'o-color-5','c4':'o-color-1','c5':'o-color-5'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Floats_02" style="background-image: url('/web_editor/shape/web_editor/Floats/02.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-5&amp;c4=o-color-1&amp;c5=o-color-5');"/>
+        <div class="o_we_shape o_html_builder_Floats_02" style="background-image: url('/web_editor/shape/html_builder/Floats/02.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-5&amp;c4=o-color-1&amp;c5=o-color-5');"/>
     </xpath>
     <!-- Disable Parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
diff --git a/theme_kea/views/snippets/s_features_wall.xml b/theme_kea/views/snippets/s_features_wall.xml
index e7a951727..f08738032 100644
--- a/theme_kea/views/snippets/s_features_wall.xml
+++ b/theme_kea/views/snippets/s_features_wall.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/Floats/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/02"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_02 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_02 o_we_animated"/>
     </xpath>
     <!-- Card 1 -->
     <xpath expr="//div[hasclass('g-col-lg-3')]//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 f66a9b8bb..2db9182f0 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_001","colors":{"c5":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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_key_images.xml b/theme_kea/views/snippets/s_key_images.xml
index 12c73a69d..e090d0ba2 100644
--- a/theme_kea/views/snippets/s_key_images.xml
+++ b/theme_kea/views/snippets/s_key_images.xml
@@ -4,10 +4,10 @@
 <template id="s_key_images" inherit_id="website.s_key_images">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/02','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/02','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_02"/>
+        <div class="o_we_shape o_html_builder_Blobs_02"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kea/views/snippets/s_media_list.xml b/theme_kea/views/snippets/s_media_list.xml
index 31e794d3f..2b8939e49 100644
--- a/theme_kea/views/snippets/s_media_list.xml
+++ b/theme_kea/views/snippets/s_media_list.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/01","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_01"/>
+        <div class="o_we_shape o_html_builder_Floats_01"/>
     </xpath>
     <!-- Row 1 -->
     <xpath expr="(//div[hasclass('row')])[2]" position="attributes">
diff --git a/theme_kea/views/snippets/s_motto.xml b/theme_kea/views/snippets/s_motto.xml
index 6acd8c988..2e8923501 100644
--- a/theme_kea/views/snippets/s_motto.xml
+++ b/theme_kea/views/snippets/s_motto.xml
@@ -4,10 +4,10 @@
 <template id="s_motto" inherit_id="website.s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_numbers_boxed.xml b/theme_kea/views/snippets/s_numbers_boxed.xml
index ca49830a3..bef564e26 100644
--- a/theme_kea/views/snippets/s_numbers_boxed.xml
+++ b/theme_kea/views/snippets/s_numbers_boxed.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/02','flip':[],'showOnMobile':false}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/02','flip':[],'showOnMobile':false}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_02"/>
+        <div class="o_we_shape o_html_builder_Blobs_02"/>
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
diff --git a/theme_kea/views/snippets/s_picture.xml b/theme_kea/views/snippets/s_picture.xml
index 74c36b2e2..1d9124429 100644
--- a/theme_kea/views/snippets/s_picture.xml
+++ b/theme_kea/views/snippets/s_picture.xml
@@ -32,11 +32,11 @@
 <template id="configurator_s_picture" inherit_id="website.configurator_s_picture">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/03","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/03","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_03" style="background-image: url('/web_editor/shape/web_editor/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_03" style="background-image: url('/web_editor/shape/html_builder/Wavy/03.svg?c1=o-color-1&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_pricelist_boxed.xml b/theme_kea/views/snippets/s_pricelist_boxed.xml
index a8a1ff59e..2847df430 100644
--- a/theme_kea/views/snippets/s_pricelist_boxed.xml
+++ b/theme_kea/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/Floats/01','colors':{'c1':'o-color-1','c2':'o-color-1','c3':'o-color-1','c4':'o-color-1','c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/01','colors':{'c1':'o-color-1','c2':'o-color-1','c3':'o-color-1','c4':'o-color-1','c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_01 o_we_animated" style="background-image: url('/web_editor/shape/web_editor/Floats/01.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-1&amp;c4=o-color-1&amp;c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Floats_01 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/Floats/01.svg?c1=o-color-1&amp;c2=o-color-1&amp;c3=o-color-1&amp;c4=o-color-1&amp;c5=o-color-1');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_kea/views/snippets/s_quotes_carousel_minimal.xml b/theme_kea/views/snippets/s_quotes_carousel_minimal.xml
index e894e14e0..aefa8dc6c 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_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_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 0c03b8ea3..0e1683e2a 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_001","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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 57c293095..3132261ba 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_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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 5b76fdcb5..5ac2691f4 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/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/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/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-4"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/22_001","colors":{"c5":"o-color-4"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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/Containers/05","colors":{"c5":"o-color-2"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/Containers/05.svg?c5=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
@@ -104,11 +104,11 @@
 <template id="new_page_template_about_s_three_columns" inherit_id="website.new_page_template_about_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </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_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/22_001","colors":{"c5":"o-color-3"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -180,22 +180,22 @@
 <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/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
 <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/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </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_001","colors":{"c5":"o-color-4"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/22_001","colors":{"c5":"o-color-4"},"flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-4&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -353,11 +353,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/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;c4=rgba%280%2C%200%2C%200%2C%200%29&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_banner.xml b/theme_kiddo/views/snippets/s_banner.xml
index 9c2c6835e..3b8bd7b3d 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_001','colors':{'c5':'o-color-3'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/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_001","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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_big_number.xml b/theme_kiddo/views/snippets/s_big_number.xml
index dffa5a4b8..d686bf636 100644
--- a/theme_kiddo/views/snippets/s_big_number.xml
+++ b/theme_kiddo/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/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/02"}</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_02"/>
+        <div class="o_we_shape o_html_builder_Blobs_02"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_kiddo/views/snippets/s_call_to_action.xml b/theme_kiddo/views/snippets/s_call_to_action.xml
index d57eda4c4..8deaf0a6c 100644
--- a/theme_kiddo/views/snippets/s_call_to_action.xml
+++ b/theme_kiddo/views/snippets/s_call_to_action.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2 pt152 pb152 o_colored_level" remove="pt64 pb64 o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/14"}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_14"/>
+        <div class="o_we_shape o_html_builder_Floats_14"/>
     </xpath>
 
     <!-- Paragraph -->
diff --git a/theme_kiddo/views/snippets/s_cards_grid.xml b/theme_kiddo/views/snippets/s_cards_grid.xml
index 2237e2415..1beb0483e 100644
--- a/theme_kiddo/views/snippets/s_cards_grid.xml
+++ b/theme_kiddo/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/Floats/5','flip':[],'showOnMobile':false,'animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/5','flip':[],'showOnMobile':false,'animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_05 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_05 o_we_animated"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_kiddo/views/snippets/s_company_team_shapes.xml b/theme_kiddo/views/snippets/s_company_team_shapes.xml
index ac0c977b0..bdab2bb13 100644
--- a/theme_kiddo/views/snippets/s_company_team_shapes.xml
+++ b/theme_kiddo/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="pb128" remove="pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/10','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/10','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_Connections_10" style="background-image: url('/web_editor/shape/web_editor/Connections/10.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_cover.xml b/theme_kiddo/views/snippets/s_cover.xml
index 8d7604e8f..bea71406c 100644
--- a/theme_kiddo/views/snippets/s_cover.xml
+++ b/theme_kiddo/views/snippets/s_cover.xml
@@ -5,7 +5,7 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_full_screen_height o_cc1" remove="bg-black-50 o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/14"}</attribute>
     </xpath>
 
     <!-- Filter -->
@@ -15,7 +15,7 @@
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_14"/>
+        <div class="o_we_shape o_html_builder_Floats_14"/>
     </xpath>
 
     <!-- Heading -->
diff --git a/theme_kiddo/views/snippets/s_features_wall.xml b/theme_kiddo/views/snippets/s_features_wall.xml
index cc16aa06c..4d58d078c 100644
--- a/theme_kiddo/views/snippets/s_features_wall.xml
+++ b/theme_kiddo/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/Floats/05"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/05"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_05 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_05 o_we_animated"/>
     </xpath>
     <!-- Card 1 -->
     <xpath expr="//div[hasclass('g-col-lg-3')]//h3" position="replace" mode="inner">
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
index 0b35e7cc9..6d6b2920b 100644
--- a/theme_kiddo/views/snippets/s_image_text.xml
+++ b/theme_kiddo/views/snippets/s_image_text.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2 pb64 pt64" remove="pb80 pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/13","flip":["x"]}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Title & Paragraphs -->
diff --git a/theme_kiddo/views/snippets/s_image_title.xml b/theme_kiddo/views/snippets/s_image_title.xml
index e67d2c814..f0521edc4 100644
--- a/theme_kiddo/views/snippets/s_image_title.xml
+++ b/theme_kiddo/views/snippets/s_image_title.xml
@@ -3,10 +3,10 @@
 
 <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/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_12 o_we_animated"/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         A Deep Dive into Play and Learning
diff --git a/theme_kiddo/views/snippets/s_key_images.xml b/theme_kiddo/views/snippets/s_key_images.xml
index 208a01991..66e338943 100644
--- a/theme_kiddo/views/snippets/s_key_images.xml
+++ b/theme_kiddo/views/snippets/s_key_images.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/Floats/13','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/13','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_13 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kiddo/views/snippets/s_motto.xml b/theme_kiddo/views/snippets/s_motto.xml
index 6acd8c988..2e8923501 100644
--- a/theme_kiddo/views/snippets/s_motto.xml
+++ b/theme_kiddo/views/snippets/s_motto.xml
@@ -4,10 +4,10 @@
 <template id="s_motto" inherit_id="website.s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_numbers_showcase.xml b/theme_kiddo/views/snippets/s_numbers_showcase.xml
index c827a996c..54255cda0 100644
--- a/theme_kiddo/views/snippets/s_numbers_showcase.xml
+++ b/theme_kiddo/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/Floats/13','flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/13','flip':[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_13 o_we_animated"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_pricelist_boxed.xml b/theme_kiddo/views/snippets/s_pricelist_boxed.xml
index 3e902c41b..c96e57d0a 100644
--- a/theme_kiddo/views/snippets/s_pricelist_boxed.xml
+++ b/theme_kiddo/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_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Rainy/06','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Rainy/06','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_06"/>
+        <div class="o_we_shape o_html_builder_Rainy_06"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml b/theme_kiddo/views/snippets/s_quotes_carousel_minimal.xml
index 6adaf5da6..b0011b517 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_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-3');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_kiddo/views/snippets/s_text_image.xml b/theme_kiddo/views/snippets/s_text_image.xml
index c3dd86d71..0f7e8b237 100644
--- a/theme_kiddo/views/snippets/s_text_image.xml
+++ b/theme_kiddo/views/snippets/s_text_image.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb64 pt64" remove="pb80 pt80" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/13","flip":["y"]}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 
     <!-- Separator -->
diff --git a/theme_kiddo/views/snippets/s_three_columns.xml b/theme_kiddo/views/snippets/s_three_columns.xml
index 241784e74..647df5748 100644
--- a/theme_kiddo/views/snippets/s_three_columns.xml
+++ b/theme_kiddo/views/snippets/s_three_columns.xml
@@ -122,12 +122,12 @@
 <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/Connections/06','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','colors':{'c5':'o-color-3'},'flip':['y'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_06 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_wavy_grid.xml b/theme_kiddo/views/snippets/s_wavy_grid.xml
index e091961a7..fdc874b35 100644
--- a/theme_kiddo/views/snippets/s_wavy_grid.xml
+++ b/theme_kiddo/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/Floats/02','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/02','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_02 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_02 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_loftspace/views/new_page_template.xml b/theme_loftspace/views/new_page_template.xml
index 22911e9b2..63c7e186b 100644
--- a/theme_loftspace/views/new_page_template.xml
+++ b/theme_loftspace/views/new_page_template.xml
@@ -43,44 +43,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_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"rgba(0,0,0,0.25)","c3":"o-color-5"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002" style="background-image: url('/web_editor/shape/html_builder/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 4441b2d69..c3c6c6707 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/17","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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 d43675226..387ede3c3 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/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Grids_02" style="background-image: url('/web_editor/shape/web_editor/Grids/02.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/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/Grids/02",'colors':{'c5':'rgba(0,0,0,0.25)'},'flip':['x']}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Grids_02" style="background-image: url('/web_editor/shape/html_builder/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 601faedb3..d6e459a34 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/12_002','colors':{'c5':'o-color-1','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/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 965399ffd..a3222f18d 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_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/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 611e1d6f7..c9ac94f3c 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/12_002","colors":{"c5":"o-color-1","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_product_catalog.xml b/theme_loftspace/views/snippets/s_product_catalog.xml
index 826e71fe7..17d971bfc 100644
--- a/theme_loftspace/views/snippets/s_product_catalog.xml
+++ b/theme_loftspace/views/snippets/s_product_catalog.xml
@@ -5,12 +5,12 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt64 pb64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/09","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_Floats_09"/>
+        <div class="o_we_shape o_html_builder_Floats_09"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_text_image.xml b/theme_loftspace/views/snippets/s_text_image.xml
index 548c6a4f1..1349b7dd1 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_001","colors":{"c5":"rgba(0,0,0,0.25)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/10_001.svg?c5=rgba(0,0,0,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/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 1ba5fc9ba..df105a502 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_001','colors':{'c5':'o-color-1'},'flip':["y"],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_10_001" style="background-image: url('/web_editor/shape/html_builder/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 8e1f8bfd6..d8ef9dbeb 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/Bold/14","colors":{"c5":"o-color-1","c1":"o-color-5"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/08_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/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=" "/>
@@ -301,10 +301,10 @@
 <template id="s_quotes_carousel_minimal" inherit_id="website.s_quotes_carousel_minimal" name="Monglia s_quotes_carousel_minimal">
     <!-- Layout -->
     <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','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_Floats_09 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_09 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
@@ -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/Bold/14","colors":{"c5":"o-color-4","c1":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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/21','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_21"/>
+        <div class="o_we_shape o_html_builder_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/01_001','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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/18','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_18" style="background-image: url('/web_editor/shape/web_editor/Bold/18.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_18" style="background-image: url('/web_editor/shape/html_builder/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_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001"/>
     </xpath>
     <xpath expr="//h3" position="attributes">
         <attribute name="class" add="h4-fs" remove="h5-fs" separator=" "/>
diff --git a/theme_monglia/views/new_page_template.xml b/theme_monglia/views/new_page_template.xml
index 2d05979d2..ee0d69d7e 100644
--- a/theme_monglia/views/new_page_template.xml
+++ b/theme_monglia/views/new_page_template.xml
@@ -19,10 +19,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/Blocks/04","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04"></div>
+        <div class="o_we_shape o_html_builder_Blocks_04"></div>
     </xpath>
 </template>
 
@@ -84,10 +84,10 @@
     <xpath expr="//section" position="attributes">
         <!-- pt56 added by both theme and new page template -->
         <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -110,10 +110,10 @@
     <xpath expr="//section" position="attributes">
         <!-- pt56 is added by both theme and new page template -->
         <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -169,10 +169,10 @@
 <template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blocks_04 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/html_builder/Blocks/04.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -204,11 +204,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt56 pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/13","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
+        <div class="o_we_shape o_html_builder_Floats_13" style="background-image: url('/web_editor/shape/html_builder/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=y'); background-position: 50% 50%;"/>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/new_page_template.xml b/theme_nano/views/new_page_template.xml
index 80341dbd3..7058cd210 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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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/25","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/25","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_25" style="background-image: url('/web_editor/shape/html_builder/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 72b923364..ad631810a 100644
--- a/theme_nano/views/snippets/s_big_number.xml
+++ b/theme_nano/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/Bold/20','colors':{'c5':'o-color-1','c1':'o-color-1'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_20" style="background-image: url('/web_editor/shape/web_editor/Bold/20.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_20" style="background-image: url('/web_editor/shape/html_builder/Bold/20.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_nano/views/snippets/s_features.xml b/theme_nano/views/snippets/s_features.xml
index 982a75118..54f0900e1 100644
--- a/theme_nano/views/snippets/s_features.xml
+++ b/theme_nano/views/snippets/s_features.xml
@@ -5,10 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt40 pb48 o_cc o_cc5" remove="pt64 pb64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12"}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//div[hasclass('row')]/div[1]/div/h3" position="replace" mode="inner">
diff --git a/theme_nano/views/snippets/s_numbers_showcase.xml b/theme_nano/views/snippets/s_numbers_showcase.xml
index 098201c10..658bf1828 100644
--- a/theme_nano/views/snippets/s_numbers_showcase.xml
+++ b/theme_nano/views/snippets/s_numbers_showcase.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Zigs/01_001','flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Zigs/01_001','flip':[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Zigs_01_001 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Zigs_01_001 o_we_animated"/>
     </xpath>
     <!-- Grid items -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
diff --git a/theme_notes/views/new_page_template.xml b/theme_notes/views/new_page_template.xml
index eb86e0d25..b97c06426 100644
--- a/theme_notes/views/new_page_template.xml
+++ b/theme_notes/views/new_page_template.xml
@@ -14,27 +14,27 @@
 <template id="new_page_template_s_carousel" inherit_id="website.new_page_template_s_carousel">
     <!-- Slide #1 - Shape option -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Slide #1 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_10" style="background-image: url('/web_editor/shape/web_editor/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Slide #2 - Shape option -->
     <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":[]}</attribute>
     </xpath>
     <!-- Slide #2 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_10" style="background-image: url('/web_editor/shape/web_editor/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
     <!-- Slide #3 - Shape option -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/10","colors":{"c1": "o-color-2","c2":"o-color-2"},"flip":["y"]}</attribute>
     </xpath>
     <!-- Slide #3 - Shape -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_10" style="background-image: url('/web_editor/shape/web_editor/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2&amp;flip=y'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -91,11 +91,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/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
@@ -178,11 +178,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/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
@@ -215,11 +215,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/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
@@ -250,11 +250,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/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_banner.xml b/theme_notes/views/snippets/s_banner.xml
index 42a664bb8..48611189b 100644
--- a/theme_notes/views/snippets/s_banner.xml
+++ b/theme_notes/views/snippets/s_banner.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/Floats/08","flip":["x","y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/08","flip":["x","y"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
+        <div class="o_we_shape o_html_builder_Floats_08" style="background-image: url('/web_editor/shape/html_builder/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_notes/views/snippets/s_big_number.xml b/theme_notes/views/snippets/s_big_number.xml
index 5c1007bec..5583eb82f 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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Blobs/04_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_04_001" style="background-image: url('/web_editor/shape/html_builder/Blobs/04_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_notes/views/snippets/s_company_team.xml b/theme_notes/views/snippets/s_company_team.xml
index e065b5151..755f00c15 100644
--- a/theme_notes/views/snippets/s_company_team.xml
+++ b/theme_notes/views/snippets/s_company_team.xml
@@ -43,11 +43,11 @@
 <template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/10","colors":{"c5":"o-color-1"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/10","colors":{"c5":"o-color-1"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_10" style="background-image: url('/web_editor/shape/web_editor/Connections/10.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Connections_10" style="background-image: url('/web_editor/shape/html_builder/Connections/10.svg?c5=o-color-1');"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_company_team_shapes.xml b/theme_notes/views/snippets/s_company_team_shapes.xml
index 401dee541..70f20e8c1 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 pb104" remove="o_cc2 pt48 pb48" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-1');"></div>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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_comparisons.xml b/theme_notes/views/snippets/s_comparisons.xml
index 6097820c3..82da3fc5a 100644
--- a/theme_notes/views/snippets/s_comparisons.xml
+++ b/theme_notes/views/snippets/s_comparisons.xml
@@ -4,11 +4,11 @@
 <template id="s_comparisons" inherit_id="website.s_comparisons">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/05","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_05"/>
+        <div class="o_we_shape o_html_builder_Floats_05"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_image_gallery.xml b/theme_notes/views/snippets/s_image_gallery.xml
index 265d987a7..f00ace054 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/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'showOnMobile':false,'shapeAnimationSpeed':'0'}"/>
+        <attribute name="data-oe-shape-data" add="{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 8428b5263..40d4147fd 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/Bold/13','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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 92e76dfae..66b79eca8 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_001","colors":{"c5":"o-color-1"},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/11_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/11_001.svg?c5=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_notes/views/snippets/s_parallax.xml b/theme_notes/views/snippets/s_parallax.xml
index 0f3756395..175d7f368 100644
--- a/theme_notes/views/snippets/s_parallax.xml
+++ b/theme_notes/views/snippets/s_parallax.xml
@@ -4,11 +4,11 @@
 <template id="s_parallax" inherit_id="website.s_parallax">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/08_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_08_001"/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_pricelist_boxed.xml b/theme_notes/views/snippets/s_pricelist_boxed.xml
index d2579e10d..5aa38682f 100644
--- a/theme_notes/views/snippets/s_pricelist_boxed.xml
+++ b/theme_notes/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/Rainy/08_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Rainy/08_001','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Rainy_08_001 o_we_animated"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_notes/views/snippets/s_pricelist_cafe.xml b/theme_notes/views/snippets/s_pricelist_cafe.xml
index 87e34683f..2b853d680 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/Bold/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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/Bold/16.svg?c5=o-color-2');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/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_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
index 2cf5b32ec..f254b1d3d 100644
--- a/theme_notes/views/snippets/s_product_catalog.xml
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -5,14 +5,14 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc3 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb64 pt64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","colors":{"c1":"o-color-2","c2":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/10","colors":{"c1":"o-color-2","c2":"o-color-2"},"flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
     <!-- Shape & Background image -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Wavy_10" style="background-image: url('/web_editor/shape/web_editor/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-2&amp;c2=o-color-2');"/>
     </xpath>
     <!-- Title & subtitles -->
     <xpath expr="//h2" position="replace">
diff --git a/theme_notes/views/snippets/s_quotes_carousel_minimal.xml b/theme_notes/views/snippets/s_quotes_carousel_minimal.xml
index 7ce75596b..29db831a1 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_002','colors':{'c5':'o-color-3','c3':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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');"/>
+        <div class="o_we_shape o_html_builder_Airy_13_002 o_we_animated" style="background-image: url('/web_editor/shape/html_builder/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 013b5018c..06330f4bf 100644
--- a/theme_notes/views/snippets/s_text_image.xml
+++ b/theme_notes/views/snippets/s_text_image.xml
@@ -5,10 +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_001","colors":{"c5":"o-color-1"},"flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_11_001" style="background-image: url('/web_editor/shape/html_builder/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 aede8ffde..6f31b7900 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/Bold/15','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_15 bg-o-color-1" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-4');"></div>
+        <div class="o_we_shape o_html_builder_Bold_15 bg-o-color-1" style="background-image: url('/web_editor/shape/html_builder/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_notes/views/snippets/s_wavy_grid.xml b/theme_notes/views/snippets/s_wavy_grid.xml
index a56884c77..f1377cfad 100644
--- a/theme_notes/views/snippets/s_wavy_grid.xml
+++ b/theme_notes/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/Wavy/10','colors':{'c1':'o-color-1','c2':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Wavy/10','colors':{'c1':'o-color-1','c2':'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_Wavy_10" style="background-image: url('/web_editor/shape/web_editor/Wavy/10.svg?c1=o-color-1&amp;c2=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Wavy_10" style="background-image: url('/web_editor/shape/html_builder/Wavy/10.svg?c1=o-color-1&amp;c2=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_odoo_experts/views/new_page_template.xml b/theme_odoo_experts/views/new_page_template.xml
index 329366260..712665b1f 100644
--- a/theme_odoo_experts/views/new_page_template.xml
+++ b/theme_odoo_experts/views/new_page_template.xml
@@ -14,22 +14,22 @@
 <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/Wavy/04","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04"/>
+        <div class="o_we_shape o_html_builder_Wavy_04"/>
     </xpath>
 </template>
 
 <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/Containers/05","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Containers_05" style="background-image: url('/web_editor/shape/web_editor/Containers/05.svg?c5=o-color-4')"/>
+        <div class="o_we_shape o_html_builder_Containers_05" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-3"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_08_001" style="background-image: url('/web_editor/shape/html_builder/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_comparisons.xml b/theme_odoo_experts/views/snippets/s_comparisons.xml
index 40ca05b67..d317aedca 100644
--- a/theme_odoo_experts/views/snippets/s_comparisons.xml
+++ b/theme_odoo_experts/views/snippets/s_comparisons.xml
@@ -25,11 +25,11 @@
 <template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04"/>
+        <div class="o_we_shape o_html_builder_Wavy_04"/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_cta_box.xml b/theme_odoo_experts/views/snippets/s_cta_box.xml
index 9d44bbcbe..5ee09b1e6 100644
--- a/theme_odoo_experts/views/snippets/s_cta_box.xml
+++ b/theme_odoo_experts/views/snippets/s_cta_box.xml
@@ -4,11 +4,11 @@
 <template id="s_cta_box" inherit_id="website.s_cta_box">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt0 pb120" remove="pt80 pb80" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5': 'o-color-4'}, 'flip':['y'], 'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-4'}, 'flip':['y'], 'showOnMobile':true}</attribute>
     </xpath>
 
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Card -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
diff --git a/theme_odoo_experts/views/snippets/s_image_title.xml b/theme_odoo_experts/views/snippets/s_image_title.xml
index 25341fabb..d8f1c9213 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/Bold/26','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-3');"></div>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/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 0a46f2674..5577e311c 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/Bold/14','colors':{'c5':'o-color-1','c1':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/Bold/14.svg?c5=o-color-1&amp;c1=o-color-1');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml b/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml
index 6e346930c..558608770 100644
--- a/theme_odoo_experts/views/snippets/s_pricelist_boxed.xml
+++ b/theme_odoo_experts/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/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','colors':{'c5': 'o-color-3'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-3&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
 
diff --git a/theme_odoo_experts/views/snippets/s_product_catalog.xml b/theme_odoo_experts/views/snippets/s_product_catalog.xml
index aff0894b5..2d7baeca1 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/12_002","colors":{"c5":"o-color-1","c3":"rgba(255,255,255,0)"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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)');"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/Airy/12_002.svg?c5=o-color-1&amp;c3=rgba(255,255,255,0)');"/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_three_columns.xml b/theme_odoo_experts/views/snippets/s_three_columns.xml
index a044286b6..a86e20ab8 100644
--- a/theme_odoo_experts/views/snippets/s_three_columns.xml
+++ b/theme_odoo_experts/views/snippets/s_three_columns.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 pb72" remove="pt32 pb32" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/04","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_04"/>
+        <div class="o_we_shape o_html_builder_Floats_04"/>
     </xpath>
     <!-- Card #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
diff --git a/theme_odoo_experts/views/snippets/s_wavy_grid.xml b/theme_odoo_experts/views/snippets/s_wavy_grid.xml
index 6b0bb14fa..713aa3e41 100644
--- a/theme_odoo_experts/views/snippets/s_wavy_grid.xml
+++ b/theme_odoo_experts/views/snippets/s_wavy_grid.xml
@@ -4,10 +4,10 @@
 <template id="s_wavy_grid" inherit_id="website.s_wavy_grid">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/20','colors':{'c5':'o-color-1'},'flip':['y'],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/20','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_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/new_page_template.xml b/theme_orchid/views/new_page_template.xml
index 4a24f2d5f..083433290 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/22_001","colors":{"c5":"o-color-1"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-1&amp;flip=y'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 
@@ -55,11 +55,11 @@
 <template id="new_page_template_basic_s_image_text" inherit_id="website.new_page_template_basic_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -68,33 +68,33 @@
 <template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/16","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
 <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_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -108,11 +108,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb56" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -181,11 +181,11 @@
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </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_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
@@ -235,22 +235,22 @@
 <template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_gallery_s_image_text" inherit_id="website.new_page_template_gallery_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -265,11 +265,11 @@
 <template id="new_page_template_services_s_image_text" inherit_id="website.new_page_template_services_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </xpath>
 </template>
 
@@ -284,22 +284,22 @@
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/16","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_16" style="background-image: url('/web_editor/shape/web_editor/Connections/16.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_16" style="background-image: url('/web_editor/shape/html_builder/Connections/16.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_s_image_text" inherit_id="website.new_page_template_pricing_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_04" style="background-image: url('/web_editor/shape/web_editor/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
+        <div class="o_we_shape o_html_builder_Wavy_04" style="background-image: url('/web_editor/shape/html_builder/Wavy/04.svg?c1=o-color-1&amp;c5=o-color-1&amp;flip=x'); background-position: 50% 100%;"/>
     </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_001","colors":{"c5":"o-color-2"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/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 a83fa2cf7..2899fadcf 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/17","colors":{"c5": "o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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 b2178d034..1f40ea1d7 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/16','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_16" style="background-image: url('/web_editor/shape/web_editor/Airy/16.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Airy_16" style="background-image: url('/web_editor/shape/html_builder/Airy/16.svg?c5=o-color-2');"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_framed_intro.xml b/theme_orchid/views/snippets/s_framed_intro.xml
index e73dddd45..984ac70c7 100644
--- a/theme_orchid/views/snippets/s_framed_intro.xml
+++ b/theme_orchid/views/snippets/s_framed_intro.xml
@@ -4,12 +4,12 @@
 <template id="s_framed_intro" inherit_id="website.s_framed_intro">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/03','showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/03','showOnMobile':true}</attribute>
         <attribute name="class" add="o_cc5" remove="" separator=" "/>
     </xpath>
      <!-- Section Shape -->
     <xpath expr="//section//div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_03 o_shape_show_mobile"/>
+        <div class="o_we_shape o_html_builder_Blobs_03 o_shape_show_mobile"/>
     </xpath>
     <!-- Subtitle -->
     <xpath expr="//h1" position="before">
diff --git a/theme_orchid/views/snippets/s_freegrid.xml b/theme_orchid/views/snippets/s_freegrid.xml
index d20f36ed6..4da7a5167 100644
--- a/theme_orchid/views/snippets/s_freegrid.xml
+++ b/theme_orchid/views/snippets/s_freegrid.xml
@@ -19,12 +19,12 @@
 <template id="configurator_s_freegrid" inherit_id="website.configurator_s_freegrid">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blobs/03','colors':{'c2':'o-color-2'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blobs/03','colors':{'c2':'o-color-2'},'flip':['x'],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
         <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
     </xpath>
      <!-- Section Shape -->
     <xpath expr="//section//div" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_03 o_shape_show_mobile" style="background-image: url('/web_editor/shape/web_editor%2FBlobs%2F03.svg?c2=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
+        <div class="o_we_shape o_html_builder_Blobs_03 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder%2FBlobs%2F03.svg?c2=o-color-2&amp;flip=x'); background-position: 50% 0%;"/>
     </xpath>
 </template>
 </odoo>
diff --git a/theme_orchid/views/snippets/s_image_text_overlap.xml b/theme_orchid/views/snippets/s_image_text_overlap.xml
index 33b2d1c51..a4d64e6d6 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/Bold/16','flip':[],'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_16 o_shape_show_mobile"/>
+        <div class="o_we_shape o_html_builder_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_kickoff.xml b/theme_orchid/views/snippets/s_kickoff.xml
index 40a3221d6..5cc69ebf2 100644
--- a/theme_orchid/views/snippets/s_kickoff.xml
+++ b/theme_orchid/views/snippets/s_kickoff.xml
@@ -6,12 +6,12 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="oe_img_bg" remove="parallax s_parallax_is_fixed" separator=" "/>
         <attribute name="style" add="background-image: url('/web/image/website.s_kickoff_default_image'); background-position: 100% 100%;" separator=";"/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/06','colors':{'c5':'o-color-3'},'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/06','colors':{'c5':'o-color-3'},'showOnMobile':true}</attribute>
     </xpath>
 
     <!-- Refine shape's colors -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="style">background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');</attribute>
+        <attribute name="style">background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');</attribute>
     </xpath>
 
     <!-- Remove the parallax effect: the background image has been already set in the main <section> tag -->
diff --git a/theme_orchid/views/snippets/s_motto.xml b/theme_orchid/views/snippets/s_motto.xml
index 6acd8c988..2e8923501 100644
--- a/theme_orchid/views/snippets/s_motto.xml
+++ b/theme_orchid/views/snippets/s_motto.xml
@@ -4,10 +4,10 @@
 <template id="s_motto" inherit_id="website.s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_numbers.xml b/theme_orchid/views/snippets/s_numbers.xml
index 01f5b3c5a..794132d91 100644
--- a/theme_orchid/views/snippets/s_numbers.xml
+++ b/theme_orchid/views/snippets/s_numbers.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc1" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
diff --git a/theme_orchid/views/snippets/s_numbers_showcase.xml b/theme_orchid/views/snippets/s_numbers_showcase.xml
index bbfa270d3..be48a46e5 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/17','colors':{'c5':'o-color-3'},'flip':[]}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_17" style="background-image: url('/web_editor/shape/web_editor/Blobs/17.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/web_editor/shape/html_builder/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 396c6c7e2..54e7d1f4e 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_001','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/06_001.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Airy_06_001" style="background-image: url('/web_editor/shape/html_builder/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 df9d3f8d7..a99637f3f 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/Bold/14','colors':{'c5':'o-color-5','c1':'o-color-5'},'flip':['x'],'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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>
+        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/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 f2ffd58f5..ebefa5368 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/Bold/14','colors':{'c5':'o-color-3','c1':'o-color-5'},'showOnMobile':true,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Bold_14 o_shape_show_mobile" style="background-image: url('/web_editor/shape/html_builder/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 1e63e03e6..35604d152 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -136,10 +136,10 @@
 <template id="s_motto" inherit_id="website.s_motto" name="Paptic s_motto">
     <!-- Shape -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','showOnMobile':false, 'animated': true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','showOnMobile':false, 'animated': true}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="attributes">
-        <attribute name="class" remove="o_web_editor_Floats_07" add="o_web_editor_Floats_09" separator=" "/>
+        <attribute name="class" remove="o_html_builder_Floats_07" add="o_html_builder_Floats_09" separator=" "/>
     </xpath>
 </template>
 
@@ -326,11 +326,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_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/06_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blobs_06_001"/>
+        <div class="o_we_shape o_html_builder_Blobs_06_001"/>
     </xpath>
 </template>
 
@@ -497,10 +497,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/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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=" "/>
@@ -601,10 +601,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/Bold/13','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_13" style="background-image: url('/web_editor/shape/web_editor/Bold/13.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
@@ -667,13 +667,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/Wavy/18"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/18"}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Wavy_18"/>
+        <div class="o_we_shape o_html_builder_Wavy_18"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_paptic/views/new_page_template.xml b/theme_paptic/views/new_page_template.xml
index ac54cda4f..63e88ac04 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_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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_002","colors":{"c5":"o-color-5","c3":"o-color-4"},"flip":["y"]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_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%;"/>
+        <div class="o_we_shape o_html_builder_Airy_12_002" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <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');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/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/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Bold/13","colors":{"c5":"o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
-        <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');"/>
+        <div class="o_we_shape o_html_builder_Bold_13" style="background-image: url('/web_editor/shape/html_builder/Bold/13.svg?c5=o-color-4');"/>
     </xpath>
     <xpath expr="//h2" position="replace"/>
 </template>
diff --git a/theme_real_estate/views/snippets/s_big_number.xml b/theme_real_estate/views/snippets/s_big_number.xml
index 0730e40ba..ffd525949 100644
--- a/theme_real_estate/views/snippets/s_big_number.xml
+++ b/theme_real_estate/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/Wavy/03"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Wavy/03"}</attribute>
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Wavy_03"/>
+        <div class="o_we_shape o_html_builder_Wavy_03"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_real_estate/views/snippets/s_pricelist_boxed.xml b/theme_real_estate/views/snippets/s_pricelist_boxed.xml
index 95910c0df..f26b1b79d 100644
--- a/theme_real_estate/views/snippets/s_pricelist_boxed.xml
+++ b/theme_real_estate/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_cc2" remove="parallax s_parallax_is_fixed s_parallax_no_overflow_hidden" separator=" "/>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Blocks/04','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Blocks/04','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Blocks_04"/>
+        <div class="o_we_shape o_html_builder_Blocks_04"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" remove="rounded" separator=" "/>
diff --git a/theme_real_estate/views/snippets/s_title.xml b/theme_real_estate/views/snippets/s_title.xml
index 7110d13c3..b24ac3b11 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_001','colors':{'c5':'rgba(255,255,255,0.25)'},'showOnMobile':true}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/07_001.svg?c5=rgba(255,255,255,0.25)');"/>
+        <div class="o_we_shape o_html_builder_Airy_07_001" style="background-image: url('/web_editor/shape/html_builder/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 43b3be819..9c1663ed7 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/Bold/26','colors':{'c5':'o-color-4'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/Bold/26.svg?c5=o-color-4');"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_treehouse/views/snippets/s_banner.xml b/theme_treehouse/views/snippets/s_banner.xml
index 022efbf71..e8a24428f 100644
--- a/theme_treehouse/views/snippets/s_banner.xml
+++ b/theme_treehouse/views/snippets/s_banner.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/Floats/12"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_treehouse/views/snippets/s_call_to_action.xml b/theme_treehouse/views/snippets/s_call_to_action.xml
index 8a755981c..d71419734 100644
--- a/theme_treehouse/views/snippets/s_call_to_action.xml
+++ b/theme_treehouse/views/snippets/s_call_to_action.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 pb48" remove="pt64 pb64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/08_001"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_08_001"/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//div[hasclass('row')]/*[1]" position="attributes">
diff --git a/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml b/theme_treehouse/views/snippets/s_quotes_carousel_minimal.xml
index 3bbca102a..5e7f479d5 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/Bold/15','colors':{'c5':'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/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 34b9b0350..e847bbab3 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_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Wavy/22_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Wavy_22_001" style="background-image: url('/web_editor/shape/html_builder/Wavy/22_001.svg?c5=o-color-2');"/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_treehouse/views/snippets/s_wavy_grid.xml b/theme_treehouse/views/snippets/s_wavy_grid.xml
index a4d372ba7..0ef002f65 100644
--- a/theme_treehouse/views/snippets/s_wavy_grid.xml
+++ b/theme_treehouse/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/Floats/09','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_09 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_09 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 578c6d2da..079160bea 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -172,11 +172,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt96" remove="pt64" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/09","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_09"/>
+        <div class="o_we_shape o_html_builder_Floats_09"/>
     </xpath>
     <!-- Content -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -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/01_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/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/Bold/26','colors':{'c5': 'o-color-3'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_26" style="background-image: url('/web_editor/shape/web_editor/Bold/26.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_26" style="background-image: url('/web_editor/shape/html_builder/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 291a54995..862483a09 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/Bold/15","colors":{"c5":"o-color-3"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_Bold_15" style="background-image: url('/web_editor/shape/web_editor/Bold/15.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Bold_15" style="background-image: url('/web_editor/shape/html_builder/Bold/15.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -65,11 +65,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/09_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_09_001"/>
     </xpath>
 </template>
 
@@ -83,11 +83,11 @@
 <template id="new_page_template_about_map_s_numbers" inherit_id="website.new_page_template_about_map_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Rainy/09_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
+        <div class="o_we_shape o_html_builder_Rainy_09_001"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/new_page_template.xml b/theme_yes/views/new_page_template.xml
index 939865c07..9bcde4025 100644
--- a/theme_yes/views/new_page_template.xml
+++ b/theme_yes/views/new_page_template.xml
@@ -69,22 +69,22 @@
 <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/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_company_team" inherit_id="website.new_page_template_about_s_company_team">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -92,11 +92,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/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -155,11 +155,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/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -167,11 +167,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -191,11 +191,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -204,11 +204,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/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-3"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-3');"/>
     </xpath>
 </template>
 
@@ -216,11 +216,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -238,11 +238,11 @@
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -257,11 +257,11 @@
 <template id="new_page_template_team_s_company_team" inherit_id="website.new_page_template_team_s_company_team">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/06","colors":{"c5":"o-color-4"}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/web_editor/Connections/06.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_06 bg-o-color-3" style="background-image: url('/web_editor/shape/html_builder/Connections/06.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_big_number.xml b/theme_yes/views/snippets/s_big_number.xml
index 003ee6bc4..eff01f7fa 100644
--- a/theme_yes/views/snippets/s_big_number.xml
+++ b/theme_yes/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/02"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Blobs/02"}</attribute>
         <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
     </xpath>
 
     <!-- Shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Blobs_02"/>
+        <div class="o_we_shape o_html_builder_Blobs_02"/>
     </xpath>
 
     <!-- Text -->
diff --git a/theme_yes/views/snippets/s_image_gallery.xml b/theme_yes/views/snippets/s_image_gallery.xml
index 5f34a602f..6ca713234 100644
--- a/theme_yes/views/snippets/s_image_gallery.xml
+++ b/theme_yes/views/snippets/s_image_gallery.xml
@@ -4,11 +4,11 @@
 <template id="s_image_gallery" inherit_id="website.s_image_gallery">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12", "flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12", "flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('o_container_small')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_images_wall.xml b/theme_yes/views/snippets/s_images_wall.xml
index 6c293d1df..c61860e07 100644
--- a/theme_yes/views/snippets/s_images_wall.xml
+++ b/theme_yes/views/snippets/s_images_wall.xml
@@ -4,11 +4,11 @@
 <template id="s_images_wall" inherit_id="website.s_images_wall">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12"}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_key_images.xml b/theme_yes/views/snippets/s_key_images.xml
index 864765501..0a87e7ee1 100644
--- a/theme_yes/views/snippets/s_key_images.xml
+++ b/theme_yes/views/snippets/s_key_images.xml
@@ -4,10 +4,10 @@
 <template id="s_key_images" inherit_id="website.s_key_images">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/09','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/09','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_09 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_09 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_yes/views/snippets/s_kickoff.xml b/theme_yes/views/snippets/s_kickoff.xml
index 13a686bcd..9d6c66434 100644
--- a/theme_yes/views/snippets/s_kickoff.xml
+++ b/theme_yes/views/snippets/s_kickoff.xml
@@ -5,14 +5,14 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="data-scroll-background-ratio"/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Connections/05",'colors':{'c5':'o-color-3'},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/05",'colors':{'c5':'o-color-3'},"flip":[]}</attribute>
         <attribute name="style" add="background-image:url(/web/image/website.s_kickoff_default_image)" separator=";"/>
         <attribute name="class" add="pt0 pb0 oe_img_bg o_bg_img_center o_full_screen_height" remove="s_parallax s_parallax_is_fixed pt232 pb88" separator=" "/>
     </xpath>
         <!-- Remove Parallax + shape -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Connections_05" style="background-image: url('/web_editor/shape/web_editor/Connections/05.svg?c5=o-color-3');"/>
+        <div class="o_we_shape o_html_builder_Connections_05" style="background-image: url('/web_editor/shape/html_builder/Connections/05.svg?c5=o-color-3');"/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
         <attribute name="class" add="bg-black-25" remove="bg-black-50" separator=" "/>
diff --git a/theme_yes/views/snippets/s_media_list.xml b/theme_yes/views/snippets/s_media_list.xml
index c803ae957..b441bc86a 100644
--- a/theme_yes/views/snippets/s_media_list.xml
+++ b/theme_yes/views/snippets/s_media_list.xml
@@ -5,11 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt64 pb64 o_cc1" remove="pt32 pb32 o_cc2" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
     <!-- Row #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
diff --git a/theme_yes/views/snippets/s_pricelist_boxed.xml b/theme_yes/views/snippets/s_pricelist_boxed.xml
index 88e313cd1..dc2577dc3 100644
--- a/theme_yes/views/snippets/s_pricelist_boxed.xml
+++ b/theme_yes/views/snippets/s_pricelist_boxed.xml
@@ -4,11 +4,11 @@
 <template id="s_pricelist_boxed" inherit_id="website.s_pricelist_boxed">
     <!-- Layout -->
     <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
-        <div class="o_we_shape o_web_editor_Floats_12 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_12 o_we_animated"/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
         <attribute name="class" remove="rounded" separator=" "/>
diff --git a/theme_yes/views/snippets/s_quotes_carousel.xml b/theme_yes/views/snippets/s_quotes_carousel.xml
index 3f2cdf59c..b5815c5e0 100644
--- a/theme_yes/views/snippets/s_quotes_carousel.xml
+++ b/theme_yes/views/snippets/s_quotes_carousel.xml
@@ -4,11 +4,11 @@
 <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Floats/12","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//div[hasclass('carousel-inner')]" position="before">
-        <div class="o_we_shape o_web_editor_Floats_12"/>
+        <div class="o_we_shape o_html_builder_Floats_12"/>
     </xpath>
     <!-- Quote 1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
diff --git a/theme_yes/views/snippets/s_three_columns.xml b/theme_yes/views/snippets/s_three_columns.xml
index 7e16e3e35..6d1959568 100644
--- a/theme_yes/views/snippets/s_three_columns.xml
+++ b/theme_yes/views/snippets/s_three_columns.xml
@@ -6,11 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
         <attribute name="style">background-image: linear-gradient(60deg, var(--o-color-5) 0%, var(--o-color-1) 100%);</attribute>
-        <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/12','colors':{'c5':'o-color-4'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Connections/12','colors':{'c5':'o-color-4'}}</attribute>
     </xpath>
     <!-- Shape -->
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_12" style="background-image: url('/web_editor/shape/web_editor/Connections/12.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_12" style="background-image: url('/web_editor/shape/html_builder/Connections/12.svg?c5=o-color-4');"/>
     </xpath>
     <!-- Column 1 -->
     <xpath expr="//*[hasclass('card-title')]" position="replace" mode="inner">
diff --git a/theme_yes/views/snippets/s_wavy_grid.xml b/theme_yes/views/snippets/s_wavy_grid.xml
index 5729c0a8b..58a8d0064 100644
--- a/theme_yes/views/snippets/s_wavy_grid.xml
+++ b/theme_yes/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/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/Floats/12','flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0','animated':'true'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
-        <div class="o_we_shape o_web_editor_Floats_12 o_we_animated"/>
+        <div class="o_we_shape o_html_builder_Floats_12 o_we_animated"/>
     </xpath>
 
     <!-- Texts -->
diff --git a/theme_zap/views/new_page_template.xml b/theme_zap/views/new_page_template.xml
index 893490575..6f1a11cd2 100644
--- a/theme_zap/views/new_page_template.xml
+++ b/theme_zap/views/new_page_template.xml
@@ -18,10 +18,10 @@
 <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/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -74,10 +74,10 @@
 <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/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
@@ -92,10 +92,10 @@
 <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/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/Connections/20","colors":{"c5": "o-color-4"},"flip":[]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Connections_20" style="background-image: url('/web_editor/shape/web_editor/Connections/20.svg?c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Connections_20" style="background-image: url('/web_editor/shape/html_builder/Connections/20.svg?c5=o-color-4');"/>
     </xpath>
 </template>
 
diff --git a/theme_zap/views/snippets/s_big_number.xml b/theme_zap/views/snippets/s_big_number.xml
index 3442760c7..89c7f8427 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_001","colors":{"c5":"o-color-1"}}</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"html_builder/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_001" style="background-image: url('/web_editor/shape/web_editor/Airy/14_001.svg?c5=o-color-1');"/>
+        <div class="o_we_shape o_html_builder_Airy_14_001" style="background-image: url('/web_editor/shape/html_builder/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 0c160a891..50fba075b 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/Bold/14','colors':{'c5':'o-color-4','c1':'o-color-1'}}</attribute>
+      <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c5=o-color-4&amp;c1=o-color-1');"/>
+      <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 4d97b834f..6d9db281f 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/Bold/14','colors':{'c1':'o-color-3','c5':'rgba(0,0,0,0)'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_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)');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 c70471a44..9fc689de7 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/Bold/14','colors':{'c1':'o-color-4','c5':'o-color-4'}}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_Bold_14" style="background-image: url('/web_editor/shape/web_editor/Bold/14.svg?c1=o-color-4&amp;c5=o-color-4');"/>
+        <div class="o_we_shape o_html_builder_Bold_14" style="background-image: url('/web_editor/shape/html_builder/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 450114da4..b7f340faf 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/01_001','colors':{'c5':'o-color-2'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
+        <attribute name="data-oe-shape-data">{'shape':'html_builder/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_01_001" style="background-image: url('/web_editor/shape/web_editor/Bold/01_001.svg?c5=o-color-2');"/>
+        <div class="o_we_shape o_html_builder_Bold_01_001" style="background-image: url('/web_editor/shape/html_builder/Bold/01_001.svg?c5=o-color-2');"/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>