diff --git a/theme_beauty/__manifest__.py b/theme_beauty/__manifest__.py
index ddc572af6..f0cef5586 100644
--- a/theme_beauty/__manifest__.py
+++ b/theme_beauty/__manifest__.py
@@ -4,7 +4,7 @@
     'category': 'Theme/Retail',
     'summary': 'Beauty, Health, Care, Make Up, Cosmetics, Hair Dressers, Stores',
     'sequence': 170,
-    'version': '2.0.0',
+    'version': '2.1.0',
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
@@ -16,12 +16,31 @@
         'views/snippets/s_title.xml',
         'views/snippets/s_company_team.xml',
         'views/snippets/s_call_to_action.xml',
+        'views/snippets/s_product_list.xml',
+        'views/snippets/s_banner.xml',
+        'views/snippets/s_image_text.xml',
+        'views/snippets/s_numbers.xml',
+        'views/snippets/s_picture.xml',
+        'views/snippets/s_color_blocks_2.xml',
+        'views/snippets/s_media_list.xml',
+        'views/snippets/s_comparisons.xml',
+        'views/snippets/s_product_catalog.xml',
 
         ],
     'images': [
-        'static/description/beauty_description.png',
+        'static/description/beauty_description.jpg',
         'static/description/beauty_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_cover_default_image': '/theme_beauty/static/src/img/snippets/s_cover.jpg',
+        'website.s_text_image_default_image': '/theme_beauty/static/src/img/snippets/s_text_image.jpg',
+        'website.s_product_list_default_image_1': '/theme_beauty/static/src/img/snippets/s_product_1.jpg',
+        'website.s_product_list_default_image_2': '/theme_beauty/static/src/img/snippets/s_product_2.jpg',
+        'website.s_product_list_default_image_3': '/theme_beauty/static/src/img/snippets/s_product_3.jpg',
+        'website.s_product_list_default_image_4': '/theme_beauty/static/src/img/snippets/s_product_4.jpg',
+        'website.s_product_list_default_image_5': '/theme_beauty/static/src/img/snippets/s_product_5.jpg',
+        'website.s_product_list_default_image_6': '/theme_beauty/static/src/img/snippets/s_product_6.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-beauty.odoo.com',
     'assets': {
diff --git a/theme_beauty/data/ir_asset.xml b/theme_beauty/data/ir_asset.xml
index 3ac019f17..eb8e55863 100644
--- a/theme_beauty/data/ir_asset.xml
+++ b/theme_beauty/data/ir_asset.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_beauty.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_beauty.s_banner_parallax_000_variables_scss</field>
-            <field name="name">Banner parallax 000 variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_beauty/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_beauty.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_beauty.s_banner_parallax_000_variables_scss</field>
+    <field name="name">Banner parallax 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_beauty/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_beauty.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_beauty.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_beauty/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_beauty.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_beauty.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_beauty/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_beauty.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_beauty.bootstrap_overridden_scss</field>
-            <field name="name">Bootstrap overridden SCSS</field>
-            <field name="bundle">web._assets_frontend_helpers</field>
-            <field name="directive">prepend</field>
-            <field name="path">theme_beauty/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_beauty.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_beauty.bootstrap_overridden_scss</field>
+    <field name="name">Bootstrap overridden SCSS</field>
+    <field name="bundle">web._assets_frontend_helpers</field>
+    <field name="directive">prepend</field>
+    <field name="path">theme_beauty/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-        <record id="theme_beauty.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_beauty.compatibility_saas_11_4_variables_scss</field>
-            <field name="name">Compatibility saas 11 4 variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">/theme_beauty/static/src/scss/compatibility-saas-11.4-variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_beauty.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_beauty.compatibility_saas_11_4_variables_scss</field>
+    <field name="name">Compatibility saas 11 4 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">/theme_beauty/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_beauty/static/description/beauty_description.jpg b/theme_beauty/static/description/beauty_description.jpg
new file mode 100644
index 000000000..bffb136d1
Binary files /dev/null and b/theme_beauty/static/description/beauty_description.jpg differ
diff --git a/theme_beauty/static/description/beauty_description.png b/theme_beauty/static/description/beauty_description.png
deleted file mode 100644
index ff6ee7008..000000000
Binary files a/theme_beauty/static/description/beauty_description.png and /dev/null differ
diff --git a/theme_beauty/static/description/beauty_screenshot.jpg b/theme_beauty/static/description/beauty_screenshot.jpg
index 2a4f84a65..9eee1eeea 100644
Binary files a/theme_beauty/static/description/beauty_screenshot.jpg and b/theme_beauty/static/description/beauty_screenshot.jpg differ
diff --git a/theme_beauty/static/description/index.html b/theme_beauty/static/description/index.html
index 866a0075b..82ffcb2cf 100644
--- a/theme_beauty/static/description/index.html
+++ b/theme_beauty/static/description/index.html
@@ -7,7 +7,7 @@
     first projects on the web. Just drag &amp; drop the new building blocks
     you need to easily build your layout. All layouts are made of sections,
     that you can easily combine to fit your specific project.</p>
-    <img src="beauty_description.png" class="img-fluid d-block mx-auto"/>
+    <img src="beauty_description.jpg" class="img-fluid d-block mx-auto"/>
     <hr>
 
     <h2 class="text-muted">Beauty Customization Tool</h2>
diff --git a/theme_beauty/static/src/img/snippets/library_image_02.jpg b/theme_beauty/static/src/img/snippets/library_image_02.jpg
new file mode 100644
index 000000000..eb7c8b049
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_02.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_03.jpg b/theme_beauty/static/src/img/snippets/library_image_03.jpg
new file mode 100644
index 000000000..2daeb9014
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_03.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_05.jpg b/theme_beauty/static/src/img/snippets/library_image_05.jpg
new file mode 100644
index 000000000..5e17f4e1d
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_05.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_08.jpg b/theme_beauty/static/src/img/snippets/library_image_08.jpg
new file mode 100644
index 000000000..4c743245a
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_08.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_10.jpg b/theme_beauty/static/src/img/snippets/library_image_10.jpg
new file mode 100644
index 000000000..bd326a0be
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_10.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_14.jpg b/theme_beauty/static/src/img/snippets/library_image_14.jpg
new file mode 100644
index 000000000..6fa92d0bf
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_14.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/library_image_16.jpg b/theme_beauty/static/src/img/snippets/library_image_16.jpg
new file mode 100644
index 000000000..44ff717cd
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/library_image_16.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_banner.jpg b/theme_beauty/static/src/img/snippets/s_banner.jpg
index 8fbfe7488..50f308805 100644
Binary files a/theme_beauty/static/src/img/snippets/s_banner.jpg and b/theme_beauty/static/src/img/snippets/s_banner.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_company_team_1.jpg b/theme_beauty/static/src/img/snippets/s_company_team_1.jpg
index 0f0ae1abc..8c9aae383 100644
Binary files a/theme_beauty/static/src/img/snippets/s_company_team_1.jpg and b/theme_beauty/static/src/img/snippets/s_company_team_1.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_company_team_2.jpg b/theme_beauty/static/src/img/snippets/s_company_team_2.jpg
index 9c1704fc4..f8e842302 100644
Binary files a/theme_beauty/static/src/img/snippets/s_company_team_2.jpg and b/theme_beauty/static/src/img/snippets/s_company_team_2.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_company_team_3.jpg b/theme_beauty/static/src/img/snippets/s_company_team_3.jpg
new file mode 100644
index 000000000..53fa67745
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/s_company_team_3.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_company_team_4.jpg b/theme_beauty/static/src/img/snippets/s_company_team_4.jpg
index 5ad91d7d2..d5787d3aa 100644
Binary files a/theme_beauty/static/src/img/snippets/s_company_team_4.jpg and b/theme_beauty/static/src/img/snippets/s_company_team_4.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_cover.jpg b/theme_beauty/static/src/img/snippets/s_cover.jpg
index 7a529d317..f8aca9650 100644
Binary files a/theme_beauty/static/src/img/snippets/s_cover.jpg and b/theme_beauty/static/src/img/snippets/s_cover.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_image_text.jpg b/theme_beauty/static/src/img/snippets/s_image_text.jpg
index 39d3b872a..c253f7176 100644
Binary files a/theme_beauty/static/src/img/snippets/s_image_text.jpg and b/theme_beauty/static/src/img/snippets/s_image_text.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_1.jpg b/theme_beauty/static/src/img/snippets/s_product_1.jpg
index 9895af099..8be628ce7 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_1.jpg and b/theme_beauty/static/src/img/snippets/s_product_1.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_2.jpg b/theme_beauty/static/src/img/snippets/s_product_2.jpg
index 180984da4..3ef3eba60 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_2.jpg and b/theme_beauty/static/src/img/snippets/s_product_2.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_3.jpg b/theme_beauty/static/src/img/snippets/s_product_3.jpg
index 859439596..5c5a9fe46 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_3.jpg and b/theme_beauty/static/src/img/snippets/s_product_3.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_4.jpg b/theme_beauty/static/src/img/snippets/s_product_4.jpg
index 72f9a597e..3d3402cc9 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_4.jpg and b/theme_beauty/static/src/img/snippets/s_product_4.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_5.jpg b/theme_beauty/static/src/img/snippets/s_product_5.jpg
index 150b85829..9f45936fa 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_5.jpg and b/theme_beauty/static/src/img/snippets/s_product_5.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_6.jpg b/theme_beauty/static/src/img/snippets/s_product_6.jpg
index 80a6c6817..be3d63cff 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_6.jpg and b/theme_beauty/static/src/img/snippets/s_product_6.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_product_catalog.jpg b/theme_beauty/static/src/img/snippets/s_product_catalog.jpg
index 624f8e81b..c51e47806 100644
Binary files a/theme_beauty/static/src/img/snippets/s_product_catalog.jpg and b/theme_beauty/static/src/img/snippets/s_product_catalog.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_quotes_carousel_demo_image_0.jpg b/theme_beauty/static/src/img/snippets/s_quotes_carousel_demo_image_0.jpg
new file mode 100644
index 000000000..a7ac9c669
Binary files /dev/null and b/theme_beauty/static/src/img/snippets/s_quotes_carousel_demo_image_0.jpg differ
diff --git a/theme_beauty/static/src/img/snippets/s_text_image.jpg b/theme_beauty/static/src/img/snippets/s_text_image.jpg
index d7544804b..ca9929e36 100644
Binary files a/theme_beauty/static/src/img/snippets/s_text_image.jpg and b/theme_beauty/static/src/img/snippets/s_text_image.jpg differ
diff --git a/theme_beauty/static/src/js/tour.js b/theme_beauty/static/src/js/tour.js
index f3ba1836a..a8bcf00be 100644
--- a/theme_beauty/static/src/js/tour.js
+++ b/theme_beauty/static/src/js/tour.js
@@ -1,8 +1,6 @@
-odoo.define("theme_beauty.tour.beauty", function (require) {
-"use strict";
+/** @odoo-module */
 
-const wTourUtils = require("website.tour_utils");
-var tour = require("web_tour.tour");
+import wTourUtils from 'website.tour_utils';
 
 const snippets = [
     {
@@ -17,6 +15,10 @@ const snippets = [
         id: 's_title',
         name: 'Title',
     },
+    {
+        id: 's_product_list',
+        name: 'Items',
+    },
     {
         id: 's_company_team',
         name: 'Team',
@@ -35,8 +37,5 @@ wTourUtils.registerThemeHomepageTour("beauty_tour", [
     wTourUtils.dragNDrop(snippets[2]),
     wTourUtils.dragNDrop(snippets[3]),
     wTourUtils.dragNDrop(snippets[4]),
-    wTourUtils.clickOnSnippet(snippets[4]),
-    wTourUtils.changeBackgroundColor(),
-    wTourUtils.selectColorPalette(),
+    wTourUtils.dragNDrop(snippets[5]),
 ]);
-});
diff --git a/theme_beauty/static/src/scss/primary_variables.scss b/theme_beauty/static/src/scss/primary_variables.scss
index 8a7dd3b1c..5f2e799d2 100644
--- a/theme_beauty/static/src/scss/primary_variables.scss
+++ b/theme_beauty/static/src/scss/primary_variables.scss
@@ -2,12 +2,12 @@
 // Fonts
 //------------------------------------------------------------------------------
 
-$o-theme-h1-font-size-multiplier: (25 / 12);
-$o-theme-h2-font-size-multiplier: (18 / 12);
-$o-theme-h3-font-size-multiplier: (16 / 12);
-$o-theme-h4-font-size-multiplier: (14 / 12);
-$o-theme-h5-font-size-multiplier: 1;
-$o-theme-h6-font-size-multiplier: 1;
+$o-theme-h1-font-size-multiplier: (62 / 16);
+$o-theme-h2-font-size-multiplier: (48 / 16);
+$o-theme-h3-font-size-multiplier: (36 / 16);
+$o-theme-h4-font-size-multiplier: (28 / 16);
+$o-theme-h5-font-size-multiplier: (24 / 16);
+$o-theme-h6-font-size-multiplier: (21 / 16);
 
 $o-theme-font-configs: (
     'Heebo': (
@@ -46,6 +46,10 @@ $o-theme-font-configs: (
         'family': ('Muli', sans-serif),
         'url': 'Muli:300,300i,400,400i,700,700i',
     ),
+    'DM Serif Display': (
+        'family': ('DM Serif Display', serif),
+        'url': 'DM+Serif+Display:400,400i',
+    ),
 );
 
 //------------------------------------------------------------------------------
@@ -57,16 +61,24 @@ $o-website-values-palettes: (
         'color-palettes-name': 'beauty-1',
 
         'header-font-size': (18 / 16) * 1rem,
-        'btn-border-radius': .3125rem,
-        'btn-border-radius-lg': .3125rem,
-        'btn-border-radius-sm': .3125rem,
         'font': 'Questrial',
-        'headings-font': 'Questrial',
+        'headings-font': 'DM Serif Display',
         'navbar-font': 'Questrial',
         'buttons-font': 'Questrial',
         'header-template': 'Contact',
         'footer-template': 'default',
         'header-links-style': 'outline',
+
+        // Buttons
+        'btn-padding-y':                    .45rem,
+        'btn-padding-x':                    1.35rem,
+        'btn-padding-y-sm':                 .3rem,
+        'btn-padding-x-sm':                 .9rem,
+        'btn-padding-y-lg':                 .6rem,
+        'btn-padding-x-lg':                 1.8rem,
+        'btn-border-radius':                10rem,
+        'btn-border-radius-sm':             10rem,
+        'btn-border-radius-lg':             10rem,
     ),
 );
 
@@ -97,3 +109,11 @@ $o-color-palettes-compatibility-indexes: (
     22: 'generic-16',
     23: 'generic-17',
 );
+
+//------------------------------------------------------------------------------
+// Shapes
+//------------------------------------------------------------------------------
+
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/09', (1: 3, 5: 3));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/13_001', (1: 3));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/20', (2: 1));
diff --git a/theme_beauty/views/images.xml b/theme_beauty/views/images.xml
index 7f3a60077..4b811e621 100644
--- a/theme_beauty/views/images.xml
+++ b/theme_beauty/views/images.xml
@@ -1,194 +1,239 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Not used anymore by the editor: files and records kept for back-compatibility.
-        Check in theme_loftspace's primary_variables.scss and theme.scss -->
-        <record id="image_content_02" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_02</field>
-            <field name="name">theme_common.image_content_02</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_02.jpg</field>
-        </record>
-        <record id="image_content_03" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_03</field>
-            <field name="name">theme_common.image_content_03</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_03.jpg</field>
-        </record>
-        <record id="image_content_07" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_07</field>
-            <field name="name">theme_common.image_content_07</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_07.jpg</field>
-        </record>
-        <record id="image_content_09" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_09</field>
-            <field name="name">theme_common.image_content_09</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_09.jpg</field>
-        </record>
-        <record id="image_content_10" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_10</field>
-            <field name="name">theme_common.image_content_10</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_10.jpg</field>
-        </record>
-        <record id="image_content_11" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_11</field>
-            <field name="name">theme_common.image_content_11</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_11.jpg</field>
-        </record>
-        <record id="image_content_12" model="theme.ir.attachment">
-            <field name="key">theme_common.image_content_12</field>
-            <field name="name">theme_common.image_content_12</field>
-            <field name="url">/theme_beauty/static/src/img/content/content_img_12.jpg</field>
-        </record>
+<odoo>
 
-        <!-- SNIPPETS -->
-        <record id="s_banner_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_banner_default_image</field>
-            <field name="name">website.s_banner_default_image</field>
-        <field name="url">/theme_beauty/static/src/img/snippets/s_banner.jpg</field>
-        </record>
-        <record id="s_popup_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_popup_default_image</field>
-            <field name="name">website.s_popup_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_popup.jpg</field>
-        </record>
-        <record id="s_cover_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_cover_default_image</field>
-            <field name="name">website.s_cover_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_cover.jpg</field>
-        </record>
-        <record id="s_text_image_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_text_image_default_image</field>
-            <field name="name">website.s_text_image_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_picture.jpg</field>
-        </record>
-        <record id="s_image_text_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_image_text_default_image</field>
-            <field name="name">website.s_image_text_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_image_text.jpg</field>
-        </record>
-        <record id="s_picture_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_picture_default_image</field>
-            <field name="name">website.s_picture_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_picture.jpg</field>
-        </record>
-        <record id="library_image_11" model="theme.ir.attachment">
-            <field name="key">website.library_image_11</field>
-            <field name="name">website.library_image_11</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/library_image_11.jpg</field>
-        </record>
-        <record id="library_image_13" model="theme.ir.attachment">
-            <field name="key">website.library_image_13</field>
-            <field name="name">website.library_image_13</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/library_image_13.jpg</field>
-        </record>
-        <record id="library_image_07" model="theme.ir.attachment">
-            <field name="key">website.library_image_07</field>
-            <field name="name">website.library_image_07</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/library_image_07.jpg</field>
-        </record>
-        <record id="s_masonry_block_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_masonry_block_default_image_1</field>
-            <field name="name">website.s_masonry_block_default_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_masonry_block.jpg</field>
-        </record>
-        <record id="s_carousel_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_carousel_default_image_1</field>
-            <field name="name">website.s_carousel_default_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_1.jpg</field>
-        </record>
-        <record id="s_carousel_default_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_carousel_default_image_2</field>
-            <field name="name">website.s_carousel_default_image_2</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_2.jpg</field>
-        </record>
-        <record id="s_carousel_default_image_3" model="theme.ir.attachment">
-            <field name="key">website.s_carousel_default_image_3</field>
-            <field name="name">website.s_carousel_default_image_3</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_3.jpg</field>
-        </record>
-        <record id="s_media_list_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_media_list_default_image_1</field>
-            <field name="name">website.s_media_list_default_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_1.jpg</field>
-        </record>
-        <record id="s_media_list_default_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_media_list_default_image_2</field>
-            <field name="name">website.s_media_list_default_image_2</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_2.jpg</field>
-        </record>
-        <record id="s_media_list_default_image_3" model="theme.ir.attachment">
-            <field name="key">website.s_media_list_default_image_3</field>
-            <field name="name">website.s_media_list_default_image_3</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_3.jpg</field>
-        </record>
-        <record id="s_parallax_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_parallax_default_image</field>
-            <field name="name">website.s_parallax_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_parallax.jpg</field>
-        </record>
-        <record id="s_product_catalog_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_product_catalog_default_image</field>
-            <field name="name">website.s_product_catalog_default_image</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_catalog.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_1</field>
-            <field name="name">website.s_product_list_default_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_1.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_2</field>
-            <field name="name">website.s_product_list_default_image_2</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_2.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_3" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_3</field>
-            <field name="name">website.s_product_list_default_image_3</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_3.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_4" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_4</field>
-            <field name="name">website.s_product_list_default_image_4</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_4.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_5" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_5</field>
-            <field name="name">website.s_product_list_default_image_5</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_5.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_6" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_6</field>
-            <field name="name">website.s_product_list_default_image_6</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_product_6.jpg</field>
-        </record>
-        <record id="s_company_team_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_company_team_image_1</field>
-            <field name="name">website.s_company_team_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_1.jpg</field>
-        </record>
-        <record id="s_company_team_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_company_team_image_2</field>
-            <field name="name">website.s_company_team_image_2</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_2.jpg</field>
-        </record>
-        <record id="s_company_team_image_4" model="theme.ir.attachment">
-            <field name="key">website.s_company_team_image_4</field>
-            <field name="name">website.s_company_team_image_4</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_4.jpg</field>
-        </record>
-        <record id="s_quotes_carousel_demo_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_quotes_carousel_demo_image_1</field>
-            <field name="name">website.s_quotes_carousel_demo_image_1</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_quotes_carousel_1.jpg</field>
-        </record>
-        <record id="s_quotes_carousel_demo_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_quotes_carousel_demo_image_2</field>
-            <field name="name">website.s_quotes_carousel_demo_image_2</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_quotes_carousel_2.jpg</field>
-        </record>
-        <record id="s_newsletter_block" model="theme.ir.attachment">
-            <field name="key">website.library_image_17</field>
-            <field name="name">website.library_image_17</field>
-            <field name="url">/theme_beauty/static/src/img/snippets/s_newsletter.jpg</field>
-        </record>
-    </data>
-</openerp>
+<!-- Not used anymore by the editor: files and records kept for back-compatibility.
+Check in theme_loftspace's primary_variables.scss and theme.scss -->
+<record id="image_content_02" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_02</field>
+    <field name="name">theme_common.image_content_02</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_02.jpg</field>
+</record>
+<record id="image_content_03" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_03</field>
+    <field name="name">theme_common.image_content_03</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_03.jpg</field>
+</record>
+<record id="image_content_07" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_07</field>
+    <field name="name">theme_common.image_content_07</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_07.jpg</field>
+</record>
+<record id="image_content_09" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_09</field>
+    <field name="name">theme_common.image_content_09</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_09.jpg</field>
+</record>
+<record id="image_content_10" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_10</field>
+    <field name="name">theme_common.image_content_10</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_10.jpg</field>
+</record>
+<record id="image_content_11" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_11</field>
+    <field name="name">theme_common.image_content_11</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_11.jpg</field>
+</record>
+<record id="image_content_12" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_12</field>
+    <field name="name">theme_common.image_content_12</field>
+    <field name="url">/theme_beauty/static/src/img/content/content_img_12.jpg</field>
+</record>
+
+<!-- SNIPPETS -->
+<record id="s_banner_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_banner_default_image</field>
+    <field name="name">website.s_banner_default_image</field>
+<field name="url">/theme_beauty/static/src/img/snippets/s_banner.jpg</field>
+</record>
+<record id="s_popup_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_popup_default_image</field>
+    <field name="name">website.s_popup_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_popup.jpg</field>
+</record>
+<record id="s_cover_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_cover_default_image</field>
+    <field name="name">website.s_cover_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_cover.jpg</field>
+</record>
+<record id="s_text_image_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_text_image_default_image</field>
+    <field name="name">website.s_text_image_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_text_image.jpg</field>
+</record>
+<record id="s_image_text_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_image_text_default_image</field>
+    <field name="name">website.s_image_text_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_image_text.jpg</field>
+</record>
+<record id="s_picture_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_picture_default_image</field>
+    <field name="name">website.s_picture_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_picture.jpg</field>
+</record>
+<record id="library_image_11" model="theme.ir.attachment">
+    <field name="key">website.library_image_11</field>
+    <field name="name">website.library_image_11</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_11.jpg</field>
+</record>
+<record id="library_image_13" model="theme.ir.attachment">
+    <field name="key">website.library_image_13</field>
+    <field name="name">website.library_image_13</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_13.jpg</field>
+</record>
+<record id="library_image_07" model="theme.ir.attachment">
+    <field name="key">website.library_image_07</field>
+    <field name="name">website.library_image_07</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_07.jpg</field>
+</record>
+<record id="library_image_08" model="theme.ir.attachment">
+    <field name="key">website.library_image_08</field>
+    <field name="name">website.library_image_08</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_08.jpg</field>
+</record>
+<record id="library_image_03" model="theme.ir.attachment">
+    <field name="key">website.library_image_03</field>
+    <field name="name">website.library_image_03</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_03.jpg</field>
+</record>
+<record id="library_image_02" model="theme.ir.attachment">
+    <field name="key">website.library_image_02</field>
+    <field name="name">website.library_image_02</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_02.jpg</field>
+</record>
+<record id="library_image_10" model="theme.ir.attachment">
+    <field name="key">website.library_image_10</field>
+    <field name="name">website.library_image_10</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_10.jpg</field>
+</record>
+<record id="library_image_05" model="theme.ir.attachment">
+    <field name="key">website.library_image_05</field>
+    <field name="name">website.library_image_05</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_05.jpg</field>
+</record>
+<record id="library_image_14" model="theme.ir.attachment">
+    <field name="key">website.library_image_14</field>
+    <field name="name">website.library_image_14</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_14.jpg</field>
+</record>
+<record id="library_image_16" model="theme.ir.attachment">
+    <field name="key">website.library_image_16</field>
+    <field name="name">website.library_image_16</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/library_image_16.jpg</field>
+</record>
+<record id="s_masonry_block_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_masonry_block_default_image_1</field>
+    <field name="name">website.s_masonry_block_default_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_masonry_block.jpg</field>
+</record>
+<record id="s_carousel_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_carousel_default_image_1</field>
+    <field name="name">website.s_carousel_default_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_1.jpg</field>
+</record>
+<record id="s_carousel_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_carousel_default_image_2</field>
+    <field name="name">website.s_carousel_default_image_2</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_2.jpg</field>
+</record>
+<record id="s_carousel_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_carousel_default_image_3</field>
+    <field name="name">website.s_carousel_default_image_3</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_carousel_3.jpg</field>
+</record>
+<record id="s_media_list_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_media_list_default_image_1</field>
+    <field name="name">website.s_media_list_default_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_1.jpg</field>
+</record>
+<record id="s_media_list_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_media_list_default_image_2</field>
+    <field name="name">website.s_media_list_default_image_2</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_2.jpg</field>
+</record>
+<record id="s_media_list_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_media_list_default_image_3</field>
+    <field name="name">website.s_media_list_default_image_3</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_media_list_3.jpg</field>
+</record>
+<record id="s_parallax_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_parallax_default_image</field>
+    <field name="name">website.s_parallax_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_parallax.jpg</field>
+</record>
+<record id="s_product_catalog_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_product_catalog_default_image</field>
+    <field name="name">website.s_product_catalog_default_image</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_catalog.jpg</field>
+</record>
+<record id="s_product_list_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_1</field>
+    <field name="name">website.s_product_list_default_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_1.jpg</field>
+</record>
+<record id="s_product_list_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_2</field>
+    <field name="name">website.s_product_list_default_image_2</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_2.jpg</field>
+</record>
+<record id="s_product_list_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_3</field>
+    <field name="name">website.s_product_list_default_image_3</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_3.jpg</field>
+</record>
+<record id="s_product_list_default_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_4</field>
+    <field name="name">website.s_product_list_default_image_4</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_4.jpg</field>
+</record>
+<record id="s_product_list_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_5</field>
+    <field name="name">website.s_product_list_default_image_5</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_5.jpg</field>
+</record>
+<record id="s_product_list_default_image_6" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_6</field>
+    <field name="name">website.s_product_list_default_image_6</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_product_6.jpg</field>
+</record>
+<record id="s_company_team_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_1</field>
+    <field name="name">website.s_company_team_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_1.jpg</field>
+</record>
+<record id="s_company_team_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_2</field>
+    <field name="name">website.s_company_team_image_2</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_2.jpg</field>
+</record>
+<record id="s_company_team_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_3</field>
+    <field name="name">website.s_company_team_image_3</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_3.jpg</field>
+</record>
+<record id="s_company_team_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_4</field>
+    <field name="name">website.s_company_team_image_4</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_company_team_4.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_0" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_0</field>
+    <field name="name">website.s_quotes_carousel_demo_image_0</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_quotes_carousel_demo_image_0.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_1</field>
+    <field name="name">website.s_quotes_carousel_demo_image_1</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_quotes_carousel_1.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_2</field>
+    <field name="name">website.s_quotes_carousel_demo_image_2</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_quotes_carousel_2.jpg</field>
+</record>
+<record id="s_newsletter_block" model="theme.ir.attachment">
+    <field name="key">website.library_image_17</field>
+    <field name="name">website.library_image_17</field>
+    <field name="url">/theme_beauty/static/src/img/snippets/s_newsletter.jpg</field>
+</record>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_banner.xml b/theme_beauty/views/snippets/s_banner.xml
new file mode 100644
index 000000000..7abea09f7
--- /dev/null
+++ b/theme_beauty/views/snippets/s_banner.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt168 pb168" remove="pt48 pb24" separator=" "/>
+    </xpath>
+    <!-- Change position of background image -->
+    <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
+        <attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 0;" separator=";"/>
+    </xpath>
+    <!-- Jumbotron -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc3" remove="o_cc1" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_call_to_action.xml b/theme_beauty/views/snippets/s_call_to_action.xml
index 57c1c98ea..32985f11b 100644
--- a/theme_beauty/views/snippets/s_call_to_action.xml
+++ b/theme_beauty/views/snippets/s_call_to_action.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_call_to_action" inherit_id="website.s_call_to_action">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt64 pb48" remove="pt48 pb24 bg-200" separator=" "/>
-        </xpath>
-        <!-- Layout -->
-        <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
-            <attribute name="class" add="col-lg-12 text-center" remove="col-lg-9" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')]" position="attributes">
-            <attribute name="class" add="col-lg-12" remove="col-lg-3" separator=" "/>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//h3" position="replace">
-            <h3><b>Beauty</b> without expression is boring.</h3>
-        </xpath>
-        <xpath expr="//p" position="replace">
-            <p>Join us and enjoy the pleasure of caring for yourself.</p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="(//div[hasclass('col-lg-12')])[2]/p" position="attributes">
-            <attribute name="style" add="text-align: center;" remove="text-align: right;" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt128 pb128" remove="pt48 pb24 bg-200" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/05_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_05_001"/>
+    </xpath>
+    <!-- Layout -->
+    <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
+        <attribute name="class" add="col-lg-12 text-center" remove="col-lg-9" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-3')]" position="attributes">
+        <attribute name="class" add="col-lg-12" remove="col-lg-3" separator=" "/>
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//h3" position="replace">
+        <h2>Beauty without <br/>expression is boring</h2>
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        Join us and enjoy the pleasure of caring for yourself.
+    </xpath>
+    <!-- Button -->
+    <xpath expr="(//div[hasclass('col-lg-12')])[2]/p" position="attributes">
+        <attribute name="style" add="text-align: center;" remove="text-align: right;" separator=";"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_color_blocks_2.xml b/theme_beauty/views/snippets/s_color_blocks_2.xml
new file mode 100644
index 000000000..e5b8b58d9
--- /dev/null
+++ b/theme_beauty/views/snippets/s_color_blocks_2.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
+    <!-- Column #1 -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+    </xpath>
+    <!-- Column #2 -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index ad87c292e..102fc7e18 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -1,22 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_company_team" inherit_id="website.s_company_team">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        </xpath>
-        <!-- Titles -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace">
-            <h4>Tony</h4>
-        </xpath>
-        <xpath expr="(//div[hasclass('col-lg-8')])[2]/h4" position="replace">
-            <h4>Mich</h4>
-        </xpath>
-        <xpath expr="(//div[hasclass('col-lg-8')])[3]/h4" position="replace">
-            <h4>Aline</h4>
-        </xpath>
-        <xpath expr="(//div[hasclass('col-lg-8')])[4]/h4" position="replace">
-            <h4>Iris</h4>
-        </xpath>
-    </template>
+
+<template id="s_company_team" inherit_id="website.s_company_team">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc4 pt80 pb80" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/20","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_20 o_we_flip_y"/>
+    </xpath>
+    <!-- Titles -->
+    <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace" mode="inner">
+        Tony
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[2]/h4" position="replace" mode="inner">
+        Mich
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[3]/h4" position="replace" mode="inner">
+        Aline
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[4]/h4" position="replace" mode="inner">
+        Iris
+    </xpath>
+    <!-- Images -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="img-thumbnail" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" add="img-thumbnail" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" add="img-thumbnail" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" add="img-thumbnail" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_comparisons.xml b/theme_beauty/views/snippets/s_comparisons.xml
new file mode 100644
index 000000000..871585a87
--- /dev/null
+++ b/theme_beauty/views/snippets/s_comparisons.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_comparisons" inherit_id="website.s_comparisons">
+    <!-- Card #1 -->
+    <xpath expr="//div[hasclass('card')]" position="attributes">
+        <attribute name="class" add="bg-o-color-3" remove="bg-200" separator=" "/>
+    </xpath>
+    <!-- Card #2 -->
+    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('card')])[2]//a[hasclass('btn')]" position="attributes">
+        <attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index 83eb09607..7fe634fd2 100644
--- a/theme_beauty/views/snippets/s_cover.xml
+++ b/theme_beauty/views/snippets/s_cover.xml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_cover" inherit_id="website.s_cover">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_full_screen_height bg-black-15 o_cc o_cc5" remove="bg-black-50" separator=" "/>
-        </xpath>
-        <!-- Filter -->
-        <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
-            <attribute name="class" add="bg-black-15" remove="bg-black-50" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1 style="text-align: center;">
-                <font style="font-size: 62px;"><b>Working beauty from the inside out</b></font>
-            </h1>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//p[2]" position="replace"/>
-        <xpath expr="//p[1]" position="replace"/>
-    </template>
+
+<template id="s_cover" inherit_id="website.s_cover">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_full_screen_height bg-black-15 o_cc o_cc5" remove="bg-black-50" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/09","flip":[]}</attribute>
+    </xpath>
+    <!-- Change position of background image -->
+    <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
+        <attribute name="style" add="background-position: 50% 50%;" remove="background-position: 50% 0;" separator=";"/>
+    </xpath>
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+        <attribute name="class" add="bg-black-15" remove="bg-black-50" separator=" "/>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_09"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Working beauty <br/>from the inside out
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p[2]" position="replace"/>
+    <xpath expr="//p[1]" position="replace"/>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_image_text.xml b/theme_beauty/views/snippets/s_image_text.xml
new file mode 100644
index 000000000..056379866
--- /dev/null
+++ b/theme_beauty/views/snippets/s_image_text.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_image_text" inherit_id="website.s_image_text">
+    <!-- Img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_image_text_default_image/web_editor/pattern/pattern_waves_4.svg?c1=o-color-1&amp;c3=o-color-4</attribute>
+        <attribute name="data-shape">web_editor/pattern/pattern_waves_4</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_image_text.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;;o-color-4;;</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_media_list.xml b/theme_beauty/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..ee2b8af67
--- /dev/null
+++ b/theme_beauty/views/snippets/s_media_list.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
+    </xpath>
+    <!-- Item #1 - img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_media_list_default_image_1/web_editor/line/little_lines_1.svg?c1=o-color-1</attribute>
+        <attribute name="data-shape">web_editor/line/little_lines_1</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_media_list_1.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;;;;</attribute>
+    </xpath>
+    <!-- Item #2 - img -->
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_media_list_default_image_2/web_editor/line/little_lines_3.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-3</attribute>
+        <attribute name="data-shape">web_editor/line/little_lines_3</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_media_list_2.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;o-color-2;;;o-color-3</attribute>
+    </xpath>
+    <!-- Item #3 - img -->
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_media_list_default_image_3/web_editor/line/little_lines_2.svg?c2=o-color-2</attribute>
+        <attribute name="data-shape">web_editor/line/little_lines_2</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_media_list_3.svg</attribute>
+        <attribute name="data-shape-colors">;o-color-2;;;</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_numbers.xml b/theme_beauty/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..ffe5543e4
--- /dev/null
+++ b/theme_beauty/views/snippets/s_numbers.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_numbers" inherit_id="website.s_numbers">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_10"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_picture.xml b/theme_beauty/views/snippets/s_picture.xml
new file mode 100644
index 000000000..d4bdf8ff1
--- /dev/null
+++ b/theme_beauty/views/snippets/s_picture.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/06","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_06 o_we_flip_x"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_product_catalog.xml b/theme_beauty/views/snippets/s_product_catalog.xml
new file mode 100644
index 000000000..4975cf70a
--- /dev/null
+++ b/theme_beauty/views/snippets/s_product_catalog.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_product_catalog" inherit_id="website.s_product_catalog">
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-white-75"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_product_list.xml b/theme_beauty/views/snippets/s_product_list.xml
new file mode 100644
index 000000000..e49f9ae9d
--- /dev/null
+++ b/theme_beauty/views/snippets/s_product_list.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_product_list" inherit_id="website.s_product_list">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt96 pb96" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/15","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container-fluid')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_15"/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container-fluid')]" position="attributes">
+        <attribute name="class" add="container" remove="container-fluid" separator=" "/>
+    </xpath>
+    <!-- Item #1 -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="//a[hasclass('btn')]" position="replace" mode="inner">
+        Make-up
+    </xpath>
+    <!-- Item #2 -->
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="(//a[hasclass('btn')])[2]" position="replace" mode="inner">
+        Skin gel
+    </xpath>
+    <!-- Item #3 -->
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="(//a[hasclass('btn')])[3]" position="replace" mode="inner">
+        Lipstick
+    </xpath>
+    <!-- Item #4 -->
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="(//a[hasclass('btn')])[4]" position="replace" mode="inner">
+        Eyeliner
+    </xpath>
+    <!-- Item #5 -->
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="(//a[hasclass('btn')])[5]" position="replace" mode="inner">
+        Perfume
+    </xpath>
+    <!-- Item #6 -->
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" add="rounded-circle" separator=" "/>
+    </xpath>
+    <xpath expr="(//a[hasclass('btn')])[6]" position="replace" mode="inner">
+        Essential oils
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_beauty/views/snippets/s_text_image.xml b/theme_beauty/views/snippets/s_text_image.xml
index a7096ca78..8c572ff2d 100644
--- a/theme_beauty/views/snippets/s_text_image.xml
+++ b/theme_beauty/views/snippets/s_text_image.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_text_image" inherit_id="website.s_text_image">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2>Pamper Yourself</h2>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p[1]" position="replace">
-            <p>Escape from everyday busy reality and treat your body with intensive care. Beauty and health go hand in hand. Take time to slow down in our relaxing spa, and everything you’re chasing will come around.</p>
-        </xpath>
-        <xpath expr="//p[2]" position="replace"/>
-        <!-- Button -->
-        <xpath expr="//a" position="attributes">
-            <attribute name="class" add="btn-outline-secondary" remove="btn-primary" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc3" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Pamper Yourself
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        <br/>
+        Escape from everyday busy reality and treat your body with intensive care. Beauty and health go hand in hand. Take time to slow down in our relaxing spa, and everything you’re chasing will come around.
+    </xpath>
+    <xpath expr="//p[2]" position="replace"/>
+    <!-- Img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/pattern/pattern_waves_3.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1</attribute>
+        <attribute name="data-shape">web_editor/pattern/pattern_waves_3</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_text_image.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;o-color-2;o-color-3;;o-color-1</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_title.xml b/theme_beauty/views/snippets/s_title.xml
index 4bd930f30..1bdef7d1b 100644
--- a/theme_beauty/views/snippets/s_title.xml
+++ b/theme_beauty/views/snippets/s_title.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_title" inherit_id="website.s_title">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc o_cc4" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1 style="text-align: center;">
-                <font style="font-size: 62px;">Close your eyes and let yourself go in the expert hands of our beauticians.</font>
-            </h1>
-        </xpath>
-    </template>
+
+<template id="s_title" inherit_id="website.s_title">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc4 pt80" remove="pt40" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Close your eyes and let yourself go in the expert hands of our beauticians.
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_13_001 o_we_flip_y"/>
+    </xpath>
+</template>
+
 </odoo>