diff --git a/theme_yes/__manifest__.py b/theme_yes/__manifest__.py
index 746cb59f6..f0abc273d 100644
--- a/theme_yes/__manifest__.py
+++ b/theme_yes/__manifest__.py
@@ -11,18 +11,40 @@
         'data/ir_asset.xml',
         'views/images.xml',
 
-        'views/snippets/s_carousel.xml',
-        'views/snippets/s_picture.xml',
-        'views/snippets/s_masonry_block.xml',
-        'views/snippets/s_three_columns.xml',
-        'views/snippets/s_quotes_carousel.xml',
+        'views/snippets/s_banner.xml',
         'views/snippets/s_call_to_action.xml',
-
-        ],
+        'views/snippets/s_carousel.xml',
+        'views/snippets/s_company_team.xml',
+        'views/snippets/s_cover.xml',
+        'views/snippets/s_image_text.xml',
+        'views/snippets/s_image_gallery.xml',
+        'views/snippets/s_images_wall.xml',
+        'views/snippets/s_masonry_block.xml',
+        'views/snippets/s_media_list.xml',
+        'views/snippets/s_picture.xml',
+        'views/snippets/s_popup.xml',
+        'views/snippets/s_quotes_carousel.xml',
+        'views/snippets/s_text_image.xml',
+        'views/snippets/s_three_columns.xml',
+        'views/snippets/s_title.xml',
+    ],
     'images': [
         'static/description/yes_description.png',
         'static/description/yes_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_cover_default_image': '/theme_yes/static/src/img/snippets/s_cover.jpg',
+        'website.s_media_list_default_image_1': '/theme_yes/static/src/img/snippets/s_media_list_1.jpg',
+        'website.s_media_list_default_image_2': '/theme_yes/static/src/img/snippets/s_media_list_2.jpg',
+        'website.s_media_list_default_image_3': '/theme_yes/static/src/img/snippets/s_media_list_3.jpg',
+        'website.s_quotes_carousel_demo_image_0': '/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg',
+        'website.library_image_10': '/theme_yes/static/src/img/snippets/library_image_10.jpg',
+        'website.library_image_05': '/theme_yes/static/src/img/snippets/library_image_05.jpg',
+        'website.library_image_08': '/theme_yes/static/src/img/snippets/library_image_08.jpg',
+        'website.library_image_13': '/theme_yes/static/src/img/snippets/library_image_13.jpg',
+        'website.library_image_03': '/theme_yes/static/src/img/snippets/library_image_03.jpg',
+        'website.library_image_02': '/theme_yes/static/src/img/snippets/library_image_02.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-yes.odoo.com',
     'assets': {
diff --git a/theme_yes/data/ir_asset.xml b/theme_yes/data/ir_asset.xml
index 74c87492c..fbf92852f 100644
--- a/theme_yes/data/ir_asset.xml
+++ b/theme_yes/data/ir_asset.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_yes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_yes.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_yes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_yes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_yes.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_yes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_yes.s_products_carousel_000_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_yes.s_products_carousel_000_variables_scss</field>
-            <field name="name">Products carousel 000 variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_yes/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_yes.s_products_carousel_000_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_yes.s_products_carousel_000_variables_scss</field>
+    <field name="name">Products carousel 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_yes/static/src/old_snippets/s_products_carousel/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_yes.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_yes.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_yes/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_yes.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_yes.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_yes/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_yes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_yes.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_yes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_yes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_yes.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_yes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_yes/models/theme_yes.py b/theme_yes/models/theme_yes.py
index 9631a4104..1303eddef 100644
--- a/theme_yes/models/theme_yes.py
+++ b/theme_yes/models/theme_yes.py
@@ -5,8 +5,5 @@ class ThemeYes(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_yes_post_copy(self, mod):
-
-        self.disable_view('website.template_footer_call_to_action')
-
-        self.enable_view('website.template_header_default')
+        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
diff --git a/theme_yes/static/description/yes_screenshot.jpg b/theme_yes/static/description/yes_screenshot.jpg
index 67b04f64b..0b6f933fd 100644
Binary files a/theme_yes/static/description/yes_screenshot.jpg and b/theme_yes/static/description/yes_screenshot.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_02.jpg b/theme_yes/static/src/img/snippets/library_image_02.jpg
new file mode 100644
index 000000000..101aa1d36
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_02.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_03.jpg b/theme_yes/static/src/img/snippets/library_image_03.jpg
new file mode 100644
index 000000000..8567470db
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_03.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_05.jpg b/theme_yes/static/src/img/snippets/library_image_05.jpg
new file mode 100644
index 000000000..981fc2c88
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_05.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_07.jpg b/theme_yes/static/src/img/snippets/library_image_07.jpg
index e82ad9079..4078986fb 100644
Binary files a/theme_yes/static/src/img/snippets/library_image_07.jpg and b/theme_yes/static/src/img/snippets/library_image_07.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_08.jpg b/theme_yes/static/src/img/snippets/library_image_08.jpg
new file mode 100644
index 000000000..0037502a5
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_08.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_10.jpg b/theme_yes/static/src/img/snippets/library_image_10.jpg
new file mode 100644
index 000000000..41cf68dc2
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_10.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_11.jpg b/theme_yes/static/src/img/snippets/library_image_11.jpg
index d020685f4..6b367d35a 100644
Binary files a/theme_yes/static/src/img/snippets/library_image_11.jpg and b/theme_yes/static/src/img/snippets/library_image_11.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_13.jpg b/theme_yes/static/src/img/snippets/library_image_13.jpg
index c5886d6a1..c0bca56ec 100644
Binary files a/theme_yes/static/src/img/snippets/library_image_13.jpg and b/theme_yes/static/src/img/snippets/library_image_13.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_14.jpg b/theme_yes/static/src/img/snippets/library_image_14.jpg
new file mode 100644
index 000000000..82e93ea0f
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_14.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_16.jpg b/theme_yes/static/src/img/snippets/library_image_16.jpg
new file mode 100644
index 000000000..7509e2a49
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_16.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_20.jpg b/theme_yes/static/src/img/snippets/library_image_20.jpg
new file mode 100644
index 000000000..e9c5f5d28
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_20.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_banner.jpg b/theme_yes/static/src/img/snippets/s_banner.jpg
index 314899af7..d1708f558 100644
Binary files a/theme_yes/static/src/img/snippets/s_banner.jpg and b/theme_yes/static/src/img/snippets/s_banner.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_carousel_1.jpg b/theme_yes/static/src/img/snippets/s_carousel_1.jpg
index 37ccc58c3..fc2d56647 100644
Binary files a/theme_yes/static/src/img/snippets/s_carousel_1.jpg and b/theme_yes/static/src/img/snippets/s_carousel_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_carousel_2.jpg b/theme_yes/static/src/img/snippets/s_carousel_2.jpg
index 692ceb7e4..46e91db31 100644
Binary files a/theme_yes/static/src/img/snippets/s_carousel_2.jpg and b/theme_yes/static/src/img/snippets/s_carousel_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_carousel_3.jpg b/theme_yes/static/src/img/snippets/s_carousel_3.jpg
index ad6c86e61..3452a128a 100644
Binary files a/theme_yes/static/src/img/snippets/s_carousel_3.jpg and b/theme_yes/static/src/img/snippets/s_carousel_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_cover.jpg b/theme_yes/static/src/img/snippets/s_cover.jpg
index c289a0e86..8ffdd42fa 100644
Binary files a/theme_yes/static/src/img/snippets/s_cover.jpg and b/theme_yes/static/src/img/snippets/s_cover.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_image_text.jpg b/theme_yes/static/src/img/snippets/s_image_text.jpg
index 6e14b29b1..0b1e82f87 100644
Binary files a/theme_yes/static/src/img/snippets/s_image_text.jpg and b/theme_yes/static/src/img/snippets/s_image_text.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_masonry_block.jpg b/theme_yes/static/src/img/snippets/s_masonry_block.jpg
index 700e0288b..4c67ba3c8 100644
Binary files a/theme_yes/static/src/img/snippets/s_masonry_block.jpg and b/theme_yes/static/src/img/snippets/s_masonry_block.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_media_list_1.jpg b/theme_yes/static/src/img/snippets/s_media_list_1.jpg
index 15f921304..8785d2ac2 100644
Binary files a/theme_yes/static/src/img/snippets/s_media_list_1.jpg and b/theme_yes/static/src/img/snippets/s_media_list_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_media_list_2.jpg b/theme_yes/static/src/img/snippets/s_media_list_2.jpg
index f98ed237e..0d1700648 100644
Binary files a/theme_yes/static/src/img/snippets/s_media_list_2.jpg and b/theme_yes/static/src/img/snippets/s_media_list_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_media_list_3.jpg b/theme_yes/static/src/img/snippets/s_media_list_3.jpg
index 162d79e97..554d73a01 100644
Binary files a/theme_yes/static/src/img/snippets/s_media_list_3.jpg and b/theme_yes/static/src/img/snippets/s_media_list_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_newsletter.jpg b/theme_yes/static/src/img/snippets/s_newsletter.jpg
index 9ef56dcb8..5d5213f8d 100644
Binary files a/theme_yes/static/src/img/snippets/s_newsletter.jpg and b/theme_yes/static/src/img/snippets/s_newsletter.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_parallax.jpg b/theme_yes/static/src/img/snippets/s_parallax.jpg
index c5d4f7e78..5ebe63ff8 100644
Binary files a/theme_yes/static/src/img/snippets/s_parallax.jpg and b/theme_yes/static/src/img/snippets/s_parallax.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_picture.jpg b/theme_yes/static/src/img/snippets/s_picture.jpg
index 9d7b0b3e6..05d5b5289 100644
Binary files a/theme_yes/static/src/img/snippets/s_picture.jpg and b/theme_yes/static/src/img/snippets/s_picture.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_popup.jpg b/theme_yes/static/src/img/snippets/s_popup.jpg
index a63951b14..48012a0e3 100644
Binary files a/theme_yes/static/src/img/snippets/s_popup.jpg and b/theme_yes/static/src/img/snippets/s_popup.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_1.jpg b/theme_yes/static/src/img/snippets/s_product_1.jpg
index 7de8ab040..97c03a226 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_1.jpg and b/theme_yes/static/src/img/snippets/s_product_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_2.jpg b/theme_yes/static/src/img/snippets/s_product_2.jpg
index aed2543b5..174b5798f 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_2.jpg and b/theme_yes/static/src/img/snippets/s_product_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_3.jpg b/theme_yes/static/src/img/snippets/s_product_3.jpg
index 41c01a3f0..65e7d843e 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_3.jpg and b/theme_yes/static/src/img/snippets/s_product_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_4.jpg b/theme_yes/static/src/img/snippets/s_product_4.jpg
index 0b5401602..3b3c74147 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_4.jpg and b/theme_yes/static/src/img/snippets/s_product_4.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_5.jpg b/theme_yes/static/src/img/snippets/s_product_5.jpg
index 25bed8082..90562220d 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_5.jpg and b/theme_yes/static/src/img/snippets/s_product_5.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_product_catalog.jpg b/theme_yes/static/src/img/snippets/s_product_catalog.jpg
index 0c8c1f6ae..f38e0ba6b 100644
Binary files a/theme_yes/static/src/img/snippets/s_product_catalog.jpg and b/theme_yes/static/src/img/snippets/s_product_catalog.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg
index 3b40c18ce..0031e482e 100644
Binary files a/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg and b/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_2.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_2.jpg
index 8f47ea813..86c6d7db3 100644
Binary files a/theme_yes/static/src/img/snippets/s_quotes_carousel_2.jpg and b/theme_yes/static/src/img/snippets/s_quotes_carousel_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_3.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_3.jpg
new file mode 100644
index 000000000..fb45c6d7f
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_quotes_carousel_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_1.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_1.jpg
new file mode 100644
index 000000000..4ff12c2a0
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_2.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_2.jpg
new file mode 100644
index 000000000..bf778dcd3
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_3.jpg b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_3.jpg
new file mode 100644
index 000000000..71cb0b139
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_text_image.jpg b/theme_yes/static/src/img/snippets/s_text_image.jpg
index 34b9420fc..f0ebd3a8a 100644
Binary files a/theme_yes/static/src/img/snippets/s_text_image.jpg and b/theme_yes/static/src/img/snippets/s_text_image.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_three_columns_default_image_1.jpg b/theme_yes/static/src/img/snippets/s_three_columns_default_image_1.jpg
new file mode 100644
index 000000000..776b03785
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_three_columns_default_image_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_three_columns_default_image_2.jpg b/theme_yes/static/src/img/snippets/s_three_columns_default_image_2.jpg
new file mode 100644
index 000000000..ce965742b
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_three_columns_default_image_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_three_columns_default_image_3.jpg b/theme_yes/static/src/img/snippets/s_three_columns_default_image_3.jpg
new file mode 100644
index 000000000..7086feb62
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_three_columns_default_image_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/uiface_1.jpg b/theme_yes/static/src/img/snippets/uiface_1.jpg
index df912971a..c04851b3b 100644
Binary files a/theme_yes/static/src/img/snippets/uiface_1.jpg and b/theme_yes/static/src/img/snippets/uiface_1.jpg differ
diff --git a/theme_yes/static/src/img/snippets/uiface_2.jpg b/theme_yes/static/src/img/snippets/uiface_2.jpg
index 103e3fd27..46f7fef48 100644
Binary files a/theme_yes/static/src/img/snippets/uiface_2.jpg and b/theme_yes/static/src/img/snippets/uiface_2.jpg differ
diff --git a/theme_yes/static/src/img/snippets/uiface_3.jpg b/theme_yes/static/src/img/snippets/uiface_3.jpg
index 545aec18f..103e3fd27 100644
Binary files a/theme_yes/static/src/img/snippets/uiface_3.jpg and b/theme_yes/static/src/img/snippets/uiface_3.jpg differ
diff --git a/theme_yes/static/src/img/snippets/uiface_4.jpg b/theme_yes/static/src/img/snippets/uiface_4.jpg
index ac04856f1..1ab82bca7 100644
Binary files a/theme_yes/static/src/img/snippets/uiface_4.jpg and b/theme_yes/static/src/img/snippets/uiface_4.jpg differ
diff --git a/theme_yes/static/src/js/tour.js b/theme_yes/static/src/js/tour.js
index e7c9056a6..f5c19492a 100644
--- a/theme_yes/static/src/js/tour.js
+++ b/theme_yes/static/src/js/tour.js
@@ -1,48 +1,41 @@
-odoo.define("theme_yes.tour.yes", function (require) {
-"use strict";
+/** @odoo-module */
 
-const core = require("web.core");
-const _t = core._t;
-const wTourUtils = require("website.tour_utils");
-var tour = require("web_tour.tour");
+import wTourUtils from 'website.tour_utils';
 
 const snippets = [
     {
-        id: 's_carousel',
-        name: 'Carousel',
+        id: 's_cover',
+        name: 'Cover',
     },
     {
-        id: 's_picture',
-        name: 'Picture',
+        id: 's_title',
+        name: 'Title',
     },
     {
-        id: 's_masonry_block',
-        name: 'Masonry',
+        id: 's_company_team',
+        name: 'Team',
     },
     {
-        id: 's_three_columns',
-        name: 'Columns',
+        id: 's_media_list',
+        name: 'Media List',
+    },
+    {
+        id: 's_images_wall',
+        name: 'Images Wall',
     },
     {
         id: 's_quotes_carousel',
         name: 'Quotes',
     },
-    {
-        id: 's_call_to_action',
-        name: 'Call to Action',
-    },
 ];
 
 wTourUtils.registerThemeHomepageTour("yes_tour", [
     wTourUtils.dragNDrop(snippets[0]),
-    wTourUtils.clickOnText(snippets[0], 'h2'),
-    wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[1]),
+    wTourUtils.clickOnText(snippets[1], 'h1'),
+    wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[2]),
     wTourUtils.dragNDrop(snippets[3]),
     wTourUtils.dragNDrop(snippets[4]),
     wTourUtils.dragNDrop(snippets[5]),
-    wTourUtils.clickOnSnippet(snippets[5]),
-    wTourUtils.changeOption('ScrollButton', 'we-button-group.o_we_user_value_widget', _t('height')),
 ]);
-});
diff --git a/theme_yes/static/src/scss/primary_variables.scss b/theme_yes/static/src/scss/primary_variables.scss
index 2fbabe47b..e5b6ccb75 100644
--- a/theme_yes/static/src/scss/primary_variables.scss
+++ b/theme_yes/static/src/scss/primary_variables.scss
@@ -10,56 +10,61 @@ $o-theme-h5-font-size-multiplier: (14 / 12);
 $o-theme-h6-font-size-multiplier: 1;
 
 $o-theme-font-configs: (
-    'Spartan': (
-        'family': ('Spartan', sans-serif),  // font update - SinKinSans -> Spartan
-        'url': 'Spartan:300,300i,400,400i,700,700i',
+    'Playfair Display': (
+        'family': ('Playfair Display', script),
+        'url': 'Playfair+Display:400,400i,500,500i,600,600i,700,700i,800,800i',
+
     ),
-    'Rajdhani': (
-        'family': ('Rajdhani', sans-serif),
-        'url': 'Rajdhani:300,300i,400,400i,700,700i',
+    'Bodoni Moda': (
+        'family': ('Bodoni Moda', script),
+        'url': 'Bodoni+Moda:400,400i,600,600i,800,800i',
+    ),
+    'Petit Formal Script': (
+        'family': ('Petit Formal Script', cursive),
+        'url': 'Petit+Formal+Script',
+    ),
+    'Dancing Script': (
+        'family': ('Dancing Script', cursive),
+        'url': 'Dancing+Script:400,600,700',
     ),
     'Roboto': (
         'family': ('Roboto', sans-serif),
         'url': 'Roboto:300,300i,400,400i,700,700i',
     ),
-    'Source Sans Pro': (
-        'family': ('Source Sans Pro', sans-serif),
-        'url': 'Source+Sans+Pro:300,300i,400,400i,700,700i',
-    ),
-    'Ubuntu': (
-        'family': ('Ubuntu', sans-serif),
-        'url': 'Ubuntu:300,300i,400,400i,700,700i',
-    ),
     'Lato': (
         'family': ('Lato', sans-serif),
         'url': 'Lato:300,300i,400,400i,700,700i',
     ),
-    'Playfair Display': (
-        'family': ('Playfair Display', serif),
-        'url': 'Playfair+Display:300,300i,400,400i,700,700i',
+    'Open Sans': (
+        'family': ('Open Sans', sans-serif),
+        'url': 'Open+Sans:300,300i,400,400i,700,700i',
     ),
-    'Lora': (
-        'family': ('Lora', serif),
-        'url': 'Lora:300,300i,400,400i,700,700i',
+    'Raleway': (
+        'family': ('Raleway', sans-serif),
+        'url': 'Raleway:300,300i,400,400i,700,700i',
     ),
-    'Barlow Condensed': (
-        'family': ('Barlow Condensed', sans-serif),
-        'url': 'Barlow+Condensed:300,300i,400,400i,700,700i',
+    'Quicksand': (
+        'family': ('Quicksand', sans-serif),
+        'url': 'Quicksand:300,300i,400,400i,700,700i',
     ),
 );
 
+//------------------------------------------------------------------------------
+// Default Values Override
+//------------------------------------------------------------------------------
+
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'yes-1',
-        'font': 'Lora',
-        'headings-font': 'Lora',
-        'navbar-font': 'Lora',
-        'buttons-font': 'Lora',
-        'header-template': 'default',
-        'footer-template': 'descriptive',
-        'header-links-style': 'border-bottom',
-        'logo-height': 3rem,
-        'fixed-logo-height': 3rem,
+        'color-palettes-name':              'yes-3',
+        'font':                             'Quicksand',
+        'headings-font':                    'Playfair Display',
+        'navbar-font':                      'Quicksand',
+        'buttons-font':                     'Quicksand',
+        'footer-template':                  'descriptive',
+        'btn-border-radius':                10rem,
+        'btn-border-radius-sm':             10rem,
+        'btn-border-radius-lg':             10rem,
+        'btn-ripple':                       true,
     ),
 );
 
@@ -88,3 +93,14 @@ $o-color-palettes-compatibility-indexes: (
     20: 'generic-16',
     21: 'generic-17',
 );
+
+//------------------------------------------------------------------------------
+// Bootstrap Overrides
+//------------------------------------------------------------------------------
+$carousel-indicator-width:  10px;
+$border-radius:             4px;
+
+//-----------------------------------------------------------------------------
+// Shapes
+//-----------------------------------------------------------------------------
+$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Origins/14_001', 'second', (3:1, 4:2));
diff --git a/theme_yes/views/images.xml b/theme_yes/views/images.xml
index 43444a804..776c92605 100644
--- a/theme_yes/views/images.xml
+++ b/theme_yes/views/images.xml
@@ -1,217 +1,272 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Not used anymore by the editor: files and records kept for back-compatibility.
-    Check in theme_kea's primary_variables.scss, theme.scss and theme_common's mixins.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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/static/src/img/snippets/s_parallax.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_yes/static/src/img/snippets/uiface_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_yes/static/src/img/snippets/uiface_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_yes/static/src/img/snippets/uiface_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_yes/static/src/img/snippets/uiface_4.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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/static/src/img/snippets/s_quotes_carousel_2.jpg</field>
-    </record>
-    <record id="s_quotes_carousel_demo_image_3" model="theme.ir.attachment">
-        <field name="key">website.s_quotes_carousel_demo_image_3</field>
-        <field name="name">website.s_quotes_carousel_demo_image_3</field>
-        <field name="url">/theme_yes/static/src/img/snippets/uiface_3.jpg</field>
-    </record>
-    <record id="s_quotes_carousel_demo_image_4" model="theme.ir.attachment">
-        <field name="key">website.s_quotes_carousel_demo_image_4</field>
-        <field name="name">website.s_quotes_carousel_demo_image_4</field>
-        <field name="url">/theme_yes/static/src/img/snippets/uiface_1.jpg</field>
-    </record>
-    <record id="s_quotes_carousel_demo_image_5" model="theme.ir.attachment">
-        <field name="key">website.s_quotes_carousel_demo_image_5</field>
-        <field name="name">website.s_quotes_carousel_demo_image_5</field>
-        <field name="url">/theme_yes/static/src/img/snippets/uiface_4.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_yes/static/src/img/snippets/s_newsletter.jpg</field>
-    </record>
-    <record id="s_blockquote_avatar" model="theme.ir.attachment">
-        <field name="key">website.s_blockquote_default_image</field>
-        <field name="name">website.s_blockquote_default_image</field>
-        <field name="url">/theme_yes/static/src/img/snippets/uiface_2.jpg</field>
-    </record>
+<!-- Not used anymore by the editor: files and records kept for back-compatibility.
+Check in theme_kea's primary_variables.scss, theme.scss and theme_common's mixins.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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/static/src/img/content/content_img_12.jpg</field>
+</record>
+
+<!-- SNIPPETS -->
+<!-- // Banner // -->
+<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_yes/static/src/img/snippets/s_banner.jpg</field>
+</record>
+<!-- // Popup // -->
+<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_yes/static/src/img/snippets/s_popup.jpg</field>
+</record>
+<!-- // Cover // -->
+<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_yes/static/src/img/snippets/s_cover.jpg</field>
+</record>
+<!-- // Text - Image // -->
+<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_yes/static/src/img/snippets/s_text_image.jpg</field>
+</record>
+<!-- // Image - Text // -->
+<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_yes/static/src/img/snippets/s_image_text.jpg</field>
+</record>
+<!-- // Picture // -->
+<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_yes/static/src/img/snippets/s_picture.jpg</field>
+</record>
+<!-- // Image Gallery // -->
+<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_yes/static/src/img/snippets/library_image_02.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_yes/static/src/img/snippets/library_image_08.jpg</field>
+</record>
+<!-- // Image Wall // -->
+<record id="library_image_03" model="theme.ir.attachment"><!-- also used in images_gallery snippet -->
+    <field name="key">website.library_image_03</field>
+    <field name="name">website.library_image_03</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_03.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_yes/static/src/img/snippets/library_image_10.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_yes/static/src/img/snippets/library_image_13.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_yes/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_yes/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_yes/static/src/img/snippets/library_image_16.jpg</field>
+</record>
+<record id="library_image_20" model="theme.ir.attachment">
+    <field name="key">website.library_image_20</field>
+    <field name="name">website.library_image_20</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_20.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_yes/static/src/img/snippets/s_masonry_block.jpg</field>
+</record>
+<!-- // Carousel // -->
+<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_yes/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_yes/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_yes/static/src/img/snippets/s_carousel_3.jpg</field>
+</record>
+<!-- // Three Columns // -->
+<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_yes/static/src/img/snippets/s_three_columns_default_image_1.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_yes/static/src/img/snippets/s_three_columns_default_image_2.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_yes/static/src/img/snippets/s_three_columns_default_image_3.jpg</field>
+</record>
+<!-- // Media List // -->
+<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_yes/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_yes/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_yes/static/src/img/snippets/s_media_list_3.jpg</field>
+</record>
+<!-- // Parallax // -->
+<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_yes/static/src/img/snippets/s_parallax.jpg</field>
+</record>
+<!-- // Company Team // -->
+<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_yes/static/src/img/snippets/uiface_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_yes/static/src/img/snippets/uiface_2.jpg</field>
+</record>
+<!-- // Products Catalog // -->
+<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_yes/static/src/img/snippets/s_product_catalog.jpg</field>
+</record>
+<!-- // Product List // -->
+<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_yes/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_yes/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_yes/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_yes/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_yes/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_yes/static/src/img/snippets/s_product_6.jpg</field>
+</record>
+<!-- // Quotes Carousel - Background // -->
+<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_yes/static/src/img/snippets/s_quotes_carousel_1.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_yes/static/src/img/snippets/s_quotes_carousel_2.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_yes/static/src/img/snippets/s_quotes_carousel_3.jpg</field>
+</record>
+<!-- // Quotes Carousel - Avatars // -->
+<record id="s_quotes_carousel_demo_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_3</field>
+    <field name="name">website.s_quotes_carousel_demo_image_3</field>
+    <field name="url">/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_1.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_4</field>
+    <field name="name">website.s_quotes_carousel_demo_image_4</field>
+    <field name="url">/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_2.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_5</field>
+    <field name="name">website.s_quotes_carousel_demo_image_5</field>
+    <field name="url">/theme_yes/static/src/img/snippets/s_quotes_carousel_avatar_3.jpg</field>
+</record>
+<!-- // Newsletter // -->
+<record id="s_newsletter_block" model="theme.ir.attachment">
+    <field name="key">website.s_newsletter_block</field>
+    <field name="name">website.s_newsletter_block</field>
+    <field name="url">/theme_yes/static/src/img/snippets/s_newsletter.jpg</field>
+</record>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_banner.xml b/theme_yes/views/snippets/s_banner.xml
new file mode 100644
index 000000000..6b9964bf7
--- /dev/null
+++ b/theme_yes/views/snippets/s_banner.xml
@@ -0,0 +1,21 @@
+<?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="o_half_screen_height" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <!-- Filter & shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+        <div class="o_we_shape o_web_editor_Origins_14_001"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1//font" position="replace" mode="inner">
+        Just as you dreamt it.
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_call_to_action.xml b/theme_yes/views/snippets/s_call_to_action.xml
index 8de987386..31e31fddd 100644
--- a/theme_yes/views/snippets/s_call_to_action.xml
+++ b/theme_yes/views/snippets/s_call_to_action.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_call_to_action" inherit_id="website.s_call_to_action">
-        <!-- Paragraph -->
-        <xpath expr="//h3" position="replace">
-            <h3><b>345 couples</b> trusted us to organize their wedding.</h3>
-        </xpath>
-        <xpath expr="//p" position="replace">
-            <p>Join them and let us help you make this day unforgettable.</p>
-        </xpath>
-    </template>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <!-- Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        <b>345 couples</b> trusted us to organize their wedding.
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Join them and let us help you make this day unforgettable.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_carousel.xml b/theme_yes/views/snippets/s_carousel.xml
index 60741e2fe..5bbfea342 100644
--- a/theme_yes/views/snippets/s_carousel.xml
+++ b/theme_yes/views/snippets/s_carousel.xml
@@ -1,30 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_carousel" inherit_id="website.s_carousel">
-        <!-- Slide 1 -->
-        <xpath expr="//div[hasclass('carousel-content')]" position="replace">
-            <div class="jumbotron o_cc o_cc1 p-5 carousel-content col-lg-6">
-                <!-- Paragraph -->
-                <h2 style="font-size: 62px; line-height: 64px;">A touch of Magic</h2>
-                <p><br/></p>
-                <p class="lead">We are focused on providing high-quality service and customer satisfaction.</p>
-            </div>
-        </xpath>
-        <!-- Slide 2 -->
-        <xpath expr="(//div[hasclass('carousel-content')])[2]" position="replace">
-            <div class="jumbotron o_cc o_cc1 p-5 mt64 carousel-content col-lg-8 offset-lg-2 text-center">
-                <h2 style="font-size: 62px;">Ideas and tips</h2>
-                <p><br/></p>
-                <p class="lead">Get inspired with the latest trends and advice from our wedding experts.</p>
-            </div>
-        </xpath>
-        <!-- Slide 3 -->
-        <xpath expr="(//div[hasclass('carousel-content')])[3]" position="replace">
-            <div class="jumbotron o_cc o_cc1 p-5 carousel-content col-lg-8 offset-lg-4 py-5">
-                <h2 style="font-size: 62px; line-height: 64px;">Plan your destination</h2>
-                <p><br/></p>
-                <p class="lead">No matter where in the world you want to get married. Our directory of international wedding professionals can help you celebrate.</p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_carousel" inherit_id="website.s_carousel">
+    <!-- Slide 1 -->
+    <xpath expr="(//*[hasclass('container')])" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="//div[hasclass('carousel-content')]" position="replace">
+        <div class="jumbotron o_cc o_cc1 p-5 carousel-content col-lg-8 offset-lg-2 text-center rounded">
+            <h2>Let us plan your perfect day</h2>
+            <p class="lead">We are focused on providing high-quality service and customer satisfaction.</p>
+            <a href="/contactus" class="btn btn-primary">Get in touch</a>
+        </div>
+    </xpath>
+    <!-- Slide 2 -->
+    <xpath expr="(//*[hasclass('container')])[2]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="//*[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="class" add="pt152 pb152" remove="pt96 pb96" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('carousel-content')])[2]" position="replace">
+        <div class="jumbotron o_cc o_cc3 p-5 carousel-content col-lg-8 offset-lg-2 text-center rounded">
+            <h2>View our blog for inspiration</h2>
+            <p class="lead">Get inspired with the latest trends and advice from our wedding experts.</p>
+            <a href="#" class="btn btn-primary">See the blog</a>
+        </div>
+    </xpath>
+    <!-- Slide 3 -->
+    <xpath expr="(//*[hasclass('container')])[3]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="//*[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="class" add="pt152 pb152" remove="pt128 pb128" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('carousel-content')])[3]" position="replace">
+        <div class="jumbotron o_cc o_cc4 p-5 carousel-content col-lg-8 offset-lg-2 text-center rounded">
+            <h2>Check out our gallery</h2>
+            <p class="lead">Take a look at some of our favourite weddings.</p>
+            <a href="#" class="btn btn-primary">View our work</a>
+        </div>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_company_team.xml b/theme_yes/views/snippets/s_company_team.xml
new file mode 100644
index 000000000..1a395b87d
--- /dev/null
+++ b/theme_yes/views/snippets/s_company_team.xml
@@ -0,0 +1,34 @@
+<?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="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_14_001 o_second_extra_shape_mapping bg-o-color-3"/>
+    </xpath>
+    <!-- Row #1 - Col #1 -->
+    <xpath expr="//h4" position="replace" mode="inner">
+        Livia Sailor
+    </xpath>
+    <xpath expr="//p" position="replace">
+        <p><font style="font-weight: bolder;" class="text-o-color-1">The Founder &amp; Planner</font></p>
+        <p>Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.</p>
+    </xpath>
+    <!-- Row #1 - Col #2 -->
+    <xpath expr="(//h4)[2]" position="replace" mode="inner">
+        Clair Stark
+    </xpath>
+    <xpath expr="(//p)[3]" position="replace">
+        <p><font style="font-weight: bolder;" class="text-o-color-1">The Designer</font></p>
+        <p>As a passionate wedding designer with a romantic soul, Clair adores celebrating the special moments in life in magical places and creating an authentic experience for couples. </p>
+    </xpath>
+    <!-- Row -->
+    <xpath expr="//*[hasclass('col-lg-6')][4]" position="replace"/>
+    <xpath expr="//*[hasclass('col-lg-6')][3]" position="replace"/>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_cover.xml b/theme_yes/views/snippets/s_cover.xml
new file mode 100644
index 000000000..0540075a6
--- /dev/null
+++ b/theme_yes/views/snippets/s_cover.xml
@@ -0,0 +1,35 @@
+<?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 pt208 pb256" remove="pt96 pb96" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
+    </xpath>
+    <!-- Filter & shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+        <div class="o_we_shape o_web_editor_Origins_14_001"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        <font style="font-size: 92px; font-weight: bold;">Once in a lifetime moments</font>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        You focus on the big day, let us focus on you.
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//a//t" position="replace" mode="inner">
+        Meet us
+    </xpath>
+    <!-- Scroll Down Button -->
+    <xpath expr="//*[hasclass('container')]" position="after">
+        <a class="o_scroll_button rounded-circle align-items-center justify-content-center mx-auto mb-5 text-white" href="#" title="" style="background-color: rgba(25, 41, 37, 0.55) !important;" data-original-title="Scroll down to next section">
+            <i class="fa fa-chevron-down fa-1x"></i>
+        </a>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_image_gallery.xml b/theme_yes/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..946c3302f
--- /dev/null
+++ b/theme_yes/views/snippets/s_image_gallery.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_image_gallery" inherit_id="website.s_image_gallery">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="s_image_gallery_indicators_dots" remove="s_image_gallery_indicators_rounded" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12", "flip":["x","y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12 o_we_flip_x o_we_flip_y"/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//*[hasclass('container')]" position="attributes">
+        <attribute name="class" add="o_container_small" remove="container" separator=" "/>
+    </xpath>
+    <!-- Images -->
+    <xpath expr="//*[hasclass('carousel-item')]//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('carousel-item')][2]//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('carousel-item')][3]//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_image_text.xml b/theme_yes/views/snippets/s_image_text.xml
new file mode 100644
index 000000000..f040c23ce
--- /dev/null
+++ b/theme_yes/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">
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Find a venue
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_images_wall.xml b/theme_yes/views/snippets/s_images_wall.xml
new file mode 100644
index 000000000..61fce6484
--- /dev/null
+++ b/theme_yes/views/snippets/s_images_wall.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+    <!-- Images -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[2]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[3]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[4]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[5]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//img)[6]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_masonry_block.xml b/theme_yes/views/snippets/s_masonry_block.xml
index f6bf7dec9..aa2316d28 100644
--- a/theme_yes/views/snippets/s_masonry_block.xml
+++ b/theme_yes/views/snippets/s_masonry_block.xml
@@ -1,25 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
-        <!-- Column 1 -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[3]" position="replace">
-            <div class="col-lg-6 o_cc o_cc4 text-center">
-                <h3><em>Sparkling, dynamic and smiling.</em></h3>
-            </div>
-        </xpath>
-        <!-- Column 2 -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[4]" position="replace">
-            <div class="col-lg-6 o_cc o_cc4"></div>
-        </xpath>
-        <!-- Column 3 -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[5]" position="replace">
-            <div class="col-lg-6 o_cc o_cc1"></div>
-        </xpath>
-        <!-- Column 4 -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[6]" position="replace">
-            <div class="col-lg-6 o_cc o_cc1 text-center">
-                <h3><em>Warm, attentive and caring.</em></h3>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
+    <!-- Col #1 - Image Block -->
+    <xpath expr="//div[hasclass('oe_img_bg')]" position="attributes">
+        <attribute name="class" add="col-lg-4 border rounded" remove="col-lg-6" separator=" "/>
+        <attribute name="style" add="border-color: rgb(255, 255, 255) !important; border-width: 10px !important; border-radius: 14px !important;" separator="; "/>
+    </xpath>
+    <!-- Col #2 - Little Blocks -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="col-lg-8" remove="col-lg-6" separator=" "/>
+    </xpath>
+    <!-- Little block #01 - Main div -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-color: rgb(255, 255, 255) !important; border-width: 10px !important; border-radius: 14px !important;" separator="; "/>
+    </xpath>
+    <!-- Little block #01 - Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        Caterers
+    </xpath>
+    <!-- Little block #01 - Text -->
+    <xpath expr="//*[hasclass('col-lg-6')]//p" position="replace">
+        <p>Check out our list of favorite venues.</p>
+        <p><a href="#" class="btn btn-secondary rounded-circle">Find a venue</a></p>
+    </xpath>
+    <!-- Little block #02 - Main div -->
+    <xpath expr="(//*[hasclass('col-lg-6')])[2]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-color: rgb(255, 255, 255) !important; border-width: 10px !important; border-radius: 14px !important;" separator="; "/>
+    </xpath>
+    <!-- Little block #02 - Title -->
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Venues
+    </xpath>
+    <!-- Little block #02 - Text -->
+    <xpath expr="(//*[hasclass('col-lg-6')])[2]//p" position="replace">
+        <p>Checkout our list of favorite venues.</p>
+        <p><a href="#" class="btn btn-secondary">Find a venue</a></p>
+    </xpath>
+    <!-- Little block #03 - Main div -->
+    <xpath expr="(//*[hasclass('col-lg-6')])[3]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-color: rgb(255, 255, 255) !important; border-width: 10px !important; border-radius: 14px !important;" separator="; "/>
+    </xpath>
+    <!-- Little block #03 - Title -->
+    <xpath expr="(//h3)[3]" position="replace" mode="inner">
+        Attire
+    </xpath>
+    <!-- Little block #03 - Text -->
+    <xpath expr="(//*[hasclass('col-lg-6')])[3]//p" position="replace">
+        <p>Find the perfect outfit for before, during and after the main event.</p>
+        <p><a href="#" class="btn btn-primary">Shop</a></p>
+    </xpath>
+    <!-- Little block #04 - Main div -->
+    <xpath expr="(//div[hasclass('col-lg-6')])[4]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-color: rgb(255, 255, 255) !important; border-width: 10px !important; border-radius: 14px !important;" separator="; "/>
+    </xpath>
+    <!-- Little block #04 - Title -->
+    <xpath expr="(//h3)[4]" position="replace" mode="inner">
+        FAQ
+    </xpath>
+    <!-- Little block #04 - Text -->
+    <xpath expr="(//*[hasclass('col-lg-6')])[4]//p" position="replace">
+        <p>Find the answers to all your questions <br/>in our FAQ.</p>
+        <p><a href="#" class="btn btn-primary">Go to FAQ</a></p>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_media_list.xml b/theme_yes/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..a8ff0b72c
--- /dev/null
+++ b/theme_yes/views/snippets/s_media_list.xml
@@ -0,0 +1,73 @@
+<?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="pt64 pb64 o_cc1" remove="pt32 pb32 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>
+    <!-- Row #1 -->
+    <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
+        <attribute name="class" add="col-lg-8" remove="col-lg-12" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_item')])//div[hasclass('row')]" position="attributes">
+        <attribute name="class" add="flex-row-reverse shadow rounded" separator=" "/>
+    </xpath>
+    <!-- Row #1 - Text -->
+    <xpath expr="//div[hasclass('s_media_list_body')]" position="replace">
+        <div class="col-lg-9 s_media_list_body">
+            <h3 class="card-title"><span style="font-size: 36px;">Engagement ceremonies</span></h3>
+            <p class="card-text">We’ll help you mark the engagement milestone with an unforgettable ceremony.</p>
+            <a href="#" class="btn btn-outline-primary">Start planning your engagement</a>
+        </div>
+    </xpath>
+    <!-- Row #1 - Image -->
+    <xpath expr="(//div[hasclass('s_media_list_item')])//div[hasclass('s_media_list_img_wrapper')]" position="attributes">
+        <attribute name="class" add="col-lg-3" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <!-- Row #2 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][2]" position="attributes">
+        <attribute name="class" add="pt24 pb24 col-lg-8 offset-lg-2" remove="pt16 pb16 col-lg-12" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_item')])[2]//div[hasclass('row')]" position="attributes">
+        <attribute name="class" add="flex-row-reverse shadow rounded o_cc5" remove="o_cc1" separator=" "/>
+    </xpath>
+    <!-- Row #2 - Text -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]" position="replace">
+        <div class="col-lg-9 s_media_list_body">
+            <h3 class="card-title"><span style="font-size: 36px;">Wedding Receptions</span></h3>
+            <p class="card-text">As a full service experience, we monitor all aspects of your wedding from planning to execution.</p>
+            <a href="#" class="btn btn-primary mb-2">Start planning your wedding</a>
+        </div>
+    </xpath>
+    <!-- Row #2 - Image -->
+    <xpath expr="(//div[hasclass('s_media_list_item')])[2]//div[hasclass('s_media_list_img_wrapper')]" position="attributes">
+        <attribute name="class" add="col-lg-3" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <!-- Row #3 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][3]" position="attributes">
+        <attribute name="class" add="col-lg-8 offset-lg-4" remove="col-lg-12" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_item')])[3]//div[hasclass('row')]" position="attributes">
+        <attribute name="class" add="flex-row-reverse shadow rounded" separator=" "/>
+    </xpath>
+    <!-- Row #3 - Text -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]" position="replace">
+        <div class="col-lg-9 s_media_list_body">
+            <h3 class="card-title"><span style="font-size: 36px;">Vow renewals</span></h3>
+            <p class="card-text">The heartfelt exchange of wedding vows is often the most memorable part of a marriage ceremony.</p>
+            <a href="#" class="btn btn-outline-primary mb-2">See how others renewed their vows</a>
+        </div>
+    </xpath>
+    <!-- Row #3 - Image -->
+    <xpath expr="(//div[hasclass('s_media_list_item')])[3]//div[hasclass('s_media_list_img_wrapper')]" position="attributes">
+        <attribute name="class" add="col-lg-3" remove="col-lg-4" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_picture.xml b/theme_yes/views/snippets/s_picture.xml
index 3c326eb4c..edc4d1bc3 100644
--- a/theme_yes/views/snippets/s_picture.xml
+++ b/theme_yes/views/snippets/s_picture.xml
@@ -1,23 +1,23 @@
 <?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_cc4" remove="o_cc2" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2 style="text-align: center;">
-                <font style="font-size: 62px;">Love is in the air</font>
-            </h2>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//p[1]" position="replace">
-            <p class="text-center">Intimate or with hundreds of guests. Outdoors or indoors, we organize the wedding of your dreams.</p>
-        </xpath>
-        <!-- Caption -->
-        <xpath expr="//figcaption" position="replace">
-            <figcaption class="figure-caption text-muted py-3">Wedding of Bernard and Bianca, at the Barn.</figcaption>
-        </xpath>
-    </template>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2//font" position="replace" mode="inner">
+        Love is in the air
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Intimate or with hundreds of guests, outdoors or indoors : we organize the wedding of your dreams.
+    </xpath>
+    <!-- Caption -->
+    <xpath expr="//figcaption" position="replace" mode="inner">
+        Stuart and Iliana's wedding at the Barn.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_popup.xml b/theme_yes/views/snippets/s_popup.xml
new file mode 100644
index 000000000..86103ede0
--- /dev/null
+++ b/theme_yes/views/snippets/s_popup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_popup" inherit_id="website.s_popup">
+    <!-- Modal -->
+    <xpath expr="//*[hasclass('modal-content')]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <!-- Jumbotron -->
+    <xpath expr="//*[hasclass('jumbotron')]" position="attributes">
+        <attribute name="class" add="rounded col-lg-8 offset-lg-2" remove="col-lg-10 offset-lg-1" separator=" "/>
+    </xpath>
+    <!-- Close Button -->
+    <xpath expr="//*[hasclass('s_popup_close')]" position="attributes">
+        <attribute name="style" add="border-radius: 0 4px 0 4px" separator="; "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_quotes_carousel.xml b/theme_yes/views/snippets/s_quotes_carousel.xml
index d13991cf6..36d74c922 100644
--- a/theme_yes/views/snippets/s_quotes_carousel.xml
+++ b/theme_yes/views/snippets/s_quotes_carousel.xml
@@ -1,26 +1,74 @@
 <?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>They are a great venue: clean, gorgeous, elegant and very workable for a lot of different kinds of events.</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace">
-            <span class="s_blockquote_author"><b>Linda and Paul</b> • Married in 2020</span>
-        </xpath>
-        <!-- Quote 2 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace">
-            <p>The organisation was perfect. Flowers and decoration were sumptuous.</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace">
-            <span class="s_blockquote_author"><b>Jack and Mary</b> • Married in 2019</span>
-        </xpath>
-        <!-- Quote 3 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace">
-            <p>The staff was anticipatory and responsive, the food was excellent, and the venue was beautiful.</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace">
-            <span class="s_blockquote_author"><b>Rose and Peter</b> • Married in 2020</span>
-        </xpath>
-    </template>
+
+<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
+    <!-- Quote 1 -->
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="class" add="oe_img_bg o_bg_img_center" separator=" "/>
+        <attribute name="style" add="background-image: url('/web/image/website.s_quotes_carousel_demo_image_0'); background-position: 50% 25%;" separator="; "/>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="//blockquote[hasclass('s_blockquote')]" position="attributes">
+        <attribute name="class" add="mr-auto" remove="mx-auto" separator=" "/>
+    </xpath>
+    <xpath expr="(//i[hasclass('s_blockquote_icon')])" position="attributes">
+        <attribute name="style" add="background-color: rgba(255, 0, 0, 0) !important;" separator="; "></attribute>
+        <attribute name="class" add="text-o-color-3" remove="bg-o-color-2" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('s_blockquote_content')])[1]" position="attributes">
+        <attribute name="class" add="bg-o-color-2 rounded" remove="o_cc1" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.25) 0px 8px 16px 0px !important;" separator="; "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace">
+        <p style="font-size: 16px">Thank you so much for being a part of our special day. It was so nice working with you. Without your help the day would not have been as perfect as it was.</p>
+    </xpath>
+    <xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace">
+        <span class="s_blockquote_author"><b>Linda and Paul</b> • Married in 2020</span>
+    </xpath>
+    <!-- Quote 2 -->
+    <xpath expr="(//*[hasclass('carousel-item')])[2]" position="attributes">
+        <attribute name="style" add="background-position: 50% 25%;" remove="background-position: 50% 50%;" separator="; "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('container')])[2]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="(//i[hasclass('s_blockquote_icon')])[2]" position="attributes">
+        <attribute name="style">background-color: rgba(255, 0, 0, 0) !important;</attribute>
+        <attribute name="class" add="text-o-color-3" remove="bg-o-color-2" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('s_blockquote_content')])[2]" position="attributes">
+        <attribute name="class" add="bg-o-color-1 rounded" remove="o_cc1" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.25) 0px 8px 16px 0px !important;" separator="; "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace">
+        <p style="font-size:16px">Our wedding coordinator made the entire process so much less stressful. She was more than kind, accommodating, and helpful in more ways than one! She always answered my emails within a day and thoroughly. She went above and beyond, I would recommend her to anyone!</p>
+    </xpath>
+    <xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace">
+        <span class="s_blockquote_author"><b>Jack and Mary</b> • Married in 2019</span>
+    </xpath>
+    <!-- Quote 3 -->
+    <xpath expr="(//*[hasclass('carousel-item')])[3]" position="attributes">
+        <attribute name="style" add="background-position: 50% 20%;" remove="background-position: 50% 50%;" separator="; "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('container')])[3]" position="before">
+        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    </xpath>
+    <xpath expr="(//i[hasclass('s_blockquote_icon')])[3]" position="attributes">
+        <attribute name="style" add="background-color: rgba(255, 0, 0, 0) !important;" separator="; "/>
+        <attribute name="class" add="text-o-color-3" remove="bg-o-color-2" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('s_blockquote_content')])[3]" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.25) 0px 8px 16px 0px !important;" separator="; "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('s_blockquote_content')])[3]/p" position="replace">
+        <p style="font-size:16px">From the beginning of our planning process, our planner was incredible! She made us feel heard, gave great suggestions and was always just an email or call away when we had any last minute questions. Couldn't have done it without her!</p>
+    </xpath>
+    <xpath expr="(//*[hasclass('s_blockquote_author')])[3]" position="replace">
+        <span class="s_blockquote_author"><b>Rose and Peter</b> • Renewed their vows in 2021</span>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_text_image.xml b/theme_yes/views/snippets/s_text_image.xml
new file mode 100644
index 000000000..33fa816cc
--- /dev/null
+++ b/theme_yes/views/snippets/s_text_image.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Find a photographer
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_three_columns.xml b/theme_yes/views/snippets/s_three_columns.xml
index 8b0f945b9..f271129ea 100644
--- a/theme_yes/views/snippets/s_three_columns.xml
+++ b/theme_yes/views/snippets/s_three_columns.xml
@@ -1,30 +1,28 @@
 <?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_cc1" remove="o_cc2" separator=" "/>
-        </xpath>
-        <!-- Column 1 -->
-        <xpath expr="//div[hasclass('card-body')]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Ceremonies</h3>
-                <p class="card-text">We create ceremonies that look like you. Couples and families follow one another but each story is unique and deserves to be highlighted in a way that suits you. </p>
-            </div>
-        </xpath>
-        <!-- Column 2 -->
-        <xpath expr="(//div[hasclass('card-body')])[2]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Flowers</h3>
-                <p class="card-text">Our first passion. They are for us the basis of any decoration. In a natural, wild and poetic style, we will be delighted to flower your event.</p>
-            </div>
-        </xpath>
-        <!-- Column 3 -->
-        <xpath expr="(//div[hasclass('card-body')])[3]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Decoration</h3>
-                <p class="card-text">We will be able to help you to choose everything around the flowers and think everything through with you in the smallest details (candles, table plan, photo corner, reception panels, ...). </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_cc5" remove="o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18"}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_18"/>
+    </xpath>
+    <!-- Column 1 -->
+    <xpath expr="//*[hasclass('card-title')]" position="replace" mode="inner">
+        Accomodations
+    </xpath>
+    <!-- Column 2 -->
+    <xpath expr="(//*[hasclass('card-title')])[2]" position="replace" mode="inner">
+        Car Rental
+    </xpath>
+    <!-- Column 3 -->
+    <xpath expr="(//*[hasclass('card-title')])[3]" position="replace" mode="inner">
+        Make up &amp;amp; Hair
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_yes/views/snippets/s_title.xml b/theme_yes/views/snippets/s_title.xml
new file mode 100644
index 000000000..d76e43264
--- /dev/null
+++ b/theme_yes/views/snippets/s_title.xml
@@ -0,0 +1,15 @@
+<?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_cc2" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1//font" position="replace" mode="inner">
+        Meet our team
+    </xpath>
+</template>
+
+</odoo>