diff --git a/theme_notes/__manifest__.py b/theme_notes/__manifest__.py
index 2f1bcb32e..8cfa909a2 100644
--- a/theme_notes/__manifest__.py
+++ b/theme_notes/__manifest__.py
@@ -4,7 +4,7 @@
     'category': 'Theme/Retail',
     'summary': 'Band, Musics, Sound, Concerts, Artists, Records, Event, Food, Stores',
     'sequence': 280,
-    'version': '2.0.0',
+    'version': '2.1.0',
     'author': 'Odoo S.A.',
     'depends': ['theme_common'],
     'data': [
@@ -15,12 +15,36 @@
         'views/snippets/s_image_text.xml',
         'views/snippets/s_media_list.xml',
         'views/snippets/s_company_team.xml',
+        'views/snippets/s_masonry_block.xml',
+        'views/snippets/s_product_catalog.xml',
+        'views/snippets/s_banner.xml',
+        'views/snippets/s_cover.xml',
+        'views/snippets/s_text_image.xml',
+        'views/snippets/s_numbers.xml',
+        'views/snippets/s_three_columns.xml',
+        'views/snippets/s_color_blocks_2.xml',
+        'views/snippets/s_image_gallery.xml',
+        'views/snippets/s_call_to_action.xml',
+        'views/snippets/s_features_grid.xml',
+        'views/snippets/s_product_list.xml',
+        'views/snippets/s_parallax.xml',
+        'views/snippets/s_comparisons.xml',
+        'views/snippets/s_quotes_carousel.xml',
 
         ],
     'images': [
-        'static/description/Notes_description.png',
+        'static/description/notes_description.jpg',
         'static/description/notes_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_carousel_default_image_1': '/theme_notes/static/src/img/content/content_img_22.jpg',
+        'website.s_masonry_block_default_image_1': '/theme_notes/static/src/img/content/content_img_21.jpg',
+        'website.s_text_image_default_image': '/theme_notes/static/src/img/content/content_img_15.jpg',
+        'website.s_product_catalog_default_image': '/theme_notes/static/src/img/content/s_product_catalog_default_image.jpg',
+        'website.s_media_list_default_image_1': '/theme_notes/static/src/img/content/content_img_25.jpg',
+        'website.s_media_list_default_image_2': '/theme_notes/static/src/img/content/content_img_26.jpg',
+        'website.s_media_list_default_image_3': '/theme_notes/static/src/img/content/content_img_27.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-notes.odoo.com',
     'assets': {
diff --git a/theme_notes/data/ir_asset.xml b/theme_notes/data/ir_asset.xml
index 6baf09f12..dca6c3c1b 100644
--- a/theme_notes/data/ir_asset.xml
+++ b/theme_notes/data/ir_asset.xml
@@ -1,52 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_notes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.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_notes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_notes.s_banner_parallax_000_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.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_notes/static/src/old_snippets/s_banner_parallax/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_notes.s_features_carousel_000_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.s_features_carousel_000_variables_scss</field>
-            <field name="name">Features carousel 000 variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_notes/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_notes.s_features_carousel_000_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.s_features_carousel_000_variables_scss</field>
+    <field name="name">Features carousel 000 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_notes/static/src/old_snippets/s_features_carousel/000_variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_notes.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_notes/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_notes.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_notes/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_notes.secondary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.secondary_variables_scss</field>
-            <field name="name">Secondary variables SCSS</field>
-            <field name="bundle">web._assets_secondary_variables</field>
-            <field name="path">theme_notes/static/src/scss/secondary_variables.scss</field>
-        </record>
+<record id="theme_notes.secondary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.secondary_variables_scss</field>
+    <field name="name">Secondary variables SCSS</field>
+    <field name="bundle">web._assets_secondary_variables</field>
+    <field name="path">theme_notes/static/src/scss/secondary_variables.scss</field>
+</record>
 
-        <record id="theme_notes.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.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_notes/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_notes.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.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_notes/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-        <record id="theme_notes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_notes.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_notes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_notes.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_notes.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_notes/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_notes/models/theme_notes.py b/theme_notes/models/theme_notes.py
index 435b48d1e..f63280a87 100644
--- a/theme_notes/models/theme_notes.py
+++ b/theme_notes/models/theme_notes.py
@@ -5,9 +5,6 @@ class ThemeNotes(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_notes_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
-        self.enable_view('website.template_header_hamburger_full')
-        self.enable_view('website.template_header_hamburger_align_right')
         self.enable_header_off_canvas()
 
         self.disable_view('website.footer_custom')
diff --git a/theme_notes/static/description/Notes_description.png b/theme_notes/static/description/Notes_description.png
deleted file mode 100644
index 3b5de9579..000000000
Binary files a/theme_notes/static/description/Notes_description.png and /dev/null differ
diff --git a/theme_notes/static/description/index.html b/theme_notes/static/description/index.html
index 8649acf6f..f0630f8eb 100644
--- a/theme_notes/static/description/index.html
+++ b/theme_notes/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="Notes_description.png" class="img-fluid d-block mx-auto"/>
+    <img src="notes_description.jpg" class="img-fluid d-block mx-auto"/>
     <hr>
 
     <h2 class="text-muted">Notes Customization Tool</h2>
diff --git a/theme_notes/static/description/notes_description.jpg b/theme_notes/static/description/notes_description.jpg
new file mode 100644
index 000000000..691752d53
Binary files /dev/null and b/theme_notes/static/description/notes_description.jpg differ
diff --git a/theme_notes/static/description/notes_screenshot.jpg b/theme_notes/static/description/notes_screenshot.jpg
index 712317943..9060d6485 100644
Binary files a/theme_notes/static/description/notes_screenshot.jpg and b/theme_notes/static/description/notes_screenshot.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_13.jpg b/theme_notes/static/src/img/content/content_img_13.jpg
index 7d5f92060..6767d1f26 100644
Binary files a/theme_notes/static/src/img/content/content_img_13.jpg and b/theme_notes/static/src/img/content/content_img_13.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_14.jpg b/theme_notes/static/src/img/content/content_img_14.jpg
index 82a0b3a5e..2011f374b 100644
Binary files a/theme_notes/static/src/img/content/content_img_14.jpg and b/theme_notes/static/src/img/content/content_img_14.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_15.jpg b/theme_notes/static/src/img/content/content_img_15.jpg
index 85b93fe8e..618e7ea67 100644
Binary files a/theme_notes/static/src/img/content/content_img_15.jpg and b/theme_notes/static/src/img/content/content_img_15.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_16.jpg b/theme_notes/static/src/img/content/content_img_16.jpg
index 4ec3ce566..2f2ea02ea 100644
Binary files a/theme_notes/static/src/img/content/content_img_16.jpg and b/theme_notes/static/src/img/content/content_img_16.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_17.jpg b/theme_notes/static/src/img/content/content_img_17.jpg
index 33ae1450d..a44d8d2e6 100644
Binary files a/theme_notes/static/src/img/content/content_img_17.jpg and b/theme_notes/static/src/img/content/content_img_17.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_18.jpg b/theme_notes/static/src/img/content/content_img_18.jpg
index 0668f7163..d4ae78763 100644
Binary files a/theme_notes/static/src/img/content/content_img_18.jpg and b/theme_notes/static/src/img/content/content_img_18.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_19.jpg b/theme_notes/static/src/img/content/content_img_19.jpg
index 54ae3a31b..50e4a0b1d 100644
Binary files a/theme_notes/static/src/img/content/content_img_19.jpg and b/theme_notes/static/src/img/content/content_img_19.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_20.jpg b/theme_notes/static/src/img/content/content_img_20.jpg
index 8316510ba..b29d5608a 100644
Binary files a/theme_notes/static/src/img/content/content_img_20.jpg and b/theme_notes/static/src/img/content/content_img_20.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_21.jpg b/theme_notes/static/src/img/content/content_img_21.jpg
index ce79589fb..bb9783e43 100644
Binary files a/theme_notes/static/src/img/content/content_img_21.jpg and b/theme_notes/static/src/img/content/content_img_21.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_22.jpg b/theme_notes/static/src/img/content/content_img_22.jpg
index 9a6a8ec35..84c2b6c5c 100644
Binary files a/theme_notes/static/src/img/content/content_img_22.jpg and b/theme_notes/static/src/img/content/content_img_22.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_23.jpg b/theme_notes/static/src/img/content/content_img_23.jpg
index b5b611510..7d894e29f 100644
Binary files a/theme_notes/static/src/img/content/content_img_23.jpg and b/theme_notes/static/src/img/content/content_img_23.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_24.jpg b/theme_notes/static/src/img/content/content_img_24.jpg
index b98ec7de0..e44375f29 100644
Binary files a/theme_notes/static/src/img/content/content_img_24.jpg and b/theme_notes/static/src/img/content/content_img_24.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_25.jpg b/theme_notes/static/src/img/content/content_img_25.jpg
index ecc3f3f0e..f3a8f9ecf 100644
Binary files a/theme_notes/static/src/img/content/content_img_25.jpg and b/theme_notes/static/src/img/content/content_img_25.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_26.jpg b/theme_notes/static/src/img/content/content_img_26.jpg
index b386d2054..a8e94e5d1 100644
Binary files a/theme_notes/static/src/img/content/content_img_26.jpg and b/theme_notes/static/src/img/content/content_img_26.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_27.jpg b/theme_notes/static/src/img/content/content_img_27.jpg
index 0dc80c071..eed1be6ee 100644
Binary files a/theme_notes/static/src/img/content/content_img_27.jpg and b/theme_notes/static/src/img/content/content_img_27.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_28.jpg b/theme_notes/static/src/img/content/content_img_28.jpg
index 9e865609b..02234c0a2 100644
Binary files a/theme_notes/static/src/img/content/content_img_28.jpg and b/theme_notes/static/src/img/content/content_img_28.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_29.jpg b/theme_notes/static/src/img/content/content_img_29.jpg
index bf603bcdd..844c5a2df 100644
Binary files a/theme_notes/static/src/img/content/content_img_29.jpg and b/theme_notes/static/src/img/content/content_img_29.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_30.jpg b/theme_notes/static/src/img/content/content_img_30.jpg
index 770f03f65..a4588b949 100644
Binary files a/theme_notes/static/src/img/content/content_img_30.jpg and b/theme_notes/static/src/img/content/content_img_30.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_31.jpg b/theme_notes/static/src/img/content/content_img_31.jpg
index f2377a2a4..9f68c3491 100644
Binary files a/theme_notes/static/src/img/content/content_img_31.jpg and b/theme_notes/static/src/img/content/content_img_31.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_32.jpg b/theme_notes/static/src/img/content/content_img_32.jpg
index 7981cfee2..921621d92 100644
Binary files a/theme_notes/static/src/img/content/content_img_32.jpg and b/theme_notes/static/src/img/content/content_img_32.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_33.jpg b/theme_notes/static/src/img/content/content_img_33.jpg
index c6464ae2f..9c7c51c5b 100644
Binary files a/theme_notes/static/src/img/content/content_img_33.jpg and b/theme_notes/static/src/img/content/content_img_33.jpg differ
diff --git a/theme_notes/static/src/img/content/content_img_34.jpg b/theme_notes/static/src/img/content/content_img_34.jpg
index 43bbfcdc9..c71598476 100644
Binary files a/theme_notes/static/src/img/content/content_img_34.jpg and b/theme_notes/static/src/img/content/content_img_34.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_02.jpg b/theme_notes/static/src/img/content/library_image_02.jpg
new file mode 100644
index 000000000..71453942c
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_02.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_03.jpg b/theme_notes/static/src/img/content/library_image_03.jpg
new file mode 100644
index 000000000..358bee17d
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_03.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_05.jpg b/theme_notes/static/src/img/content/library_image_05.jpg
new file mode 100644
index 000000000..a84a842db
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_05.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_08.jpg b/theme_notes/static/src/img/content/library_image_08.jpg
new file mode 100644
index 000000000..979647180
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_08.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_10.jpg b/theme_notes/static/src/img/content/library_image_10.jpg
new file mode 100644
index 000000000..7d6a8842e
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_10.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_14.jpg b/theme_notes/static/src/img/content/library_image_14.jpg
new file mode 100644
index 000000000..90be6c5fc
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_14.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_16.jpg b/theme_notes/static/src/img/content/library_image_16.jpg
new file mode 100644
index 000000000..5f2ced253
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_16.jpg differ
diff --git a/theme_notes/static/src/img/content/library_image_19.jpg b/theme_notes/static/src/img/content/library_image_19.jpg
new file mode 100644
index 000000000..e8230bba4
Binary files /dev/null and b/theme_notes/static/src/img/content/library_image_19.jpg differ
diff --git a/theme_notes/static/src/img/content/s_call_to_action_default_image.jpg b/theme_notes/static/src/img/content/s_call_to_action_default_image.jpg
new file mode 100644
index 000000000..184106f72
Binary files /dev/null and b/theme_notes/static/src/img/content/s_call_to_action_default_image.jpg differ
diff --git a/theme_notes/static/src/img/content/s_masonry_block_default_image_2.jpg b/theme_notes/static/src/img/content/s_masonry_block_default_image_2.jpg
new file mode 100644
index 000000000..78e58be03
Binary files /dev/null and b/theme_notes/static/src/img/content/s_masonry_block_default_image_2.jpg differ
diff --git a/theme_notes/static/src/img/content/s_masonry_block_default_image_3.jpg b/theme_notes/static/src/img/content/s_masonry_block_default_image_3.jpg
new file mode 100644
index 000000000..a76daa5cd
Binary files /dev/null and b/theme_notes/static/src/img/content/s_masonry_block_default_image_3.jpg differ
diff --git a/theme_notes/static/src/img/content/s_masonry_block_default_image_4.jpg b/theme_notes/static/src/img/content/s_masonry_block_default_image_4.jpg
new file mode 100644
index 000000000..d5c7ee1da
Binary files /dev/null and b/theme_notes/static/src/img/content/s_masonry_block_default_image_4.jpg differ
diff --git a/theme_notes/static/src/img/content/s_masonry_block_default_image_5.jpg b/theme_notes/static/src/img/content/s_masonry_block_default_image_5.jpg
new file mode 100644
index 000000000..3d900ed6a
Binary files /dev/null and b/theme_notes/static/src/img/content/s_masonry_block_default_image_5.jpg differ
diff --git a/theme_notes/static/src/img/content/s_popup.jpg b/theme_notes/static/src/img/content/s_popup.jpg
index bfd04b748..4039b192c 100644
Binary files a/theme_notes/static/src/img/content/s_popup.jpg and b/theme_notes/static/src/img/content/s_popup.jpg differ
diff --git a/theme_notes/static/src/img/content/s_product_catalog_default_image.jpg b/theme_notes/static/src/img/content/s_product_catalog_default_image.jpg
new file mode 100644
index 000000000..3c41c855f
Binary files /dev/null and b/theme_notes/static/src/img/content/s_product_catalog_default_image.jpg differ
diff --git a/theme_notes/static/src/img/content/s_quotes_carousel_demo_image_3.jpg b/theme_notes/static/src/img/content/s_quotes_carousel_demo_image_3.jpg
new file mode 100644
index 000000000..969f8f338
Binary files /dev/null and b/theme_notes/static/src/img/content/s_quotes_carousel_demo_image_3.jpg differ
diff --git a/theme_notes/static/src/img/content/s_three_columns_default_image.jpg b/theme_notes/static/src/img/content/s_three_columns_default_image.jpg
new file mode 100644
index 000000000..3397fd15d
Binary files /dev/null and b/theme_notes/static/src/img/content/s_three_columns_default_image.jpg differ
diff --git a/theme_notes/static/src/img/content/uiface_01.jpg b/theme_notes/static/src/img/content/uiface_01.jpg
index 1074981d0..949cac28c 100644
Binary files a/theme_notes/static/src/img/content/uiface_01.jpg and b/theme_notes/static/src/img/content/uiface_01.jpg differ
diff --git a/theme_notes/static/src/img/content/uiface_02.jpg b/theme_notes/static/src/img/content/uiface_02.jpg
index 81c4d3813..e61815f0e 100644
Binary files a/theme_notes/static/src/img/content/uiface_02.jpg and b/theme_notes/static/src/img/content/uiface_02.jpg differ
diff --git a/theme_notes/static/src/img/content/uiface_03.jpg b/theme_notes/static/src/img/content/uiface_03.jpg
index 63a74cd24..5d7415c0d 100644
Binary files a/theme_notes/static/src/img/content/uiface_03.jpg and b/theme_notes/static/src/img/content/uiface_03.jpg differ
diff --git a/theme_notes/static/src/img/content/uiface_04.jpg b/theme_notes/static/src/img/content/uiface_04.jpg
index 9108c229d..086d5a3a6 100644
Binary files a/theme_notes/static/src/img/content/uiface_04.jpg and b/theme_notes/static/src/img/content/uiface_04.jpg differ
diff --git a/theme_notes/static/src/js/tour.js b/theme_notes/static/src/js/tour.js
index 436304407..4ba579657 100644
--- a/theme_notes/static/src/js/tour.js
+++ b/theme_notes/static/src/js/tour.js
@@ -1,10 +1,9 @@
-odoo.define("theme_notes.tour.notes", 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 = [
     {
@@ -12,8 +11,16 @@ const snippets = [
         name: 'Carousel',
     },
     {
-        id: 's_image_text',
-        name: 'Image - Text',
+        id: 's_masonry_block',
+        name: 'Masonry',
+    },
+    {
+        id: 's_text_image',
+        name: 'Text - Image',
+    },
+    {
+        id: 's_product_catalog',
+        name: 'Pricelist',
     },
     {
         id: 's_media_list',
@@ -27,12 +34,14 @@ const snippets = [
 
 wTourUtils.registerThemeHomepageTour("notes_tour", [
     wTourUtils.dragNDrop(snippets[0]),
-    wTourUtils.clickOnText(snippets[0], 'h2'),
+    wTourUtils.clickOnText(snippets[0], 'h1'),
     wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[1]),
     wTourUtils.dragNDrop(snippets[2]),
-    wTourUtils.dragNDrop(snippets[3]),
-    wTourUtils.clickOnSnippet(snippets[3]),
+    wTourUtils.clickOnSnippet(snippets[2]),
     wTourUtils.changeOption('ContainerWidth', 'we-button-group.o_we_user_value_widget', _t('width')),
+    wTourUtils.goBackToBlocks(),
+    wTourUtils.dragNDrop(snippets[3]),
+    wTourUtils.dragNDrop(snippets[4]),
+    wTourUtils.dragNDrop(snippets[5]),
 ]);
-});
diff --git a/theme_notes/static/src/scss/bootstrap_overridden.scss b/theme_notes/static/src/scss/bootstrap_overridden.scss
index 75244052c..94ef44996 100644
--- a/theme_notes/static/src/scss/bootstrap_overridden.scss
+++ b/theme_notes/static/src/scss/bootstrap_overridden.scss
@@ -12,3 +12,7 @@ $box-shadow-lg:               0 0 .3125rem rgba(0,0,0,.25) !default;
 // Breadcrumbs
 
 $breadcrumb-bg:                     o-color('white') !default;
+
+// Headings font weight
+
+$headings-font-weight: $o-theme-headings-font-weight !default;
diff --git a/theme_notes/static/src/scss/primary_variables.scss b/theme_notes/static/src/scss/primary_variables.scss
index 9cb7f8eed..ae24d7db5 100644
--- a/theme_notes/static/src/scss/primary_variables.scss
+++ b/theme_notes/static/src/scss/primary_variables.scss
@@ -54,13 +54,15 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes,
 // Fonts
 //------------------------------------------------------------------------------
 
-$o-theme-h1-font-size-multiplier: (40 / 16);
-$o-theme-h2-font-size-multiplier: (32 / 16);
+$o-theme-h1-font-size-multiplier: (62 / 16);
+$o-theme-h2-font-size-multiplier: (36 / 16);
 $o-theme-h3-font-size-multiplier: (28 / 16);
 $o-theme-h4-font-size-multiplier: (24 / 16);
 $o-theme-h5-font-size-multiplier: (20 / 16);
 $o-theme-h6-font-size-multiplier: 1;
 
+$o-theme-headings-font-weight: 700;
+
 $o-theme-font-configs: (
     'Cuprum': (
         'family': ('Cuprum', sans-serif),
@@ -105,6 +107,10 @@ $o-theme-font-configs: (
         'family': ('Lobster', cursive),
         'url': 'Lobster:300,300i,400,400i,700,700i',
     ),
+    'Montserrat': (
+        'family': ('Montserrat', sans-serif),
+        'url': 'Montserrat:300,300i,400,400i,700,700i',
+    ),
 );
 
 //------------------------------------------------------------------------------
@@ -114,18 +120,16 @@ $o-theme-font-configs: (
 $o-website-values-palettes: (
     (
         'color-palettes-name': 'notes-1',
-        'header-font-size': 1.25rem,
+        'header-font-size': 1rem,
         'logo-height': 3rem,
         'fixed-logo-height': 3rem,
         'font': 'Oxygen',
-        'headings-font': 'Lobster',
-        'navbar-font': 'Lobster',
-        'buttons-font': 'Lobster',
+        'headings-font': 'Montserrat',
+        'navbar-font': 'Montserrat',
+        'buttons-font': 'Montserrat',
         'link-underline': 'never',
-        'header-template': 'hamburger-full',
+        'header-template': 'template_header_default',
         'footer-template': 'descriptive',
-        'hamburger-position': 'right',
-        'hamburger-type': 'off-canvas',
     ),
 );
 
@@ -168,6 +172,14 @@ $o-theme-color-palettes-compatibility-indexes: (
 // Shapes
 //------------------------------------------------------------------------------
 
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/10', (1: 5, 2: 5));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/13_001', (1: 5));
+$o-bg-shapes: add-footer-shape-colors-mapping('web_editor', 'Wavy/13_001', (1: 'footer'));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Wavy/25', (1: 5, 2: 5));
+$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Wavy/25', 'second', (1: 2, 2: 2));
+$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Wavy/25', 'third', (1: 3, 2: 3));
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/04', (5: 4));
-$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01', (2: 5));
-$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01_001', (2: 5));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01', (2: 2));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blobs/01_001', (2: 2));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/08', (5: 4));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/12', (5: 4));
diff --git a/theme_notes/views/images_library.xml b/theme_notes/views/images_library.xml
index a8d53258e..67dc6deb2 100644
--- a/theme_notes/views/images_library.xml
+++ b/theme_notes/views/images_library.xml
@@ -1,174 +1,236 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Change default images of 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_notes/static/src/img/content/content_img_13.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_notes/static/src/img/content/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_notes/static/src/img/content/content_img_14.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_notes/static/src/img/content/content_img_15.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_notes/static/src/img/content/content_img_16.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_notes/static/src/img/content/content_img_17.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_notes/static/src/img/content/content_img_18.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_notes/static/src/img/content/content_img_19.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_notes/static/src/img/content/content_img_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_notes/static/src/img/content/content_img_21.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_notes/static/src/img/content/content_img_22.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_notes/static/src/img/content/content_img_23.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_notes/static/src/img/content/content_img_24.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_notes/static/src/img/content/content_img_25.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_notes/static/src/img/content/content_img_26.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_notes/static/src/img/content/content_img_27.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_notes/static/src/img/content/content_img_28.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_notes/static/src/img/content/uiface_01.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_notes/static/src/img/content/uiface_02.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_notes/static/src/img/content/uiface_03.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_notes/static/src/img/content/uiface_04.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_notes/static/src/img/content/content_img_29.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_notes/static/src/img/content/content_img_30.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_notes/static/src/img/content/content_img_31.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_notes/static/src/img/content/content_img_32.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_notes/static/src/img/content/content_img_33.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_notes/static/src/img/content/content_img_34.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_notes/static/src/img/content/content_img_35.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_notes/static/src/img/content/content_img_36.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_notes/static/src/img/content/uiface_03.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_notes/static/src/img/content/uiface_04.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_notes/static/src/img/content/uiface_01.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_notes/static/src/img/content/content_img_21.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_notes/static/src/img/content/uiface_02.jpg</field>
-    </record>
+
+<!-- Change default images of 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_notes/static/src/img/content/content_img_13.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_notes/static/src/img/content/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_notes/static/src/img/content/content_img_14.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_notes/static/src/img/content/content_img_15.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_notes/static/src/img/content/content_img_16.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_notes/static/src/img/content/content_img_17.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_notes/static/src/img/content/content_img_18.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_notes/static/src/img/content/content_img_19.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_notes/static/src/img/content/content_img_20.jpg</field>
+</record>
+<record id="library_image_19" model="theme.ir.attachment">
+    <field name="key">website.library_image_19</field>
+    <field name="name">website.library_image_19</field>
+    <field name="url">/theme_notes/static/src/img/content/library_image_19.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_notes/static/src/img/content/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_notes/static/src/img/content/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_notes/static/src/img/content/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_notes/static/src/img/content/library_image_16.jpg</field>
+</record>
+<record id="s_masonry_block_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_masonry_block_default_image_1</field>
+    <field name="name">website.s_masonry_block_default_image_1</field>
+    <field name="url">/theme_notes/static/src/img/content/content_img_21.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_notes/static/src/img/content/content_img_22.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_notes/static/src/img/content/content_img_23.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_notes/static/src/img/content/content_img_24.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_notes/static/src/img/content/content_img_25.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_notes/static/src/img/content/content_img_26.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_notes/static/src/img/content/content_img_27.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_notes/static/src/img/content/content_img_28.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_notes/static/src/img/content/uiface_01.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_notes/static/src/img/content/uiface_02.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_notes/static/src/img/content/uiface_03.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_notes/static/src/img/content/uiface_04.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_notes/static/src/img/content/content_img_29.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_notes/static/src/img/content/content_img_30.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_notes/static/src/img/content/content_img_31.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_notes/static/src/img/content/content_img_32.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_notes/static/src/img/content/content_img_33.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_notes/static/src/img/content/content_img_34.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_notes/static/src/img/content/content_img_35.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_notes/static/src/img/content/content_img_36.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_notes/static/src/img/content/uiface_03.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_notes/static/src/img/content/uiface_04.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_notes/static/src/img/content/uiface_01.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_6" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_6</field>
+    <field name="name">website.s_quotes_carousel_demo_image_6</field>
+    <field name="url">/theme_notes/static/src/img/content/s_quotes_carousel_demo_image_3.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_notes/static/src/img/content/content_img_21.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_notes/static/src/img/content/uiface_02.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_notes/static/src/img/content/s_product_catalog_default_image.jpg</field>
+</record>
+<record id="s_three_columns_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image</field>
+    <field name="name">website.s_three_columns_default_image</field>
+    <field name="url">/theme_notes/static/src/img/content/s_three_columns_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_notes/static/src/img/content/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_notes/static/src/img/content/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_notes/static/src/img/content/library_image_02.jpg</field>
+</record>
+<record id="s_call_to_action_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_call_to_action_default_image</field>
+    <field name="name">website.s_call_to_action_default_image</field>
+    <field name="url">/theme_notes/static/src/img/content/s_call_to_action_default_image.jpg</field>
+</record>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_banner.xml b/theme_notes/views/snippets/s_banner.xml
new file mode 100644
index 000000000..ecb2042ef
--- /dev/null
+++ b/theme_notes/views/snippets/s_banner.xml
@@ -0,0 +1,29 @@
+<?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_cc o_cc5" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
+    </xpath>
+    <!-- Filter & Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-black-75"/>
+        <div class="o_we_shape o_web_editor_Floats_08 o_we_flip_x o_we_flip_y"/>
+    </xpath>
+    <!-- Jumbotron -->
+    <xpath expr="//div[hasclass('jumbotron')]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Enjoy the atmosphere
+    </xpath>
+    <!-- Add space between title and paragraph -->
+    <xpath expr="//p[hasclass('lead')]" position="before">
+        <p><br/></p>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_call_to_action.xml b/theme_notes/views/snippets/s_call_to_action.xml
new file mode 100644
index 000000000..274789af4
--- /dev/null
+++ b/theme_notes/views/snippets/s_call_to_action.xml
@@ -0,0 +1,33 @@
+<?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="pb72 pt96 oe_img_bg o_bg_img_center" remove="pt48 pb24" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+        <attribute name="style">background-image: url('/web/image/website.s_call_to_action_default_image'); background-position: 50% 34%;</attribute>
+    </xpath>
+    <!-- Shape & filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-black-50"/>
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h3" position="replace">
+        <h2>Live the Miraillet <br/>Festival experience</h2>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Join us and make this weekend unforgettable!
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//a[hasclass('btn')]" position="attributes">
+        <attribute name="class" add="flat" separator=" "/>
+    </xpath>
+    <xpath expr="//a[hasclass('btn')]" position="replace" mode="inner">
+        Get your ticket
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_carousel.xml b/theme_notes/views/snippets/s_carousel.xml
index 1f3136090..e05882a7a 100644
--- a/theme_notes/views/snippets/s_carousel.xml
+++ b/theme_notes/views/snippets/s_carousel.xml
@@ -1,32 +1,58 @@
 <?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="carousel-content col-lg-6 p-5 o_cc o_cc5 shadow border" style="border-width: 2.5px !important; box-shadow: rgb(44, 41, 39) -20px 20px 0px 0px !important; border-color: rgb(44, 41, 39) !important;">
-                <h2><font style="font-size: 62px;">Miraillet Festival</font></h2>
-                <p class="lead">From the 12th to the 17th of August, come and enjoy the atmosphere at the Mirallet Festival. Discover the line up below.</p>
-                <p><br/></p>
-                <p><a href="/contactus" class="btn btn-primary mb-2">More Info</a></p>
-            </div>
-        </xpath>
-        <!-- Slide 2 -->
-        <xpath expr="(//div[hasclass('carousel-content')])[2]" position="replace">
-            <div class="carousel-content col-lg-8 offset-lg-2 mt48 pt48 pb40 text-center o_cc o_cc5 shadow border" style="border-width: 2.5px !important; box-shadow: rgb(44, 41, 39) 0px 20px 0px 0px !important; border-color: rgb(44, 41, 39) !important;">
-                <h2><font style="font-size: 62px;">6 Days Pass</font></h2>
-                <p class="lead">Tickets will be on sale soon. Do not miss our 6 Days Pass. Free camping!</p>
-                <p><br/></p>
-                <p><a href="/" class="btn btn-primary mb-2">More Info</a></p>
-            </div>
-        </xpath>
-        <!-- Slide 3 -->
-        <xpath expr="(//div[hasclass('carousel-content')])[3]" position="replace">
-            <div class="carousel-content col-lg-6 offset-lg-6 p-5 pt48 pb40 o_cc o_cc5 shadow border" style="border-width: 2.5px !important; box-shadow: rgb(44, 41, 39) 20px 20px 0px 0px !important; border-color: rgb(44, 41, 39) !important;">
-                <h2><font style="font-size: 62px;">Recent Editions</font></h2>
-                <p class="lead">Discover what makes the reputation of the Miraillet festival through these after-movies.</p>
-                <p><br/></p>
-                <p><a href="/" class="btn btn-primary mb-2">More Info</a></p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_carousel" inherit_id="website.s_carousel">
+    <!-- Slide #1 -->
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="class" add="pb224 pt224 o_cc o_cc5" remove="pb152 pt152" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('carousel-content')]" position="replace">
+        <div class="carousel-content col-lg-6">
+            <h1>Miraillet Festival</h1>
+            <p class="lead">From the 12th to the 17th of August, come and enjoy the atmosphere at the Miraillet Festival. Discover the line up below.</p>
+            <p><br/></p>
+            <p><a href="/contactus" class="btn btn-primary btn-lg mb-2">More Info</a></p>
+        </div>
+    </xpath>
+    <!-- Slide #1 - Shape -->
+    <xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_25 o_we_flip_y"/>
+    </xpath>
+    <!-- Slide #2 -->
+    <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="class" add="pb224 pt224 o_cc o_cc2" remove="pt96 pb96" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":[]}</attribute>
+    </xpath>
+    <xpath expr="(//div[hasclass('carousel-content')])[2]" position="replace">
+        <div class="carousel-content col-lg-6">
+            <h1>6 Days Pass</h1>
+            <p class="lead">Tickets will be on sale soon. Do not miss our 6 Days Pass. Free camping!</p>
+            <p><br/></p>
+            <p><a href="/" class="btn btn-primary btn-lg mb-2">More Info</a></p>
+        </div>
+    </xpath>
+    <!-- Slide #2 - Shape -->
+    <xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_25 o_second_extra_shape_mapping"/>
+    </xpath>
+    <!-- Slide #3 -->
+    <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="class" add="pb224 pt224 o_cc o_cc5" remove="pt128 pb128" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/25","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="(//div[hasclass('carousel-content')])[3]" position="replace">
+        <div class="carousel-content col-lg-6">
+            <h1>Recent Editions</h1>
+            <p class="lead">Discover what makes the reputation of the Miraillet festival through these after-movies.</p>
+            <p><br/></p>
+            <p><a href="/" class="btn btn-primary btn-lg mb-2">More Info</a></p>
+        </div>
+    </xpath>
+    <!-- Slide #3 - Shape -->
+    <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_25 o_we_flip_y o_third_extra_shape_mapping"/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_color_blocks_2.xml b/theme_notes/views/snippets/s_color_blocks_2.xml
new file mode 100644
index 000000000..c9dd345e7
--- /dev/null
+++ b/theme_notes/views/snippets/s_color_blocks_2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container-fluid')]" position="attributes">
+        <attribute name="class" add="container" remove="container-fluid" separator=" "/>
+    </xpath>
+    <!-- Column #1 -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc3" separator=" "/>
+    </xpath>
+    <!-- Column #2 -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc5" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_company_team.xml b/theme_notes/views/snippets/s_company_team.xml
index 607f785a4..02cb55c8a 100644
--- a/theme_notes/views/snippets/s_company_team.xml
+++ b/theme_notes/views/snippets/s_company_team.xml
@@ -1,46 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_company_team" inherit_id="website.s_company_team">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt144 o_cc o_cc5" remove="pt48" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/08","flip":["x","y"]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Blobs_08 o_we_flip_x o_we_flip_y"/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//div[hasclass('row')]" position="before">
-            <h2 class="text-center"><font style="font-size: 62px;">Line Up</font></h2>
-        </xpath>
-        <!-- Paragraph 1 -->
-        <xpath expr="//div[hasclass('col-lg-8')]" position="replace">
-            <div class="col-lg-8">
-                <h4>Tony</h4>
-                <p>Tony is praised for the quality of his flow and beats but often criticised because of the controversial nature of his lyrics. He has also established a label, and developed a line of jewellery.</p>
-            </div>
-        </xpath>
-        <!-- Paragraph 2 -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[2]" position="replace">
-            <div class="col-lg-8">
-                <h4>Aline</h4>
-                <p>Aline, is a French singer, songwriter and producer. In 2016, she was ranked as the most powerful and influential French person by Vanity Fair, who noticed her "radiance of French genius</p>
-            </div>
-        </xpath>
-        <!-- Paragraph 3 -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[3]" position="replace">
-            <div class="col-lg-8">
-                <h4>Mich Starck</h4>
-                <p>Mich Starck is a French DJ, record producer and songwriter. He has sold over nine million albums and thirty million singles worldwide. In 2011, he was voted as the number one DJ in the DJ Mag Top 100 DJs poll.</p>
-            </div>
-        </xpath>
-        <!-- Paragraph 4 -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[4]" position="replace">
-            <div class="col-lg-8">
-                <h4>Joseris</h4>
-                <p>Joseris is a Belgian band that formed in October 1995. Though originally categorised as a trip hop group, they quickly expanded their sound to the point where they could no longer be described as a lone genre, but rather encompass alternative, electronica, electro-pop, rock, and a mixture of others</p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_company_team" inherit_id="website.s_company_team">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pb128" remove="pb48" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Wavy_13_001"/>
+    </xpath>
+    <!-- Member #1 -->
+    <xpath expr="//div[hasclass('col-lg-8')]//h4" position="replace" mode="inner">
+        Tony
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-8')]//p" position="replace" mode="inner">
+        Tony is praised for the quality of his flow and beats but often criticised because of the controversial nature of his lyrics. He has also established a label, and developed a line of jewellery.
+    </xpath>
+    <!-- Member #2 -->
+    <xpath expr="(//div[hasclass('col-lg-8')])[2]//h4" position="replace" mode="inner">
+        Aline
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[2]//p" position="replace" mode="inner">
+        Aline, is a French singer, songwriter and producer. In 2016, she was ranked as the most powerful and influential French person by Vanity Fair, who noticed her "radiance of French genius.
+    </xpath>
+    <!-- Member #3 -->
+    <xpath expr="(//div[hasclass('col-lg-8')])[3]//h4" position="replace" mode="inner">
+        Mich Starck
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[3]//p" position="replace" mode="inner">
+        Mich Starck is a French DJ, record producer and songwriter. He has sold over nine million albums and thirty million singles worldwide. In 2011, he was voted as the number one DJ in the DJ Mag Top 100 DJs poll.
+    </xpath>
+    <!-- Member #4 -->
+    <xpath expr="(//div[hasclass('col-lg-8')])[4]//h4" position="replace" mode="inner">
+        Joseris
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-8')])[4]//p" position="replace" mode="inner">
+        Joseris is a Belgian band that formed in October 1995. Though originally categorised as a trip hop group, they quickly expanded their sound to the point where they could no longer be described as a lone genre, but rather encompass alternative, electronica, electro-pop, rock, and a mixture of others.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_comparisons.xml b/theme_notes/views/snippets/s_comparisons.xml
new file mode 100644
index 000000000..9a6aaa1dc
--- /dev/null
+++ b/theme_notes/views/snippets/s_comparisons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_comparisons" inherit_id="website.s_comparisons">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_05"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_cover.xml b/theme_notes/views/snippets/s_cover.xml
new file mode 100644
index 000000000..78cbe1ceb
--- /dev/null
+++ b/theme_notes/views/snippets/s_cover.xml
@@ -0,0 +1,19 @@
+<?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="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>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        <b>Discover <br/>the Miraillet Festival</b>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_features_grid.xml b/theme_notes/views/snippets/s_features_grid.xml
new file mode 100644
index 000000000..ea57ced19
--- /dev/null
+++ b/theme_notes/views/snippets/s_features_grid.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_features_grid" inherit_id="website.s_features_grid">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5 pb72 pt96" remove="pt48 pb24" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/13_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Item #4 -->
+    <xpath expr="(//i)[4]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #5 -->
+    <xpath expr="(//i)[5]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #6 -->
+    <xpath expr="(//i)[6]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_image_gallery.xml b/theme_notes/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..be511f110
--- /dev/null
+++ b/theme_notes/views/snippets/s_image_gallery.xml
@@ -0,0 +1,22 @@
+<?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_cover o_full_screen_height" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid" remove="container" separator=" "/>
+    </xpath>
+</template>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <!-- First image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web/image/website.library_image_19</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_image_text.xml b/theme_notes/views/snippets/s_image_text.xml
index d2fca0784..99d3a53d0 100644
--- a/theme_notes/views/snippets/s_image_text.xml
+++ b/theme_notes/views/snippets/s_image_text.xml
@@ -1,26 +1,30 @@
 <?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="class" add="o_cc o_cc5" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/04","flip":["x"]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Blobs_04 o_we_flip_x"/>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[2]" position="replace">
-            <div class="pb16 p-5 border pt32 offset-lg-2 col-lg-6 shadow o_cc o_cc4" style="border-width: 2.5px !important; border-color: rgb(44, 41, 39) !important; box-shadow: rgb(44, 41, 39) 20px -20px 0px 0px !important;">
-              <h2>History</h2>
-              <p>The Miraillet Festival was born in 2002 from a common will of cultural, touristic and institutional actors of the region to propose a major cultural event in the very heart of the region during the summer period.</p>
-              <p><a href="#" class="btn btn-dark mb-2">Discover more</a></p>
-            </div>
-        </xpath>
-        <!-- Picture -->
-        <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-            <attribute name="class" add="col-lg-4" remove="col-lg-6" separator=" "/>
-        </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_cc5 pt80 pb80" remove="pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
+    </xpath>
+    <!-- Text wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="offset-lg-2" separator=" "/>
+    </xpath>
+    <!-- Title & Paragraph -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        The History
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        <br/>
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        The Miraillet Festival was born in 2002 from a common will of cultural, touristic and institutional actors of the region to propose a major cultural event in the very heart of the region during the summer period.
+    </xpath>
+    <!-- Img wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="col-lg-4" remove="col-lg-6" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_masonry_block.xml b/theme_notes/views/snippets/s_masonry_block.xml
new file mode 100644
index 000000000..4ffd44107
--- /dev/null
+++ b/theme_notes/views/snippets/s_masonry_block.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
+    <!-- Little block #01 -->
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/h3" position="replace" mode="inner">
+        Brussels
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/p" position="replace" mode="inner">
+        21th of August
+    </xpath>
+
+    <!-- Little block #02 -->
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]/h3" position="replace" mode="inner">
+        Paris
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]/p" position="replace" mode="inner">
+        24th of August
+    </xpath>
+
+    <!-- Little block #03 -->
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]/h3" position="replace" mode="inner">
+        Barcelona
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]/p" position="replace" mode="inner">
+        27th of August
+    </xpath>
+
+    <!-- Little block #04 -->
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/h3" position="replace" mode="inner">
+        Amsterdam
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/p" position="replace" mode="inner">
+        4th of September
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_media_list.xml b/theme_notes/views/snippets/s_media_list.xml
index 4da1dff63..1c625749c 100644
--- a/theme_notes/views/snippets/s_media_list.xml
+++ b/theme_notes/views/snippets/s_media_list.xml
@@ -1,55 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_media_list" inherit_id="website.s_media_list">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/01_001","flip":["y"]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Blobs_01_001 o_we_flip_y"/>
-        </xpath>
-        <!-- Row 1 -->
-        <xpath expr="(//div[hasclass('col-lg-12')])[1]/div" position="replace">
-            <div class="row s_col_no_resize s_col_no_bgcolor no-gutters border shadow align-items-center flex-row-reverse o_cc o_cc4" style="border-width: 2.5px !important; border-color: rgb(44, 41, 39) !important; box-shadow: rgb(44, 41, 39) 20px -20px 0px 0px !important;">
-                <div class="align-self-stretch s_media_list_img_wrapper col-lg-4">
-                    <img src="/web/image/website.s_media_list_default_image_1" alt="" class="s_media_list_img h-100 w-100"/>
-                </div>
-                <div class="s_media_list_body col-lg-8">
-                    <h3>Go to the Miraillet Festival</h3>
-                    <p>You will find here the different means of transport to get to the festival. The festival is accessible by bike. Be careful, you will be riding in the city centre where there are a lot of cars. Please make sure to park your bikes in the designated areas of the city.</p>
-                    <a href="#" class="btn btn-primary mb-2">Discover</a>
-                </div>
-            </div>
-        </xpath>
-        <!-- Row 2 -->
-        <xpath expr="(//div[hasclass('col-lg-12')])[2]/div" position="replace">
-            <div class="row s_col_no_resize s_col_no_bgcolor no-gutters shadow border align-items-center o_cc o_cc4" style="border-width: 2.5px !important; box-shadow: rgb(44, 41, 39) 20px -20px 0px 0px !important; border-color: rgb(44, 41, 39) !important;">
-                <div class="align-self-stretch s_media_list_img_wrapper col-lg-4">
-                    <img src="/web/image/website.s_media_list_default_image_2" alt="" class="s_media_list_img h-100 w-100"/>
-                </div>
-                <div class="s_media_list_body col-lg-8">
-                    <h3>Ticketing and ticketing timetables</h3>
-                    <p>Where and when to exchange your festival bracelets? Where to buy food and drink tickets? What is the price for children? The answer can be found here!</p>
-                </div>
-            </div>
-        </xpath>
-        <!-- Row 3 -->
-        <xpath expr="(//div[hasclass('col-lg-12')])[3]/div" position="replace">
-            <div class="row s_col_no_resize s_col_no_bgcolor no-gutters o_cc o_cc5 border shadow align-items-center flex-row-reverse" style="border-width: 2.5px !important; border-color: rgb(44, 41, 39) !important; box-shadow: rgb(44, 41, 39) 20px -20px 0px 0px !important;">
-                <div class="align-self-stretch s_media_list_img_wrapper col-lg-4">
-                    <img src="/web/image/website.s_media_list_default_image_3" alt="" class="s_media_list_img h-100 w-100"/>
-                </div>
-                <div class="s_media_list_body col-lg-8">
-                    <h3>Wheelchair accessibility</h3>
-                    <p>Once again this year, the festival, with the support of the non-profit organisations that implement the necessary means to facilitate access to the event for people with reduced mobility and people affected by or carrying a disability.</p>
-                    <a href="#">
-                        <font style="" class="text-o-color-1">Continue reading</font>
-                        <i class="align-middle fa fa-long-arrow-right ml-1 text-o-color-1"></i>
-                    </a>
-                </div>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1 pb96 pt96" remove="o_cc2 pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/01_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Blobs_01_001 o_we_flip_y"/>
+    </xpath>
+
+    <!-- Row #1 -->
+    <xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pt16 pb16" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')]/div" position="attributes">
+        <attribute name="class" add="flex-row-reverse" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Row #1 - Img Wrapper -->
+    <xpath expr="//div[hasclass('s_media_list_img_wrapper')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <!-- Row #1 - Body -->
+    <xpath expr="//div[hasclass('s_media_list_body')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+    <!-- Row #1 - Title -->
+    <xpath expr="//div[hasclass('s_media_list_body')]//h3" position="replace" mode="inner">
+        Go to the <br/>Miraillet Festival
+    </xpath>
+    <!-- Row #1 - Paragraph -->
+    <xpath expr="//div[hasclass('s_media_list_body')]//p" position="replace" mode="inner">
+        <br/>
+        You will find here the different means of transport to get to the festival. The festival is accessible by bike. Be careful, you will be riding in the city centre where there are a lot of cars. Please make sure to park your bikes in the designated areas of the city.
+    </xpath>
+
+    <!-- Row #2 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][2]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pt16 pb16" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][2]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Row #2 - Img Wrapper -->
+    <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>
+    <!-- Row #2 - Body -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+    <!-- Row #2 - Title -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]//h3" position="replace" mode="inner">
+        Ticketing <br/>&amp; timetables
+    </xpath>
+    <!-- Row #2 - Paragraph -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]//p" position="replace" mode="inner">
+        <br/>
+        Where and when to exchange your festival bracelets? Where to buy food and drink tickets? What is the price for children? The answer can be found here!
+    </xpath>
+    <!-- Row #2 - Add a button -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]//p" position="after">
+        <a href="#" class="btn btn-primary mb-2">More info</a>
+    </xpath>
+
+    <!-- Row #3 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][3]" position="attributes">
+        <attribute name="class" add="pt0 pb0" remove="pt16 pb16" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][3]/div" position="attributes">
+        <attribute name="class" add="flex-row-reverse" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Row #3 - Img Wrapper -->
+    <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>
+    <!-- Row #3 - Body -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+    <!-- Row #3 - Title -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]//h3" position="replace" mode="inner">
+        Wheelchair <br/>accessibility
+    </xpath>
+    <!-- Row #3 - Paragraph -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]//p" position="replace" mode="inner">
+        <br/>
+        Once again this year, the festival, with the support of the non-profit organisations that implement the necessary means to facilitate access to the event for people with reduced mobility and people affected by or carrying a disability.
+    </xpath>
+    <!-- Row #3 - Add a button -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]//a" position="replace">
+        <a href="#" class="btn btn-primary mb-2">More info</a>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_notes/views/snippets/s_numbers.xml b/theme_notes/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..b84abf934
--- /dev/null
+++ b/theme_notes/views/snippets/s_numbers.xml
@@ -0,0 +1,47 @@
+<?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="pt0 pb0" remove="pt24 pb24 o_cc o_cc2" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid" remove="container" separator=" "/>
+    </xpath>
+    <!-- Column #1 -->
+    <xpath expr="//div[hasclass('col-lg-3')]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc5" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #1 - Text -->
+    <xpath expr="//h6" position="replace" mode="inner">
+        Editions through the Europe
+    </xpath>
+    <!-- Column #2 -->
+    <xpath expr="//div[hasclass('col-lg-3')][2]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc2" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #2 - Text -->
+    <xpath expr="(//h6)[2]" position="replace" mode="inner">
+        Artists from around the world
+    </xpath>
+    <!-- Column #3 -->
+    <xpath expr="//div[hasclass('col-lg-3')][3]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc3" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #3 - Text -->
+    <xpath expr="(//h6)[3]" position="replace" mode="inner">
+        Scenes outdoor &amp; indoor
+    </xpath>
+    <!-- Column #4 -->
+    <xpath expr="//div[hasclass('col-lg-3')][4]" position="attributes">
+        <attribute name="class" add="pt104 pb104 o_cc o_cc4" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #4 - Text -->
+    <xpath expr="(//h6)[4]" position="replace" mode="inner">
+        Loyal partners
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_parallax.xml b/theme_notes/views/snippets/s_parallax.xml
new file mode 100644
index 000000000..193e9147c
--- /dev/null
+++ b/theme_notes/views/snippets/s_parallax.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_parallax" inherit_id="website.s_parallax">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
+        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
new file mode 100644
index 000000000..e57e96bb1
--- /dev/null
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -0,0 +1,72 @@
+<?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 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb32 pt48" separator=" "/>
+        <attribute name="data-scroll-background-ratio">1</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape & Background image -->
+    <xpath expr="//section/*" position="before">
+        <span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
+        <div class="o_we_shape o_web_editor_Wavy_10"/>
+    </xpath>
+    <!-- Title & subtitles -->
+    <xpath expr="//h2" position="replace">
+        <h2 style="text-align: center;">Upcoming events</h2>
+    </xpath>
+    <xpath expr="//h3" position="replace" mode="inner">
+        Brussels edition
+    </xpath>
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Paris edition
+    </xpath>
+    <!-- Description -->
+    <xpath expr="//div[hasclass('container')]//p" position="replace">
+        <p style="text-align: center;">Get your ticket now</p>
+    </xpath>
+    <!-- Left column : names -->
+    <xpath expr="//ul/t/t" position="replace" mode="inner">
+        Regular ticket
+    </xpath>
+    <xpath expr="//ul/t[2]/t" position="replace" mode="inner">
+        Regular ticket + hotel
+    </xpath>
+    <xpath expr="//ul/t[3]/t" position="replace" mode="inner">
+        VIP ticket
+    </xpath>
+    <!-- Left column : prices -->
+    <xpath expr="//ul/t/t[2]" position="replace" mode="inner">
+        $19.00
+    </xpath>
+    <xpath expr="//ul/t[2]/t[2]" position="replace" mode="inner">
+        $59.00
+    </xpath>
+    <xpath expr="//ul/t[3]/t[2]" position="replace" mode="inner">
+        $109.50
+    </xpath>
+    <!-- Right column : names -->
+    <xpath expr="(//ul)[2]/t/t" position="replace" mode="inner">
+        Regular ticket
+    </xpath>
+    <xpath expr="(//ul)[2]/t[2]/t" position="replace" mode="inner">
+        Regular ticket + hotel
+    </xpath>
+    <xpath expr="(//ul)[2]/t[3]/t" position="replace" mode="inner">
+        VIP ticket
+    </xpath>
+    <!-- Right column : prices -->
+    <xpath expr="(//ul)[2]//t[2]" position="replace" mode="inner">
+        $25.00
+    </xpath>
+    <xpath expr="(//ul)[2]/t[2]/t[2]" position="replace" mode="inner">
+        $65.00
+    </xpath>
+    <xpath expr="(//ul)[2]/t[3]/t[2]" position="replace" mode="inner">
+        $115.50
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_product_list.xml b/theme_notes/views/snippets/s_product_list.xml
new file mode 100644
index 000000000..191fa23b7
--- /dev/null
+++ b/theme_notes/views/snippets/s_product_list.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_product_list" inherit_id="website.s_product_list">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5 pb80 pt96" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container-fluid')]" position="replace">
+        <div class="container">
+            <!-- Row #1 -->
+            <div class="row">
+                <!-- Item #1 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_1" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">T-shirts</a>
+                    </div>
+                </div>
+                <!-- Item #2 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_2" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">Hoodies</a>
+                    </div>
+                </div>
+                <!-- Item #3 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_5" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">Vinyls</a>
+                    </div>
+                </div>
+            </div>
+            <!-- Row #2 -->
+            <div class="row">
+                <!-- Item #4 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_3" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">Sunglasses</a>
+                    </div>
+                </div>
+                <!-- Item #5 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_4" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">Caps</a>
+                    </div>
+                </div>
+                <!-- Item #6 -->
+                <div class="h-100 pb16 col-lg-4">
+                    <a href="#">
+                        <img src="/web/image/website.s_product_list_default_image_6" alt="" class="img img-fluid w-100 rounded" style="max-height: 100%;"/>
+                    </a>
+                    <div class="s_product_list_item_link">
+                        <a href="#" class="btn btn-primary">CD Albums</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_quotes_carousel.xml b/theme_notes/views/snippets/s_quotes_carousel.xml
new file mode 100644
index 000000000..d5d117f74
--- /dev/null
+++ b/theme_notes/views/snippets/s_quotes_carousel.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5 oe_img_bg o_bg_img_center" separator=" "/>
+        <attribute name="style">background-image: url('/web/image/website.s_quotes_carousel_demo_image_6'); background-position: 50% 65%;</attribute>
+    </xpath>
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="before">
+        <div class="o_we_bg_filter bg-black-75"/>
+    </xpath>
+    <!-- Carousel -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc2" separator=" "/>
+    </xpath>
+    <!-- Carousel item #1 -->
+    <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
+        <attribute name="style"/>
+    </xpath>
+    <!-- Carousel item #2 -->
+    <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="style"/>
+    </xpath>
+    <!-- Carousel item #3 -->
+    <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="style"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_text_image.xml b/theme_notes/views/snippets/s_text_image.xml
new file mode 100644
index 000000000..e6a146f2f
--- /dev/null
+++ b/theme_notes/views/snippets/s_text_image.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 pt80 pb80" remove="pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Title & Paragraph -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        About the Festival
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        <br/>
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        The Miraillet Festival was born in 2002 from a common will of cultural, touristic and institutional actors of the region to propose a major cultural event in the very heart of the region during the summer period.
+    </xpath>
+    <xpath expr="//a[hasclass('btn')]" position="replace" mode="inner">
+        Discover more
+    </xpath>
+    <!-- Image wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="col-lg-4 offset-lg-2" remove="col-lg-6" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/views/snippets/s_three_columns.xml b/theme_notes/views/snippets/s_three_columns.xml
new file mode 100644
index 000000000..1dde3ab97
--- /dev/null
+++ b/theme_notes/views/snippets/s_three_columns.xml
@@ -0,0 +1,16 @@
+<?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="pt104 pb104" remove="pt32 pb32" separator=" "/>
+        <attribute name="style">background-image: url('/web/image/website.s_three_columns_default_image');</attribute>
+    </xpath>
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-black-50"/>
+    </xpath>
+</template>
+
+</odoo>