diff --git a/theme_bistro/__manifest__.py b/theme_bistro/__manifest__.py
index 6a3d5d95b..69d707823 100644
--- a/theme_bistro/__manifest__.py
+++ b/theme_bistro/__manifest__.py
@@ -11,17 +11,31 @@
         'data/ir_asset.xml',
         'views/images_library.xml',
 
+        'views/layout.xml',
+
+        'views/snippets/s_banner.xml',
+        'views/snippets/s_columns.xml',
         'views/snippets/s_cover.xml',
         'views/snippets/s_features.xml',
+        'views/snippets/s_image_text.xml',
+        'views/snippets/s_media_list.xml',
+        'views/snippets/s_numbers.xml',
         'views/snippets/s_picture.xml',
         'views/snippets/s_product_catalog.xml',
         'views/snippets/s_quotes_carousel.xml',
         'views/snippets/s_text_block.xml',
+        'views/snippets/s_text_image.xml',
     ],
     'images': [
         'static/description/bistro_cover.jpg',
-        'static/description/bistro_screenshot.jpeg',
+        'static/description/bistro_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_cover_default_image': '/theme_bistro/static/src/img/backgrounds/17.jpg',
+        'website.s_picture_default_image': '/theme_bistro/static/src/img/content/picture.jpg',
+        'website.s_product_catalog_default_image': '/theme_bistro/static/src/img/backgrounds/16.jpg',
+        'website.s_quotes_carousel_demo_image_1': '/theme_bistro/static/src/img/backgrounds/19.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-bistro.odoo.com',
     'assets': {
diff --git a/theme_bistro/data/ir_asset.xml b/theme_bistro/data/ir_asset.xml
index 965c678f9..f1eaf0570 100644
--- a/theme_bistro/data/ir_asset.xml
+++ b/theme_bistro/data/ir_asset.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_bistro.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_bistro.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_bistro/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_bistro.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_bistro.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_bistro/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_bistro.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_bistro.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_bistro/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_bistro.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_bistro.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_bistro/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_bistro/models/theme_bistro.py b/theme_bistro/models/theme_bistro.py
index a6b3f28f5..4fbeef902 100644
--- a/theme_bistro/models/theme_bistro.py
+++ b/theme_bistro/models/theme_bistro.py
@@ -9,6 +9,7 @@ class ThemeBistro(models.AbstractModel):
         self.enable_view('website.template_header_vertical')
         self.enable_view('website.template_header_default_align_right')
         self.enable_view('website.template_header_hamburger_align_right')
+        self.enable_view('website.header_navbar_pills_style')
         self.enable_header_off_canvas()
 
         self.disable_view('website.footer_custom')
diff --git a/theme_bistro/static/description/bistro_screenshot.jpeg b/theme_bistro/static/description/bistro_screenshot.jpeg
deleted file mode 100644
index 43d16a880..000000000
Binary files a/theme_bistro/static/description/bistro_screenshot.jpeg and /dev/null differ
diff --git a/theme_bistro/static/description/bistro_screenshot.jpg b/theme_bistro/static/description/bistro_screenshot.jpg
new file mode 100644
index 000000000..2e50ce3da
Binary files /dev/null and b/theme_bistro/static/description/bistro_screenshot.jpg differ
diff --git a/theme_bistro/static/src/img/backgrounds/19.jpg b/theme_bistro/static/src/img/backgrounds/19.jpg
new file mode 100644
index 000000000..a95724f02
Binary files /dev/null and b/theme_bistro/static/src/img/backgrounds/19.jpg differ
diff --git a/theme_bistro/static/src/js/tour.js b/theme_bistro/static/src/js/tour.js
index f112bba57..e134b2ab0 100644
--- a/theme_bistro/static/src/js/tour.js
+++ b/theme_bistro/static/src/js/tour.js
@@ -1,8 +1,6 @@
-odoo.define("theme_bistro.tour.bistro", function (require) {
-"use strict";
+/** @odoo-module */
 
-const wTourUtils = require("website.tour_utils");
-var tour = require("web_tour.tour");
+import wTourUtils from 'website.tour_utils';
 
 const snippets = [
     {
@@ -37,11 +35,11 @@ wTourUtils.registerThemeHomepageTour("bistro_tour", [
     wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[1]),
     wTourUtils.dragNDrop(snippets[2]),
+    wTourUtils.clickOnSnippet(snippets[2]),
+    wTourUtils.changeBackgroundColor(),
+    wTourUtils.selectColorPalette(),
+    wTourUtils.goBackToBlocks(),
     wTourUtils.dragNDrop(snippets[3]),
     wTourUtils.dragNDrop(snippets[4]),
     wTourUtils.dragNDrop(snippets[5]),
-    wTourUtils.clickOnSnippet(snippets[5], 'top'),
-    wTourUtils.changeBackgroundColor(),
-    wTourUtils.selectColorPalette(),
 ]);
-});
diff --git a/theme_bistro/static/src/scss/bootstrap_overridden.scss b/theme_bistro/static/src/scss/bootstrap_overridden.scss
index 49b2a355e..c7252cf04 100644
--- a/theme_bistro/static/src/scss/bootstrap_overridden.scss
+++ b/theme_bistro/static/src/scss/bootstrap_overridden.scss
@@ -59,6 +59,8 @@ $font-weight-bold:                          $o-theme-font-weight-bold !default;
 
 $headings-font-weight:                      $o-theme-headings-font-weight !default;
 
+$blockquote-font-size:                      o-website-value('font-size-base') !default;
+
 // Buttons + Forms
 //
 // Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
diff --git a/theme_bistro/static/src/scss/primary_variables.scss b/theme_bistro/static/src/scss/primary_variables.scss
index db40f51b7..b5918df24 100644
--- a/theme_bistro/static/src/scss/primary_variables.scss
+++ b/theme_bistro/static/src/scss/primary_variables.scss
@@ -4,13 +4,15 @@
 
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'bistro-5',
+        'color-palettes-name':              'bistro-5',
 
         // Header
         'header-template':                  'vertical',
         'hamburger-position':               'right',
         'logo-height':                      3rem,
         'fixed-logo-height':                2rem,
+        'header-links-style':               'pills',
+        'menu-box-shadow':                  none,
 
         // Font
         'font':                             'Poppins',
@@ -19,7 +21,7 @@ $o-website-values-palettes: (
         'buttons-font':                     'Poppins',
 
         // Buttons
-        'btn-padding-y':                    .45rem,
+        'btn-padding-y':                    .5rem,
         'btn-padding-x':                    1.35rem,
         'btn-padding-y-sm':                 .3rem,
         'btn-padding-x-sm':                 .9rem,
@@ -125,46 +127,46 @@ $o-theme-btn-font-weight:                   400;
 $o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
         'bistro-1': (
-            'alpha':                            #68b581,
-            'beta':                             #00a388,
-            'gamma':                            #046380,
-            'delta':                            #4bb5c1,
-            'epsilon':                          #beeb9f,
+            'alpha':                        #68b581,
+            'beta':                         #00a388,
+            'gamma':                        #046380,
+            'delta':                        #4bb5c1,
+            'epsilon':                      #beeb9f,
         ),
         'bistro-2': (
-            'alpha':                            #a3cc52,
-            'beta':                             #cc4452,
-            'gamma':                            #8e3557,
-            'delta':                            #f7f2b2,
-            'epsilon':                          #4a1a2c,
+            'alpha':                        #a3cc52,
+            'beta':                         #cc4452,
+            'gamma':                        #8e3557,
+            'delta':                        #f7f2b2,
+            'epsilon':                      #4a1a2c,
         ),
         'bistro-3': (
-            'alpha':                            #eebf3e,
-            'beta':                             #e2ad3b,
-            'gamma':                            #bf5c00,
-            'delta':                            #77c4d3,
-            'epsilon':                          #901811,
+            'alpha':                        #eebf3e,
+            'beta':                         #e2ad3b,
+            'gamma':                        #bf5c00,
+            'delta':                        #77c4d3,
+            'epsilon':                      #901811,
         ),
         'bistro-4': (
-            'alpha':                            #0092b2,
-            'beta':                             #046380,
-            'gamma':                            #a8c545,
-            'delta':                            #fff6c5,
-            'epsilon':                          #ffd55c,
+            'alpha':                        #0092b2,
+            'beta':                         #046380,
+            'gamma':                        #a8c545,
+            'delta':                        #fff6c5,
+            'epsilon':                      #ffd55c,
         ),
         'bistro-5': (
-            'alpha':                            #dd7e43,
-            'beta':                             #d45c45,
-            'gamma':                            #911146,
-            'delta':                            #9cc264,
-            'epsilon':                          #306e73,
+            'alpha':                        #dd7e43,
+            'beta':                         #d45c45,
+            'gamma':                        #911146,
+            'delta':                        #9cc264,
+            'epsilon':                      #306e73,
         ),
         'bistro-6': (
-            'alpha':                            #b7ca79,
-            'beta':                             #677e52,
-            'gamma':                            #b0cc99,
-            'delta':                            #89725b,
-            'epsilon':                          #f6e8b1,
+            'alpha':                        #b7ca79,
+            'beta':                         #677e52,
+            'gamma':                        #b0cc99,
+            'delta':                        #89725b,
+            'epsilon':                      #f6e8b1,
         ),
     )
 );
@@ -196,3 +198,11 @@ $o-color-palettes-compatibility-indexes: (
     22: 'generic-16',
     23: 'generic-17',
 );
+
+//------------------------------------------------------------------------------//
+// Shapes
+//------------------------------------------------------------------------------//
+
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/04_001', (3: 5));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/09_001', (3: 3));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Zigs/06', (5: rgba(0,0,0,0)));
diff --git a/theme_bistro/views/images_library.xml b/theme_bistro/views/images_library.xml
index 608003bdc..a25093289 100644
--- a/theme_bistro/views/images_library.xml
+++ b/theme_bistro/views/images_library.xml
@@ -1,285 +1,345 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Backgrounds -->
-    <record id="bg_img_01" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_01</field>
-        <field name="name">theme_bistro.background_img_01.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/01.jpg</field>
-    </record>
-    <record id="bg_img_02" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_02</field>
-        <field name="name">theme_bistro.background_img_02.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/02.jpg</field>
-    </record>
-    <record id="bg_img_03" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_03</field>
-        <field name="name">theme_bistro.background_img_03.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/03.jpg</field>
-    </record>
-    <record id="bg_img_04" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_04</field>
-        <field name="name">theme_bistro.background_img_04.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/04.jpg</field>
-    </record>
-    <record id="bg_img_05" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_05</field>
-        <field name="name">theme_bistro.background_img_05.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/05.jpg</field>
-    </record>
-    <record id="bg_img_06" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_06</field>
-        <field name="name">theme_bistro.background_img_06.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/06.jpg</field>
-    </record>
-    <record id="bg_img_07" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_07</field>
-        <field name="name">theme_bistro.background_img_07.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/07.jpg</field>
-    </record>
-    <record id="bg_img_08" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_08</field>
-        <field name="name">theme_bistro.background_img_08.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/08.jpg</field>
-    </record>
-    <record id="bg_img_09" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_09</field>
-        <field name="name">theme_bistro.background_img_09.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/09.jpg</field>
-    </record>
-    <record id="bg_img_10" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_10</field>
-        <field name="name">theme_bistro.background_img_10.jpg</field>
-      <field name="url">/theme_bistro/static/src/img/backgrounds/10.jpg</field>
-    </record>
-    <record id="bg_img_11" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_11</field>
-        <field name="name">theme_bistro.background_img_11.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/11.jpg</field>
-    </record>
-    <record id="bg_img_12" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_12</field>
-        <field name="name">theme_bistro.background_img_12.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/12.jpg</field>
-    </record>
-    <record id="bg_img_13" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_13</field>
-        <field name="name">theme_bistro.background_img_13.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/13.jpg</field>
-    </record>
-    <record id="bg_img_14" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_14</field>
-        <field name="name">theme_bistro.background_img_14.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/14.jpg</field>
-    </record>
-    <record id="bg_img_15" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_15</field>
-        <field name="name">theme_bistro.background_img_15.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/15.jpg</field>
-    </record>
-    <record id="bg_img_16" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_16</field>
-        <field name="name">theme_bistro.background_img_16.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/16.jpg</field>
-    </record>
-    <record id="bg_img_17" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_17</field>
-        <field name="name">theme_bistro.background_img_17.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/17.jpg</field>
-    </record>
-    <record id="bg_img_18" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_img_18</field>
-        <field name="name">theme_bistro.background_img_18.jpg</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/18.jpg</field>
-    </record>
 
-    <!-- Patterns -->
-    <record id="bg_pattern_07" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_07</field>
-        <field name="name">theme_bistro.background_pattern_07.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/01.gif</field>
-    </record>
-    <record id="bg_pattern_08" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_08</field>
-        <field name="name">theme_bistro.background_pattern_08.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/02.gif</field>
-    </record>
-    <record id="bg_pattern_01" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_01</field>
-        <field name="name">theme_bistro.background_pattern_01.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/03.gif</field>
-    </record>
-    <record id="bg_pattern_02" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_02</field>
-        <field name="name">theme_bistro.background_pattern_02.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/07.gif</field>
-    </record>
-    <record id="bg_pattern_03" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_03</field>
-        <field name="name">theme_bistro.background_pattern_03.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/04.gif</field>
-    </record>
-    <record id="bg_pattern_05" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_05</field>
-        <field name="name">theme_bistro.background_pattern_05.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/05.png</field>
-    </record>
-    <record id="bg_pattern_06" model="theme.ir.attachment">
-        <field name="key">theme_bistro.bg_pattern_06</field>
-        <field name="name">theme_bistro.background_pattern_06.gif</field>
-        <field name="url">/theme_bistro/static/src/img/patterns/06.png</field>
-    </record>
+<!-- Backgrounds -->
+<record id="bg_img_01" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_01</field>
+    <field name="name">theme_bistro.background_img_01.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/01.jpg</field>
+</record>
+<record id="bg_img_02" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_02</field>
+    <field name="name">theme_bistro.background_img_02.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/02.jpg</field>
+</record>
+<record id="bg_img_03" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_03</field>
+    <field name="name">theme_bistro.background_img_03.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/03.jpg</field>
+</record>
+<record id="bg_img_04" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_04</field>
+    <field name="name">theme_bistro.background_img_04.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/04.jpg</field>
+</record>
+<record id="bg_img_05" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_05</field>
+    <field name="name">theme_bistro.background_img_05.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/05.jpg</field>
+</record>
+<record id="bg_img_06" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_06</field>
+    <field name="name">theme_bistro.background_img_06.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/06.jpg</field>
+</record>
+<record id="bg_img_07" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_07</field>
+    <field name="name">theme_bistro.background_img_07.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/07.jpg</field>
+</record>
+<record id="bg_img_08" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_08</field>
+    <field name="name">theme_bistro.background_img_08.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/08.jpg</field>
+</record>
+<record id="bg_img_09" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_09</field>
+    <field name="name">theme_bistro.background_img_09.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/09.jpg</field>
+</record>
+<record id="bg_img_10" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_10</field>
+    <field name="name">theme_bistro.background_img_10.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/10.jpg</field>
+</record>
+<record id="bg_img_11" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_11</field>
+    <field name="name">theme_bistro.background_img_11.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/11.jpg</field>
+</record>
+<record id="bg_img_12" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_12</field>
+    <field name="name">theme_bistro.background_img_12.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/12.jpg</field>
+</record>
+<record id="bg_img_13" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_13</field>
+    <field name="name">theme_bistro.background_img_13.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/13.jpg</field>
+</record>
+<record id="bg_img_14" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_14</field>
+    <field name="name">theme_bistro.background_img_14.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/14.jpg</field>
+</record>
+<record id="bg_img_15" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_15</field>
+    <field name="name">theme_bistro.background_img_15.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/15.jpg</field>
+</record>
+<record id="bg_img_16" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_16</field>
+    <field name="name">theme_bistro.background_img_16.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/16.jpg</field>
+</record>
+<record id="bg_img_17" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_17</field>
+    <field name="name">theme_bistro.background_img_17.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/17.jpg</field>
+</record>
+<record id="bg_img_18" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_img_18</field>
+    <field name="name">theme_bistro.background_img_18.jpg</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/18.jpg</field>
+</record>
 
-    <!-- Banner -->
-    <record id="s_banner_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_banner_default_image</field>
-        <field name="name">website.s_banner_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/02.jpg</field>
-    </record>
+<!-- Patterns -->
+<record id="bg_pattern_07" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_07</field>
+    <field name="name">theme_bistro.background_pattern_07.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/01.gif</field>
+</record>
+<record id="bg_pattern_08" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_08</field>
+    <field name="name">theme_bistro.background_pattern_08.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/02.gif</field>
+</record>
+<record id="bg_pattern_01" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_01</field>
+    <field name="name">theme_bistro.background_pattern_01.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/03.gif</field>
+</record>
+<record id="bg_pattern_02" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_02</field>
+    <field name="name">theme_bistro.background_pattern_02.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/07.gif</field>
+</record>
+<record id="bg_pattern_03" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_03</field>
+    <field name="name">theme_bistro.background_pattern_03.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/04.gif</field>
+</record>
+<record id="bg_pattern_05" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_05</field>
+    <field name="name">theme_bistro.background_pattern_05.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/05.png</field>
+</record>
+<record id="bg_pattern_06" model="theme.ir.attachment">
+    <field name="key">theme_bistro.bg_pattern_06</field>
+    <field name="name">theme_bistro.background_pattern_06.gif</field>
+    <field name="url">/theme_bistro/static/src/img/patterns/06.png</field>
+</record>
 
-    <!-- Cover -->
-    <record id="s_cover_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_cover_default_image</field>
-        <field name="name">website.s_cover_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/17.jpg</field>
-    </record>
+<!-- Banner -->
+<record id="s_banner_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_banner_default_image</field>
+    <field name="name">website.s_banner_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/02.jpg</field>
+</record>
 
-    <!-- Text-Image -->
-    <record id="s_text_image_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_text_image_default_image</field>
-        <field name="name">website.s_text_image_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/content/text_image.jpg</field>
-    </record>
+<!-- Cover -->
+<record id="s_cover_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_cover_default_image</field>
+    <field name="name">website.s_cover_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/17.jpg</field>
+</record>
 
-    <!-- Image-Text -->
-    <record id="s_image_text_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_image_text_default_image</field>
-        <field name="name">website.s_image_text_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/content/image_text.jpg</field>
-    </record>
+<!-- Text-Image -->
+<record id="s_text_image_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_text_image_default_image</field>
+    <field name="name">website.s_text_image_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/content/text_image.jpg</field>
+</record>
 
-    <!-- Picture -->
-    <record id="s_picture_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_picture_default_image</field>
-        <field name="name">website.s_picture_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/content/picture.jpg</field>
-    </record>
+<!-- Image-Text -->
+<record id="s_image_text_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_image_text_default_image</field>
+    <field name="name">website.s_image_text_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/content/image_text.jpg</field>
+</record>
 
-    <!-- Three Columns -->
-    <record id="s_three_columns_default_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_three_columns_default_image_1</field>
-        <field name="name">website.s_three_columns_default_image_1</field>
-        <field name="url">/theme_bistro/static/src/img/content/three_columns_01.jpg</field>
-    </record>
-    <record id="s_three_columns_default_image_2" model="theme.ir.attachment">
-        <field name="key">website.s_three_columns_default_image_2</field>
-        <field name="name">website.s_three_columns_default_image_2</field>
-        <field name="url">/theme_bistro/static/src/img/content/three_columns_02.jpg</field>
-    </record>
-    <record id="s_three_columns_default_image_3" model="theme.ir.attachment">
-        <field name="key">website.s_three_columns_default_image_3</field>
-        <field name="name">website.s_three_columns_default_image_3</field>
-        <field name="url">/theme_bistro/static/src/img/content/three_columns_03.jpg</field>
-    </record>
+<!-- Picture -->
+<record id="s_picture_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_picture_default_image</field>
+    <field name="name">website.s_picture_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/content/picture.jpg</field>
+</record>
 
-    <!-- Masonry -->
-    <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_bistro/static/src/img/backgrounds/09.jpg</field>
-    </record>
+<!-- Three Columns -->
+<record id="s_three_columns_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_1</field>
+    <field name="name">website.s_three_columns_default_image_1</field>
+    <field name="url">/theme_bistro/static/src/img/content/three_columns_01.jpg</field>
+</record>
+<record id="s_three_columns_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_2</field>
+    <field name="name">website.s_three_columns_default_image_2</field>
+    <field name="url">/theme_bistro/static/src/img/content/three_columns_02.jpg</field>
+</record>
+<record id="s_three_columns_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_3</field>
+    <field name="name">website.s_three_columns_default_image_3</field>
+    <field name="url">/theme_bistro/static/src/img/content/three_columns_03.jpg</field>
+</record>
 
-    <!-- Carousel -->
-    <record id="s_carousel_default_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_carousel_default_image_1</field>
-        <field name="name">website.s_carousel_default_image_1</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/18.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_bistro/static/src/img/backgrounds/05.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_bistro/static/src/img/backgrounds/07.jpg</field>
-    </record>
+<!-- Masonry -->
+<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_bistro/static/src/img/backgrounds/09.jpg</field>
+</record>
 
-    <!-- Media List -->
-    <record id="s_media_list_default_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_media_list_default_image_1</field>
-        <field name="name">website.s_media_list_default_image_1</field>
-        <field name="url">/theme_bistro/static/src/img/content/media_list_01.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_bistro/static/src/img/content/media_list_02.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_bistro/static/src/img/content/media_list_03.jpg</field>
-    </record>
+<!-- Carousel -->
+<record id="s_carousel_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_carousel_default_image_1</field>
+    <field name="name">website.s_carousel_default_image_1</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/18.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_bistro/static/src/img/backgrounds/05.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_bistro/static/src/img/backgrounds/07.jpg</field>
+</record>
 
-    <!-- Parallax -->
-    <record id="s_parallax_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_parallax_default_image</field>
-        <field name="name">website.s_parallax_default_image</field>
-        <field name="url">/theme_bistro/static/src/img/backgrounds/16.jpg</field>
-    </record>
+<!-- Quotes Carousel -->
+<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_bistro/static/src/img/backgrounds/19.jpg</field>
+</record>
 
-    <!-- Company Team -->
-    <record id="s_company_team_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_company_team_image_1</field>
-        <field name="name">website.s_company_team_default_image_1</field>
-        <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_2</field>
-        <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_3</field>
-        <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_4</field>
-        <field name="url">/theme_bistro/static/src/img/content/company_team_04.jpg</field>
-    </record>
+<!-- Media List -->
+<record id="s_media_list_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_media_list_default_image_1</field>
+    <field name="name">website.s_media_list_default_image_1</field>
+    <field name="url">/theme_bistro/static/src/img/content/media_list_01.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_bistro/static/src/img/content/media_list_02.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_bistro/static/src/img/content/media_list_03.jpg</field>
+</record>
+
+<!-- Parallax -->
+<record id="s_parallax_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_parallax_default_image</field>
+    <field name="name">website.s_parallax_default_image</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/16.jpg</field>
+</record>
+
+<!-- Company Team -->
+<record id="s_company_team_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_1</field>
+    <field name="name">website.s_company_team_default_image_1</field>
+    <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_2</field>
+    <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_3</field>
+    <field name="url">/theme_bistro/static/src/img/content/company_team_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_default_image_4</field>
+    <field name="url">/theme_bistro/static/src/img/content/company_team_04.jpg</field>
+</record>
+
+<!-- References -->
+<record id="s_reference_demo_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_reference_demo_image_1</field>
+    <field name="name">website.s_reference_default_image_1</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_01.png</field>
+</record>
+<record id="s_reference_demo_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_reference_demo_image_2</field>
+    <field name="name">website.s_reference_default_image_2</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_02.png</field>
+</record>
+<record id="s_reference_demo_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_reference_demo_image_3</field>
+    <field name="name">website.s_reference_default_image_3</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_03.png</field>
+</record>
+<record id="s_reference_demo_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_reference_demo_image_4</field>
+    <field name="name">website.s_reference_default_image_4</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_04.png</field>
+</record>
+<record id="s_reference_demo_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_reference_demo_image_5</field>
+    <field name="name">website.s_reference_default_image_5</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_05.png</field>
+</record>
+<record id="s_reference_default_image_6" model="theme.ir.attachment">
+    <field name="key">website.s_reference_default_image_6</field>
+    <field name="name">website.s_reference_default_image_6</field>
+    <field name="url">/theme_bistro/static/src/img/content/reference_06.png</field>
+</record>
+
+<!-- Pricelist -->
+<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_bistro/static/src/img/backgrounds/16.jpg</field>
+</record>
+
+<!-- Image Wall + Gallery -->
+<record id="library_image_02" model="theme.ir.attachment">
+    <field name="key">website.library_image_02</field>
+    <field name="name">website.library_image_02</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/06.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_bistro/static/src/img/backgrounds/04.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_bistro/static/src/img/backgrounds/05.jpg</field>
+</record>
+
+<!-- Image Wall -->
+<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_bistro/static/src/img/backgrounds/07.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_bistro/static/src/img/backgrounds/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_bistro/static/src/img/backgrounds/11.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_bistro/static/src/img/backgrounds/15.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_bistro/static/src/img/backgrounds/08.jpg</field>
+</record>
 
-    <!-- References -->
-    <record id="s_reference_demo_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_reference_demo_image_1</field>
-        <field name="name">website.s_reference_default_image_1</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_01.png</field>
-    </record>
-    <record id="s_reference_demo_image_2" model="theme.ir.attachment">
-        <field name="key">website.s_reference_demo_image_2</field>
-        <field name="name">website.s_reference_default_image_2</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_02.png</field>
-    </record>
-    <record id="s_reference_demo_image_3" model="theme.ir.attachment">
-        <field name="key">website.s_reference_demo_image_3</field>
-        <field name="name">website.s_reference_default_image_3</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_03.png</field>
-    </record>
-    <record id="s_reference_demo_image_4" model="theme.ir.attachment">
-        <field name="key">website.s_reference_demo_image_4</field>
-        <field name="name">website.s_reference_default_image_4</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_04.png</field>
-    </record>
-    <record id="s_reference_demo_image_5" model="theme.ir.attachment">
-        <field name="key">website.s_reference_demo_image_5</field>
-        <field name="name">website.s_reference_default_image_5</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_05.png</field>
-    </record>
-    <record id="s_reference_default_image_6" model="theme.ir.attachment">
-        <field name="key">website.s_reference_default_image_6</field>
-        <field name="name">website.s_reference_default_image_6</field>
-        <field name="url">/theme_bistro/static/src/img/content/reference_06.png</field>
-    </record>
 </odoo>
diff --git a/theme_bistro/views/layout.xml b/theme_bistro/views/layout.xml
new file mode 100644
index 000000000..65f59bead
--- /dev/null
+++ b/theme_bistro/views/layout.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- Right align Scroll-to-Top button -->
+<template id="option_footer_scrolltop" inherit_id="website.option_footer_scrolltop">
+    <xpath expr="//*[@id='o_footer_scrolltop_wrapper']" position="attributes">
+        <attribute name="class" add="justify-content-end" remove="justify-content-center" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_banner.xml b/theme_bistro/views/snippets/s_banner.xml
new file mode 100644
index 000000000..e49c692f0
--- /dev/null
+++ b/theme_bistro/views/snippets/s_banner.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="section" position="attributes">
+        <attribute name="class" add="o_half_screen_height" remove="parallax s_parallax_is_fixed" separator=" "/>
+        <attribute name="data-scroll-background-ratio">0</attribute>
+        <attribute name="style">background-image: url('/web/image/website.s_banner_default_image'); background-position: 50% 0;</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/09_001","flip":["x"]}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('s_parallax_bg')]" position="replace"/>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_09_001 o_we_flip_x"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Tasty Meals
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_columns.xml b/theme_bistro/views/snippets/s_columns.xml
new file mode 100644
index 000000000..a03f6b5f1
--- /dev/null
+++ b/theme_bistro/views/snippets/s_columns.xml
@@ -0,0 +1,11 @@
+<?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="pt80 pb80 bg-200" remove="o_cc o_cc2 pt32 pb32" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_cover.xml b/theme_bistro/views/snippets/s_cover.xml
index 7cd9960f4..613575f0c 100644
--- a/theme_bistro/views/snippets/s_cover.xml
+++ b/theme_bistro/views/snippets/s_cover.xml
@@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_cover" inherit_id="website.s_cover">
-        <!-- Section -->
-        <xpath expr="section" position="attributes">
-            <attribute name="class" add="o_full_screen_height" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1 style="text-align: center;">
-                <font style="font-size: 62px;"><b>Daily Fresh Food</b></font>
-            </h1>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p" position="replace">
-            <h6 class="text-center">Only local and fresh products to keep you healthy.</h6>
-            <p><br/></p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="//a[hasclass('btn')]" position="replace">
-            <a t-att-href="cta_btn_href" class="btn btn-lg btn-primary rounded-circle mb-2"><t t-esc="cta_btn_text">Menu</t></a>
-        </xpath>
-        <!-- Scroll Down button -->
-        <xpath expr="//div[hasclass('container')]" position="after">
-            <a class="o_scroll_button rounded-circle align-items-center justify-content-center mx-auto bg-o-color-5 mb-2" href="#" title="Scroll down to next section">
-                <i class="fa fa-angle-down fa-2x"/>
-            </a>
-        </xpath>
-    </template>
+
+<template id="s_cover" inherit_id="website.s_cover">
+    <!-- Section -->
+    <xpath expr="section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('s_parallax_bg')]" position="attributes">
+        <attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 0;" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Zigs_06"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1//font" position="replace" mode="inner">
+        Seasonal<br/> Flavors
+    </xpath>
+    <xpath expr="//h1" position="before">
+        <i class="fa fa-5x fa-leaf text-o-color-3 mx-auto my-4"/>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Daily fresh products combined with our professional yet convivial service<br/> to create a true gastronomic experience.
+    </xpath>
+    <xpath expr="//p" position="after">
+        <p class="lead" style="text-align: center;"><br/></p>
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//a//t" position="replace" mode="inner">
+        Our Menu
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_features.xml b/theme_bistro/views/snippets/s_features.xml
index 072cd7f18..3578ca6b6 100644
--- a/theme_bistro/views/snippets/s_features.xml
+++ b/theme_bistro/views/snippets/s_features.xml
@@ -1,35 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_features" inherit_id="website.s_features">
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]/i" position="replace">
-            <i class="fa fa-2x fa-coffee rounded-circle bg-primary m-3"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]/h3" position="replace">
-            <h4>Breakfast</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]/p" position="replace">
-            <p>Help you start your morning right.<br/><small>From <b>7:30 pm</b> to <b>10:30 pm</b></small></p>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]/div[2]/i" position="replace">
-            <i class="fa fa-2x fa-cutlery rounded-circle bg-400 m-3"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/h3" position="replace">
-            <h4>Lunch</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/p" position="replace">
-            <p>Take a break from your busy schedule.<br/><small>From <b>11:30 pm</b> to <b>14:30 am</b></small></p>
-        </xpath>
-        <!-- Column #03 -->
-        <xpath expr="//div[hasclass('row')]/div[3]/i" position="replace">
-            <i class="fa fa-2x fa-glass rounded-circle bg-secondary m-3"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]/h3" position="replace">
-            <h4>Dinner</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]/p" position="replace">
-            <p>Enjoy tasty food with friends.<br/><small>From <b>6:30 am</b> to <b>10:30 am</b></small></p>
-        </xpath>
-    </template>
+
+<template id="s_features" inherit_id="website.s_features">
+    <!-- Column #01 -->
+    <xpath expr="//i" position="replace">
+        <i class="fa fa-2x fa-coffee rounded-circle bg-primary m-3"/>
+    </xpath>
+    <xpath expr="//h3" position="replace" mode="inner">
+        Breakfast
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        Help you start your morning right.<br/><small>From <b>7:30 pm</b> to <b>10:30 pm</b></small>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="(//i)[2]" position="replace">
+        <i class="fa fa-2x fa-cutlery rounded-circle bg-400 m-3"/>
+    </xpath>
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Lunch
+    </xpath>
+    <xpath expr="(//p)[2]" position="replace" mode="inner">
+        Take a break from your busy schedule.<br/><small>From <b>11:30 pm</b> to <b>14:30 am</b></small>
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="(//i)[3]" position="replace">
+        <i class="fa fa-2x fa-glass rounded-circle bg-secondary m-3"/>
+    </xpath>
+    <xpath expr="(//h3)[3]" position="replace" mode="inner">
+        Dinner
+    </xpath>
+    <xpath expr="(//p)[3]" position="replace" mode="inner">
+        Enjoy tasty food with friends.<br/><small>From <b>6:30 am</b> to <b>10:30 am</b></small>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_image_text.xml b/theme_bistro/views/snippets/s_image_text.xml
new file mode 100644
index 000000000..10aef932b
--- /dev/null
+++ b/theme_bistro/views/snippets/s_image_text.xml
@@ -0,0 +1,16 @@
+<?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="pt64 pb64 bg-200" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="img-thumbnail" separator=" "/>
+        <attribute name="style" add="padding: 20px !important;" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_media_list.xml b/theme_bistro/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..0734f524f
--- /dev/null
+++ b/theme_bistro/views/snippets/s_media_list.xml
@@ -0,0 +1,11 @@
+<?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="pt48 pb48 o_cc5" remove="pt32 pb32 o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_numbers.xml b/theme_bistro/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..a243be880
--- /dev/null
+++ b/theme_bistro/views/snippets/s_numbers.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_numbers" inherit_id="website.s_numbers">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/snippets/s_picture.xml b/theme_bistro/views/snippets/s_picture.xml
index db951c980..52a6099d3 100644
--- a/theme_bistro/views/snippets/s_picture.xml
+++ b/theme_bistro/views/snippets/s_picture.xml
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_picture" inherit_id="website.s_picture">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt80 pb32" remove="pt48 pb24" separator=" "/>
-        </xpath>
-        <!-- Size -->
-        <xpath expr="//div[hasclass('col-lg-10')]" position="attributes">
-            <attribute name="class" add="col-lg-8 offset-lg-2" remove="col-lg-10 offset-lg-1" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2 style="text-align: center;">Today's special</h2>
-        </xpath>
-        <!-- Text -->
-        <xpath expr="//p" position="replace">
-            <p style="text-align: center;">Taste our chef special, the macon two shells of almond macaroon<br/> topped with a creamy orange blossom scent.</p>
-        </xpath>
-        <!-- Caption -->
-        <xpath expr="//figcaption" position="replace">
-            <figcaption class="figure-caption text-muted py-3">The perfect dessert to share for the table.</figcaption>
-        </xpath>
-    </template>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3 pt64" remove="o_cc2 pt48 pb24" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001"}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_04_001"/>
+    </xpath>
+    <!-- Size -->
+    <xpath expr="//div[hasclass('col-lg-10')]" position="attributes">
+        <attribute name="class" add="col-lg-8 offset-lg-2" remove="col-lg-10 offset-lg-1" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Today's special
+    </xpath>
+    <!-- Text -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Taste our chef special, the macon two shells of almond macaroon<br/> topped with a creamy orange blossom scent.
+    </xpath>
+    <!-- Caption -->
+    <xpath expr="//figcaption" position="replace" mode="inner">
+        The perfect dessert to share for the table.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index c5e2d82e7..abe7ea75b 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -1,19 +1,34 @@
 <?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="style"/>
-            <attribute name="class" add="pt96 pb80 s_parallax parallax s_parallax_is_fixed o_colored_level o_cc5" remove="pt32 pb32" separator=" "/>
-            <attribute name="data-scroll-background-ratio">1</attribute>
-        </xpath>
-        <xpath expr="//section/*" position="before">
-            <span class="s_parallax_bg oe_img_bg" style="background-image: url('/theme_bistro/static/src/img/backgrounds/16.jpg'); background-position: 50% 0%;"/>
-             <div class="o_we_bg_filter bg-black-50"/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace"/>
-        <!-- Paragraph -->
-        <xpath expr="//p" position="replace"/>
-    </template>
+
+<template id="s_product_catalog" inherit_id="website.s_product_catalog">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="style"/>
+        <attribute name="class" add="s_parallax parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt48 pb32" separator=" "/>
+        <attribute name="data-scroll-background-ratio">1</attribute>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/06"}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_product_catalog_default_image'); background-position: 50% 0%;"/>
+        <div class="o_we_bg_filter bg-black-50"/>
+        <div class="o_we_shape o_web_editor_Zigs_06"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace"/>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace"/>
+</template>
+
+<template id="s_product_catalog_dish" inherit_id="website.s_product_catalog_dish">
+    <xpath expr="//li" position="inside">
+        <p class="s_product_catalog_dish_description border-top text-muted pt-1 o_default_snippet_text">
+            <em>Add the description of this dish here.</em>
+        </p>
+    </xpath>
+    <xpath expr="//*[hasclass('s_product_catalog_dish_name')]" position="attributes">
+        <attribute name="class" remove="s_product_catalog_dish_dot_leaders" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_quotes_carousel.xml b/theme_bistro/views/snippets/s_quotes_carousel.xml
index a512b21d9..62005be91 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel.xml
+++ b/theme_bistro/views/snippets/s_quotes_carousel.xml
@@ -1,39 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
-        <!-- Carousel -->
-        <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
-            <attribute name="class" add="s_carousel_rounded" remove="s_carousel_default" separator=" "/>
-        </xpath>
-        <!-- Slide #01 -->
-        <xpath expr="//div[hasclass('carousel-item')][1]" position="attributes">
-            <attribute name="class" remove="bg-200" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][1]//blockquote" position="attributes">
-            <attribute name="class" add="mx-auto" remove="mr-auto" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][1]//blockquote//p" position="replace">
-            <p class="small">Cosy and friendly, good atmosphere and super food. Especially the spiced fruit crumble.</p>
-        </xpath>
-        <!-- Slide #02 -->
-        <xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
-            <attribute name="style">background-image: none;</attribute>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][2]//blockquote" position="attributes">
-            <attribute name="class" add="mx-auto" remove="mr-auto" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][2]//blockquote//p" position="replace">
-            <p class="small">This place is perfect for groups or a casual date night.</p>
-        </xpath>
-        <!-- Slide #03 -->
-        <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
-            <attribute name="style">background-image: none;</attribute>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][3]//blockquote" position="attributes">
-            <attribute name="class" add="mx-auto" remove="ml-auto" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('carousel-item')][3]//blockquote//p" position="replace">
-            <p class="small">A truly exquisite dining experience. I highly recommend the Mustard Sauce, out of this world.</p>
-        </xpath>
-    </template>
+
+<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
+    <!-- Carousel -->
+    <xpath expr="//*[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="class" add="s_carousel_rounded oe_img_bg o_bg_img_center" remove="s_carousel_default o_cc o_cc2" separator=" "/>
+        <attribute name="style">background-image: url('/web/image/website.s_quotes_carousel_demo_image_1');</attribute>
+    </xpath>
+    <!-- Slide #01 -->
+    <xpath expr="//*[hasclass('carousel-item')][1]" position="attributes">
+        <attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
+        <attribute name="style">background-image: none;</attribute>
+    </xpath>
+    <xpath expr="//blockquote[1]" position="attributes">
+        <attribute name="class" add="mx-auto" remove="mr-auto" separator=" "/>
+    </xpath>
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        Cosy and friendly, good atmosphere and super food. Especially the spiced fruit crumble.
+    </xpath>
+    <!-- Slide #02 -->
+    <xpath expr="//*[hasclass('carousel-item')][2]" position="attributes">
+        <attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
+        <attribute name="style">background-image: none;</attribute>
+    </xpath>
+    <xpath expr="(//blockquote)[2]" position="attributes">
+        <attribute name="class" add="mx-auto" remove="mr-auto" separator=" "/>
+    </xpath>
+    <xpath expr="(//p)[2]" position="replace" mode="inner">
+        This place is perfect for groups or a casual date night.
+    </xpath>
+    <!-- Slide #03 -->
+    <xpath expr="//*[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
+        <attribute name="style">background-image: none;</attribute>
+    </xpath>
+    <xpath expr="(//blockquote)[3]" position="attributes">
+        <attribute name="class" add="mx-auto" remove="ml-auto" separator=" "/>
+    </xpath>
+    <xpath expr="(//p)[3]" position="replace" mode="inner">
+        A truly exquisite dining experience. I highly recommend the Mustard Sauce, out of this world.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_text_block.xml b/theme_bistro/views/snippets/s_text_block.xml
index badf9bac1..5aca4fb1c 100644
--- a/theme_bistro/views/snippets/s_text_block.xml
+++ b/theme_bistro/views/snippets/s_text_block.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_text_block" inherit_id="website.s_text_block">
-        <!-- Paragraph #01 -->
-        <xpath expr="//p" position="replace">
-            <p>A healthy kitchen with local products. We’re constantly looking to propose new products and receipts. <b>While respecting seasons' products and nature.</b></p>
-        </xpath>
-        <!-- Paragraph #02 -->
-        <xpath expr="//p[2]" position="replace">
-            <p>At the Bistro, you can expect a healthy kitchen on a daily basis. <br/>Come and visit us for a Sunday brunch, healthy juices full of nutrition or delicious cakes that satisfy your sweet tooth. <b>And each day, you’ll discover our Today’s Special.</b></p>
-        </xpath>
-    </template>
+
+<template id="s_text_block" inherit_id="website.s_text_block">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb80" remove="pt40 pb40" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//*[hasclass('container')]" position="attributes">
+        <attribute name="class" add="o_container_small" remove="container" separator=" "/>
+    </xpath>
+    <!-- Paragraph #01 -->
+    <xpath expr="//p" position="replace" mode="inner">
+        A healthy kitchen with local products. We’re constantly looking to propose new products and receipts. <b>While respecting seasons' products and nature.</b>
+    </xpath>
+    <!-- Paragraph #02 -->
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        At the Bistro, you can expect a healthy kitchen on a daily basis. <br/>Come and visit us for a Sunday brunch, healthy juices full of nutrition, or delicious cakes that satisfy your sweet tooth. <b>And each day, you’ll discover our Today’s Special.</b>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_bistro/views/snippets/s_text_image.xml b/theme_bistro/views/snippets/s_text_image.xml
new file mode 100644
index 000000000..b222f29b5
--- /dev/null
+++ b/theme_bistro/views/snippets/s_text_image.xml
@@ -0,0 +1,18 @@
+<?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="pt80 pb80 bg-200" remove="o_cc o_cc2 pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/basic/bsc_square_rounded_2.svg</attribute>
+        <attribute name="data-file-name">text_image.svg</attribute>
+        <attribute name="data-shape">web_editor/basic/bsc_square_rounded_2</attribute>
+        <attribute name="data-shape-colors">;;;;</attribute>
+    </xpath>
+</template>
+
+</odoo>