diff --git a/theme_orchid/__manifest__.py b/theme_orchid/__manifest__.py
index 619fdcada..f5581fa57 100644
--- a/theme_orchid/__manifest__.py
+++ b/theme_orchid/__manifest__.py
@@ -17,11 +17,23 @@
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_quotes_carousel.xml',
         'views/snippets/s_call_to_action.xml',
+        'views/snippets/s_banner.xml',
+        'views/snippets/s_numbers.xml',
+        'views/snippets/s_media_list.xml',
+        'views/snippets/s_product_catalog.xml',
     ],
     'images': [
-        'static/description/orchid_description.png',
+        'static/description/orchid_description.jpg',
         'static/description/orchid_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_cover_default_image': '/theme_orchid/static/src/img/snippets/s_parallax.jpg',
+        'website.s_image_text_default_image': '/theme_orchid/static/src/img/snippets/s_carousel_2.jpg',
+        'website.s_text_image_default_image': '/theme_orchid/static/src/img/snippets/s_media_list_3.jpg',
+        'website.s_three_columns_default_image_1': '/theme_orchid/static/src/img/snippets/library_image_11.jpg',
+        'website.s_three_columns_default_image_2': '/theme_orchid/static/src/img/snippets/library_image_13.jpg',
+        'website.s_three_columns_default_image_3': '/theme_orchid/static/src/img/snippets/library_image_07.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-orchid.odoo.com',
     'assets': {
diff --git a/theme_orchid/data/ir_asset.xml b/theme_orchid/data/ir_asset.xml
index 5bb8ca8ac..6426ad95a 100644
--- a/theme_orchid/data/ir_asset.xml
+++ b/theme_orchid/data/ir_asset.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_orchid.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_orchid.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_orchid/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_orchid.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_orchid.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_orchid/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_orchid.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_orchid.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_orchid/static/src/scss/compatibility-saas-11.4-variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_orchid.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_orchid.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_orchid/static/src/scss/bootstrap_overridden.scss</field>
+</record>
+
+<record id="theme_orchid.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_orchid.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_orchid/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_orchid/static/description/index.html b/theme_orchid/static/description/index.html
index 3dedfbf17..1739b8b7f 100644
--- a/theme_orchid/static/description/index.html
+++ b/theme_orchid/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="orchid_description.png" class="img-fluid d-block mx-auto"/>
+    <img src="orchid_description.jpg" class="img-fluid d-block mx-auto"/>
     <hr/>
 
     <h2 class="text-muted">Orchid Customization Tool</h2>
diff --git a/theme_orchid/static/description/orchid_description.jpg b/theme_orchid/static/description/orchid_description.jpg
new file mode 100644
index 000000000..bc3ce6d32
Binary files /dev/null and b/theme_orchid/static/description/orchid_description.jpg differ
diff --git a/theme_orchid/static/description/orchid_description.png b/theme_orchid/static/description/orchid_description.png
deleted file mode 100644
index 7c3b2ee54..000000000
Binary files a/theme_orchid/static/description/orchid_description.png and /dev/null differ
diff --git a/theme_orchid/static/description/orchid_screenshot.jpg b/theme_orchid/static/description/orchid_screenshot.jpg
index 23365b7ad..a925f6efd 100644
Binary files a/theme_orchid/static/description/orchid_screenshot.jpg and b/theme_orchid/static/description/orchid_screenshot.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_02.jpg b/theme_orchid/static/src/img/snippets/library_image_02.jpg
new file mode 100644
index 000000000..474e77e55
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_02.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_03.jpg b/theme_orchid/static/src/img/snippets/library_image_03.jpg
new file mode 100644
index 000000000..b4371a797
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_03.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_05.jpg b/theme_orchid/static/src/img/snippets/library_image_05.jpg
new file mode 100644
index 000000000..cc05949c6
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_05.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_08.jpg b/theme_orchid/static/src/img/snippets/library_image_08.jpg
new file mode 100644
index 000000000..688f969b9
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_08.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_10.jpg b/theme_orchid/static/src/img/snippets/library_image_10.jpg
new file mode 100644
index 000000000..df6baa40e
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_10.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_14.jpg b/theme_orchid/static/src/img/snippets/library_image_14.jpg
new file mode 100644
index 000000000..2ecebebc4
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_14.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/library_image_16.jpg b/theme_orchid/static/src/img/snippets/library_image_16.jpg
new file mode 100644
index 000000000..2f8a426b1
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/library_image_16.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_banner.jpg b/theme_orchid/static/src/img/snippets/s_banner.jpg
index ed68eaa6d..ec10d61dc 100644
Binary files a/theme_orchid/static/src/img/snippets/s_banner.jpg and b/theme_orchid/static/src/img/snippets/s_banner.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_carousel_1.jpg b/theme_orchid/static/src/img/snippets/s_carousel_1.jpg
index 5b4510833..cd1fe05fa 100644
Binary files a/theme_orchid/static/src/img/snippets/s_carousel_1.jpg and b/theme_orchid/static/src/img/snippets/s_carousel_1.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_carousel_3.jpg b/theme_orchid/static/src/img/snippets/s_carousel_3.jpg
index 378bd1428..b13b72ff7 100644
Binary files a/theme_orchid/static/src/img/snippets/s_carousel_3.jpg and b/theme_orchid/static/src/img/snippets/s_carousel_3.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_cover.jpg b/theme_orchid/static/src/img/snippets/s_cover.jpg
index 0f9a77820..c3dfb29ca 100644
Binary files a/theme_orchid/static/src/img/snippets/s_cover.jpg and b/theme_orchid/static/src/img/snippets/s_cover.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_masonry_block.jpg b/theme_orchid/static/src/img/snippets/s_masonry_block.jpg
index 6c65d40d3..9baf4def9 100644
Binary files a/theme_orchid/static/src/img/snippets/s_masonry_block.jpg and b/theme_orchid/static/src/img/snippets/s_masonry_block.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_parallax.jpg b/theme_orchid/static/src/img/snippets/s_parallax.jpg
index 850a6f4f8..e428e2152 100644
Binary files a/theme_orchid/static/src/img/snippets/s_parallax.jpg and b/theme_orchid/static/src/img/snippets/s_parallax.jpg differ
diff --git a/theme_orchid/static/src/img/snippets/s_product_catalog_default_image.jpg b/theme_orchid/static/src/img/snippets/s_product_catalog_default_image.jpg
new file mode 100644
index 000000000..509a1d9e0
Binary files /dev/null and b/theme_orchid/static/src/img/snippets/s_product_catalog_default_image.jpg differ
diff --git a/theme_orchid/static/src/js/tour.js b/theme_orchid/static/src/js/tour.js
index 6a0a5ec7a..d951ce520 100644
--- a/theme_orchid/static/src/js/tour.js
+++ b/theme_orchid/static/src/js/tour.js
@@ -1,10 +1,9 @@
-odoo.define("theme_orchid.tour.orchid", function (require) {
-"use strict";
+/** @odoo-module */
+
+import wTourUtils from 'website.tour_utils';
 
 const core = require("web.core");
 const _t = core._t;
-const wTourUtils = require("website.tour_utils");
-var tour = require("web_tour.tour");
 
 const snippets = [
     {
@@ -45,8 +44,5 @@ wTourUtils.registerThemeHomepageTour("orchid_tour", [
     wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[4]),
     wTourUtils.dragNDrop(snippets[5]),
-    wTourUtils.clickOnSnippet(snippets[5]),
-    wTourUtils.changeBackgroundColor(),
-    wTourUtils.selectColorPalette(),
+    wTourUtils.clickOnText(snippets[5], 'h3'),
 ]);
-});
diff --git a/theme_orchid/static/src/scss/bootstrap_overridden.scss b/theme_orchid/static/src/scss/bootstrap_overridden.scss
new file mode 100644
index 000000000..f865c6f3c
--- /dev/null
+++ b/theme_orchid/static/src/scss/bootstrap_overridden.scss
@@ -0,0 +1,3 @@
+// Headings font weight
+
+$headings-font-weight: $o-theme-headings-font-weight !default;
diff --git a/theme_orchid/static/src/scss/primary_variables.scss b/theme_orchid/static/src/scss/primary_variables.scss
index b5d4ff5d8..84ff803ff 100644
--- a/theme_orchid/static/src/scss/primary_variables.scss
+++ b/theme_orchid/static/src/scss/primary_variables.scss
@@ -2,12 +2,14 @@
 // 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: (24 / 16);
+$o-theme-h5-font-size-multiplier: (21 / 16);
+$o-theme-h6-font-size-multiplier: (18 / 16);
+
+$o-theme-headings-font-weight: 600;
 
 $o-theme-font-configs: (
     'Heebo': (
@@ -46,6 +48,10 @@ $o-theme-font-configs: (
         'family': ('Muli', sans-serif),
         'url': 'Muli:300,300i,400,400i,700,700i',
     ),
+    'Cormorant Garamond': (
+        'family': ('Cormorant Garamond', serif),
+        'url': 'Cormorant+Garamond:300,300i,400,400i,700,700i',
+    ),
 );
 
 //------------------------------------------------------------------------------
@@ -54,9 +60,9 @@ $o-theme-font-configs: (
 
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'orchid-1',
+        'color-palettes-name': 'orchid-7',
         'font': 'Questrial',
-        'headings-font': 'Questrial',
+        'headings-font': 'Cormorant Garamond',
         'navbar-font': 'Questrial',
         'buttons-font': 'Questrial',
         'header-template': 'default',
@@ -97,6 +103,9 @@ $o-color-palettes-compatibility-indexes: (
 //------------------------------------------------------------------------------
 
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/05', (1: 4, 5: 4));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/04', (5: 4));
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/07', (3: 4));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/22', (3: 3));
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/23', (3: 1));
-$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/01_001', (3: 1));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/01_001', (3: 2));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/12', (2: 2, 5: 4));
diff --git a/theme_orchid/views/images.xml b/theme_orchid/views/images.xml
index a0e71b455..6ccb99e56 100644
--- a/theme_orchid/views/images.xml
+++ b/theme_orchid/views/images.xml
@@ -1,174 +1,214 @@
 <?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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_parallax.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_orchid/static/src/img/snippets/s_media_list_3.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_orchid/static/src/img/snippets/s_carousel_2.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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_parallax.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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_product_6.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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_parallax.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_orchid/static/src/img/snippets/s_media_list_3.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_orchid/static/src/img/snippets/s_carousel_2.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_orchid/static/src/img/snippets/s_picture.jpg</field>
+</record>
+<record id="s_three_columns_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_1</field>
+    <field name="name">website.s_three_columns_default_image_1</field>
+    <field name="url">/theme_orchid/static/src/img/snippets/library_image_11.jpg</field>
+</record>
+<record id="s_three_columns_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_2</field>
+    <field name="name">website.s_three_columns_default_image_2</field>
+    <field name="url">/theme_orchid/static/src/img/snippets/library_image_13.jpg</field>
+</record>
+<record id="s_three_columns_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_3</field>
+    <field name="name">website.s_three_columns_default_image_3</field>
+    <field name="url">/theme_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_parallax.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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_product_6.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_orchid/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_orchid/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_orchid/static/src/img/snippets/s_newsletter.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_orchid/static/src/img/snippets/s_product_catalog_default_image.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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/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_orchid/static/src/img/snippets/library_image_16.jpg</field>
+</record>
+
+</odoo>
diff --git a/theme_orchid/views/snippets/s_banner.xml b/theme_orchid/views/snippets/s_banner.xml
new file mode 100644
index 000000000..4547195e4
--- /dev/null
+++ b/theme_orchid/views/snippets/s_banner.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- 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>
+    <!-- Jumbotron -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_orchid/views/snippets/s_call_to_action.xml b/theme_orchid/views/snippets/s_call_to_action.xml
index 2bd5e9e0d..e0ecc25c7 100644
--- a/theme_orchid/views/snippets/s_call_to_action.xml
+++ b/theme_orchid/views/snippets/s_call_to_action.xml
@@ -1,17 +1,16 @@
 <?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="pb48 o_cc1" remove="pb24 bg-200 o_cc3" separator=" "/>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//div[hasclass('col-lg-9')]" position="attributes">
-            <attribute name="class" add="pt16" remove="pb16" separator=" "/>
-        </xpath>
-        <xpath expr="//h3" position="replace">
-            <h3><b>There are always flowers</b> for those who want to see them.</h3>
-        </xpath>
-        <xpath expr="//p" position="replace"/>
-    </template>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb88 pt88" remove="pb24 pt48 bg-200" separator=" "/>
+    </xpath>
+    <!-- Title & paragraph -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        There are always flowers <br/>for those who want to see them.
+    </xpath>
+    <xpath expr="//p" position="replace"/>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_cover.xml b/theme_orchid/views/snippets/s_cover.xml
index afd88f9a4..9077859ca 100644
--- a/theme_orchid/views/snippets/s_cover.xml
+++ b/theme_orchid/views/snippets/s_cover.xml
@@ -1,22 +1,27 @@
 <?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_half_screen_height" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/01_001","flip":[]}</attribute>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//div[hasclass('container')]" position="replace">
-            <div class="container s_allow_columns">
-                <h1 style="text-align: center;">
-                    <font style="font-size: 62px;"><b>Live life in full bloom</b></font>
-                </h1>
-            </div>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//section/*[last()]" position="after">
-            <div class="o_we_shape o_web_editor_Wavy_01_001"/>
-        </xpath>
-    </template>
+
+<template id="s_cover" inherit_id="website.s_cover">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_half_screen_height" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/01_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_01_001"/>
+    </xpath>
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+        <attribute name="class" add="bg-black-25" remove="bg-black-50" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Live life in full bloom
+    </xpath>
+    <!-- Remove paragraphs & button -->
+    <xpath expr="//p[hasclass('lead')]" position="replace"/>
+    <xpath expr="//p" position="replace"/>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_image_text.xml b/theme_orchid/views/snippets/s_image_text.xml
index 6cac1da86..d0f10dee8 100644
--- a/theme_orchid/views/snippets/s_image_text.xml
+++ b/theme_orchid/views/snippets/s_image_text.xml
@@ -1,24 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_image_text" inherit_id="website.s_image_text">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/07","flip":["y"]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Wavy_07 o_we_flip_y"/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2>The Orchid Concept</h2>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p[1]" position="replace">
-            <p>From your local producer to your door, discover how we deliver happiness.</p>
-        </xpath>
-        <xpath expr="//p[2]" position="replace">
-            <p><br/></p>
-        </xpath>
-    </template>
+
+<template id="s_image_text" inherit_id="website.s_image_text">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pb104" remove="pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04 o_we_flip_x"/>
+    </xpath>
+    <!-- Text wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        The Orchid Concept
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p" position="replace" mode="inner">
+        <br/>
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        From your local producer to your door, discover how we deliver our multiple sorts of flowers and bring you happiness.
+    </xpath>
+    <!-- Img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_image_text_default_image/web_editor/float/flt_primary_1.svg?c1=o-color-2&amp;c2=o-color-2&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">web_editor/float/flt_primary_1</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_carousel_2.svg</attribute>
+        <attribute name="data-shape-colors">o-color-2;o-color-2;;;o-color-5</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_media_list.xml b/theme_orchid/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..aceeb18f5
--- /dev/null
+++ b/theme_orchid/views/snippets/s_media_list.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Item #1 -->
+    <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pb16 pt16 o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_img_wrapper')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_body')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+
+    <!-- Item #2 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][2]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pb16 pt16" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][2]/div" position="attributes">
+        <attribute name="class" add="flex-row-reverse" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_img_wrapper')])[2]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+
+    <!-- Item #3 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][3]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pb16 pt16 o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][3]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_img_wrapper')])[3]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_orchid/views/snippets/s_numbers.xml b/theme_orchid/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..1f1f6ae38
--- /dev/null
+++ b/theme_orchid/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/Floats/12","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_orchid/views/snippets/s_product_catalog.xml b/theme_orchid/views/snippets/s_product_catalog.xml
new file mode 100644
index 000000000..330ae083e
--- /dev/null
+++ b/theme_orchid/views/snippets/s_product_catalog.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_product_catalog" inherit_id="website.s_product_catalog">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
+    </xpath>
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-black-50"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_orchid/views/snippets/s_quotes_carousel.xml b/theme_orchid/views/snippets/s_quotes_carousel.xml
index 22f43c84a..073a18e9c 100644
--- a/theme_orchid/views/snippets/s_quotes_carousel.xml
+++ b/theme_orchid/views/snippets/s_quotes_carousel.xml
@@ -1,17 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
-        <!-- Quote 1 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace">
-            <p>A wide range of high quality products and a warm welcome! I recommend this shop 200%!</p>
-        </xpath>
-        <!-- Quote 2 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace">
-            <p>Very nice, colourful shop with many choices in the choir of a very pretty town.</p>
-        </xpath>
-        <!-- Quote 3 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace">
-            <p>A small shop with a very large selection of roses. Nice prices and above all a very professional and friendly welcome.</p>
-        </xpath>
-    </template>
+
+<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
+    <!-- Quotes carousel -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_22"/>
+    </xpath>
+    <!-- Quote 1 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
+        A wide range of high quality products and a warm welcome! I recommend this shop 200%!
+    </xpath>
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
+        <!-- Remove background image -->
+        <attribute name="style"/>
+    </xpath>
+
+    <!-- Quote 2 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace" mode="inner">
+        Very nice, colourful shop with many choices in the choir of a very pretty town.
+    </xpath>
+    <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
+        <!-- Remove background image -->
+        <attribute name="style"/>
+    </xpath>
+    <!-- Center the blockquote -->
+    <xpath expr="(//blockquote)[2]" position="attributes">
+        <attribute name="class" add="mx-auto" remove="mr-auto" separator=" "/>
+    </xpath>
+
+    <!-- Quote 3 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace" mode="inner">
+        A small shop with a very large selection of roses. Nice prices and above all a very professional and friendly welcome.
+    </xpath>
+    <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
+        <!-- Remove background image -->
+        <attribute name="style"/>
+    </xpath>
+    <!-- Center the blockquote -->
+    <xpath expr="(//blockquote)[3]" position="attributes">
+        <attribute name="class" add="mx-auto" remove="ml-auto" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_orchid/views/snippets/s_text_image.xml b/theme_orchid/views/snippets/s_text_image.xml
index 6cccd8a93..bc38678df 100644
--- a/theme_orchid/views/snippets/s_text_image.xml
+++ b/theme_orchid/views/snippets/s_text_image.xml
@@ -1,28 +1,48 @@
 <?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="pt64" remove="pt32" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/05","flip":["x"]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Wavy_05 o_we_flip_x"/>
-        </xpath>
-        <!-- Row -->
-        <xpath expr="//div[hasclass('row')]" position="attributes">
-            <attribute name="class" add="align-items-stretch" remove="align-items-center" separator=" "/>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[2]" position="attributes">
-            <attribute name="class" add="col-lg-8 p-3 o_cc o_cc5 " remove="col-lg-6 pt16 pb16" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-6')]" position="replace">
-            <div class="col-lg-4 p-5 o_cc o_cc5">
-                <h2>Our Mission</h2>
-                <p>Deliver flowers to live up to your dedication for your loved ones. To do so, we collaborate with local producers who care about the environment and cultivate their flowers with love.</p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/07","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_07 o_we_flip_x"/>
+    </xpath>
+    <!-- Row -->
+    <xpath expr="//div[hasclass('row')]" position="attributes">
+        <attribute name="class" add="align-items-stretch" remove="align-items-center" separator=" "/>
+    </xpath>
+    <!-- Text wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="col-lg-4 px-5 o_cc o_cc5 rounded pt56 pb56" remove="col-lg-6 pt16 pb16" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Our Mission
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p" position="replace" mode="inner">
+        <br/>
+        Deliver flowers to live up to your dedication for your loved ones.
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        To do so, we collaborate with local producers who care about the environment and cultivate their flowers with love.
+    </xpath>
+    <!-- Img wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="col-lg-7 offset-lg-1" remove="col-lg-6" separator=" "/>
+    </xpath>
+    <!-- Img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/solid/sld_blob_shadow_2.svg?c2=o-color-2</attribute>
+        <attribute name="data-shape">web_editor/solid/sld_blob_shadow_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_orchid/views/snippets/s_three_columns.xml b/theme_orchid/views/snippets/s_three_columns.xml
index c2387d7d9..2bec381f8 100644
--- a/theme_orchid/views/snippets/s_three_columns.xml
+++ b/theme_orchid/views/snippets/s_three_columns.xml
@@ -1,43 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_three_columns" inherit_id="website.s_three_columns">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/23","flip":[]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Wavy_23"/>
-        </xpath>
-        <!-- Container -->
-        <xpath expr="//div[hasclass('container')]" position="attributes">
-            <attribute name="class" add="container-fluid" remove="container" separator=" "/>
-        </xpath>
-        <!-- Row -->
-        <xpath expr="//div[hasclass('row')]" position="attributes">
-            <attribute name="class" add="px-3" remove="container" separator=" "/>
-        </xpath>
-        <!-- Column 1 -->
-        <xpath expr="//div[hasclass('card-body')]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Local Producers</h3>
-                <p class="card-text">As we use local growers, our flowers last longer and smell better. Just like the event you want to celebrate with flowers!</p>
-            </div>
-        </xpath>
-        <!-- Column 2 -->
-        <xpath expr="(//div[hasclass('card-body')])[2]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Bio Flowers</h3>
-                <p class="card-text">Don't offer pesticides to your beloved one! By choosing our flowers, we guarantee you organic flowers.</p>
-            </div>
-        </xpath>
-        <!-- Column 3 -->
-        <xpath expr="(//div[hasclass('card-body')])[3]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Eco-Friendly Packaging</h3>
-                <p class="card-text">We use 100% recycled materials. We believe the best gifts should also do good for the planet.</p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_three_columns" inherit_id="website.s_three_columns">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_04"/>
+    </xpath>
+    <!-- Row -->
+    <xpath expr="//div[hasclass('row')]" position="attributes">
+        <attribute name="class" add="align-items-end" remove="align-items-stretch" separator=" "/>
+    </xpath>
+
+    <!-- Column 1 -->
+    <xpath expr="//div[hasclass('card')]" position="attributes">
+        <attribute name="style">border-width: 0px !important;</attribute>
+    </xpath>
+    <!-- Column 1 - Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        Local Producers
+    </xpath>
+    <!-- Column 1 - Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        As we use local growers, our flowers last longer and smell better. Just like the event you want to celebrate with flowers!
+    </xpath>
+    <!-- Column 1 - Img -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_three_columns_default_image_1/web_editor/float/flt_square_1.svg?c1=o-color-1&amp;c2=o-color-2</attribute>
+        <attribute name="data-shape">web_editor/float/flt_square_1</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">library_image_11.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;o-color-2;;;</attribute>
+    </xpath>
+
+    <!-- Column 2 -->
+    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
+        <attribute name="style">border-width: 0px !important;</attribute>
+    </xpath>
+    <!-- Column 2 - Title -->
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Bio Flowers
+    </xpath>
+    <!-- Column 2 - Paragraph -->
+    <xpath expr="(//p)[2]" position="replace" mode="inner">
+        Don't offer pesticides to your beloved one! By choosing our flowers, we guarantee you organic flowers.
+    </xpath>
+    <!-- Column 2 - Img -->
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_three_columns_default_image_2/web_editor/float/flt_square_3.svg?c1=o-color-1&amp;c5=o-color-5</attribute>
+        <attribute name="data-shape">web_editor/float/flt_square_3</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">library_image_13.svg</attribute>
+        <attribute name="data-shape-colors">o-color-1;;;;o-color-5</attribute>
+    </xpath>
+
+    <!-- Column 3 -->
+    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
+        <attribute name="style">border-width: 0px !important;</attribute>
+    </xpath>
+    <!-- Column 3 - Title -->
+    <xpath expr="(//h3)[3]" position="replace" mode="inner">
+        Eco-Friendly Packaging
+    </xpath>
+    <!-- Column 3 - Paragraph -->
+    <xpath expr="(//p)[3]" position="replace" mode="inner">
+        We use 100% recycled materials. We believe the best gifts should also do good for the planet.
+    </xpath>
+    <!-- Column 3 - Img -->
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_three_columns_default_image_3/web_editor/float/flt_square_2.svg?c2=o-color-1&amp;c5=o-color-2</attribute>
+        <attribute name="data-shape">web_editor/float/flt_square_2</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">library_image_07.svg</attribute>
+        <attribute name="data-shape-colors">;o-color-1;;;o-color-2</attribute>
+    </xpath>
+</template>
+
 </odoo>