diff --git a/theme_treehouse/__manifest__.py b/theme_treehouse/__manifest__.py
index ec3025ee9..d53e54329 100644
--- a/theme_treehouse/__manifest__.py
+++ b/theme_treehouse/__manifest__.py
@@ -11,24 +11,36 @@
         'data/ir_asset.xml',
         'views/images_library.xml',
 
+        'views/snippets/s_banner.xml',
         'views/snippets/s_call_to_action.xml',
         'views/snippets/s_carousel.xml',
         'views/snippets/s_color_blocks_2.xml',
+        'views/snippets/s_comparisons.xml',
         'views/snippets/s_cover.xml',
+        'views/snippets/s_faq_collapse.xml',
         'views/snippets/s_features.xml',
         'views/snippets/s_image_text.xml',
+        'views/snippets/s_media_list.xml',
+        'views/snippets/s_picture.xml',
         'views/snippets/s_quotes_carousel.xml',
-        'views/snippets/s_share.xml',
+        'views/snippets/s_tabs.xml',
         'views/snippets/s_text_block.xml',
         'views/snippets/s_text_image.xml',
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_title.xml',
-
-        ],
+    ],
     'images': [
         'static/description/treehouse_cover.jpg',
         'static/description/treehouse_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_cover_default_image': '/theme_treehouse/static/src/img/content/cover.jpg',
+        'website.s_text_image_default_image': '/theme_treehouse/static/src/img/content/text_image.jpg',
+        'website.s_parallax_default_image': '/website/static/src/img/snippets_demo/s_parallax.jpg',
+        'website.s_three_columns_default_image_1': '/theme_treehouse/static/src/img/content/three_columns_01.jpg',
+        'website.s_three_columns_default_image_2': '/theme_treehouse/static/src/img/content/three_columns_02.jpg',
+        'website.s_three_columns_default_image_3': '/theme_treehouse/static/src/img/content/three_columns_03.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-treehouse.odoo.com',
     'assets': {
diff --git a/theme_treehouse/data/ir_asset.xml b/theme_treehouse/data/ir_asset.xml
index 1c9939d7e..95eca1a1b 100644
--- a/theme_treehouse/data/ir_asset.xml
+++ b/theme_treehouse/data/ir_asset.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_treehouse.s_images_row_000_scss" model="theme.ir.asset">
-            <field name="key">theme_treehouse.s_images_row_000_scss</field>
-            <field name="name">Images row 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_treehouse/static/src/old_snippets/s_images_row/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_treehouse.s_images_row_000_scss" model="theme.ir.asset">
+    <field name="key">theme_treehouse.s_images_row_000_scss</field>
+    <field name="name">Images row 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_treehouse/static/src/old_snippets/s_images_row/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_treehouse.s_images_carousel_000_scss" model="theme.ir.asset">
-            <field name="key">theme_treehouse.s_images_carousel_000_scss</field>
-            <field name="name">Images carousel 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_treehouse/static/src/old_snippets/s_images_carousel/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_treehouse.s_images_carousel_000_scss" model="theme.ir.asset">
+    <field name="key">theme_treehouse.s_images_carousel_000_scss</field>
+    <field name="name">Images carousel 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_treehouse/static/src/old_snippets/s_images_carousel/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_treehouse.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_treehouse.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_treehouse/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_treehouse.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_treehouse.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_treehouse/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_treehouse.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_treehouse.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_treehouse/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_treehouse.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_treehouse.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_treehouse/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_treehouse/static/description/treehouse_screenshot.jpg b/theme_treehouse/static/description/treehouse_screenshot.jpg
index 2f9f60beb..d1196fc1c 100644
Binary files a/theme_treehouse/static/description/treehouse_screenshot.jpg and b/theme_treehouse/static/description/treehouse_screenshot.jpg differ
diff --git a/theme_treehouse/static/src/img/content/media_list_01.jpg b/theme_treehouse/static/src/img/content/media_list_01.jpg
new file mode 100644
index 000000000..348d04998
Binary files /dev/null and b/theme_treehouse/static/src/img/content/media_list_01.jpg differ
diff --git a/theme_treehouse/static/src/img/content/media_list_02.jpg b/theme_treehouse/static/src/img/content/media_list_02.jpg
new file mode 100644
index 000000000..51295c1f4
Binary files /dev/null and b/theme_treehouse/static/src/img/content/media_list_02.jpg differ
diff --git a/theme_treehouse/static/src/img/content/media_list_03.jpg b/theme_treehouse/static/src/img/content/media_list_03.jpg
new file mode 100644
index 000000000..6b02181da
Binary files /dev/null and b/theme_treehouse/static/src/img/content/media_list_03.jpg differ
diff --git a/theme_treehouse/static/src/img/content/three_columns_01.jpg b/theme_treehouse/static/src/img/content/three_columns_01.jpg
index 348d04998..f4c62fe28 100644
Binary files a/theme_treehouse/static/src/img/content/three_columns_01.jpg and b/theme_treehouse/static/src/img/content/three_columns_01.jpg differ
diff --git a/theme_treehouse/static/src/img/content/three_columns_02.jpg b/theme_treehouse/static/src/img/content/three_columns_02.jpg
index 51295c1f4..85306358e 100644
Binary files a/theme_treehouse/static/src/img/content/three_columns_02.jpg and b/theme_treehouse/static/src/img/content/three_columns_02.jpg differ
diff --git a/theme_treehouse/static/src/img/content/three_columns_03.jpg b/theme_treehouse/static/src/img/content/three_columns_03.jpg
index 6b02181da..02eecf5db 100644
Binary files a/theme_treehouse/static/src/img/content/three_columns_03.jpg and b/theme_treehouse/static/src/img/content/three_columns_03.jpg differ
diff --git a/theme_treehouse/static/src/js/tour.js b/theme_treehouse/static/src/js/tour.js
index bd7d0f757..8ec3ab4d5 100644
--- a/theme_treehouse/static/src/js/tour.js
+++ b/theme_treehouse/static/src/js/tour.js
@@ -1,8 +1,6 @@
-odoo.define("theme_treehouse.tour.treehouse", 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 = [
     {
@@ -39,4 +37,3 @@ wTourUtils.registerThemeHomepageTour("treehouse_tour", [
     wTourUtils.changeBackgroundColor(),
     wTourUtils.selectColorPalette(),
 ]);
-});
diff --git a/theme_treehouse/static/src/scss/bootstrap_overridden.scss b/theme_treehouse/static/src/scss/bootstrap_overridden.scss
index a6d3d1c05..7d9ce5c35 100644
--- a/theme_treehouse/static/src/scss/bootstrap_overridden.scss
+++ b/theme_treehouse/static/src/scss/bootstrap_overridden.scss
@@ -3,22 +3,18 @@
 //------------------------------------------------------------------------------//
 
 // Body
-@if o-website-value('font-number') == 1 {
-    // Abel
+@if o-website-value('font') == 'Abel' {
     $o-theme-font-size-lg-multiplier:       (1.25 / 1.125);
     $o-theme-font-size-sm-multiplier:       (1 / 1.125);
 }
-@else if o-website-value('font-number') == 2 {
-    // Dosis
+@else if o-website-value('font') == 'Dosis' {
     $o-theme-font-size-lg-multiplier:       (1.25 / 1.125);
 }
-@else if o-website-value('font-number') == 4 {
-    // Laila
+@else if o-website-value('font') == 'Laila' {
     $o-theme-font-weight-normal:            300;
     $o-theme-font-weight-bold:              600;
 }
-@else if o-website-value('font-number') == 6 {
-    // Poppins
+@else if o-website-value('font') == 'Poppins' {
     $o-theme-font-weight-bold:              600;
 }
 
@@ -79,8 +75,15 @@ $input-placeholder-color:                   o-color('500') !default;
 
 // Cards
 
-$card-spacer-y:                     1rem !default;
-$card-spacer-x:                     1.75rem !default;
-$card-border-width:                 0 !default;
-$card-border-radius:                $border-radius-lg !default;
+$card-spacer-y:                             1rem !default;
+$card-spacer-x:                             1.75rem !default;
+$card-border-width:                         0 !default;
+$card-border-radius:                        $border-radius-lg !default;
 
+//  Alerts
+
+$alert-border-width:                        0;
+
+// Blockquote
+
+$blockquote-font-size:                      $o-font-size-base;
diff --git a/theme_treehouse/static/src/scss/primary_variables.scss b/theme_treehouse/static/src/scss/primary_variables.scss
index 8c1f593a0..07df0dc95 100644
--- a/theme_treehouse/static/src/scss/primary_variables.scss
+++ b/theme_treehouse/static/src/scss/primary_variables.scss
@@ -4,7 +4,7 @@
 
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'treehouse-1',
+        'color-palettes-name':              'treehouse-1',
 
         // Header
         'logo-height':                      2.75rem,
@@ -48,7 +48,7 @@ $o-theme-font-configs: (
     'Abel': (
         'family': ('Abel', sans-serif),
         'url': 'Abel:300,300i,400,400i,700,700i',
-        'properties' : (
+        'properties': (
             'base': (
                 'font-size-base':           (18 / 16) * 1rem,
                 'header-font-size':         (18 / 16) * 1rem,
@@ -58,7 +58,7 @@ $o-theme-font-configs: (
     'Dosis': (
         'family': ('Dosis', sans-serif),
         'url': 'Dosis:300,300i,400,400i,700,700i',
-        'properties' : (
+        'properties': (
             'base': (
                 'font-size-base':           (18 / 16) * 1rem,
                 'header-font-size':         (18 / 16) * 1rem,
@@ -82,8 +82,8 @@ $o-theme-font-configs: (
         'url': 'Poppins:300,300i,400,400i,600,600i',
         'properties': (
             'base': (
-                'header-font-size':         (14 / 16) * 1rem,
-                'font-size-base':           (14 / 16) * 1rem,
+                'font-size-base':           (15 / 16) * 1rem,
+                'header-font-size':         (15 / 16) * 1rem,
             ),
         )
     ),
@@ -98,9 +98,6 @@ $o-theme-font-configs: (
 $o-theme-h1-font-size-multiplier:           3;
 $o-theme-h2-font-size-multiplier:           2.5;
 $o-theme-h3-font-size-multiplier:           2;
-$o-theme-h4-font-size-multiplier:           1.75;
-$o-theme-h5-font-size-multiplier:           1.5;
-$o-theme-h6-font-size-multiplier:           1.25;
 
 $o-theme-headings-font-weight:              400;
 
@@ -125,46 +122,46 @@ $o-theme-btn-font-weight:                   400;
 $o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
         'treehouse-1': (
-            'alpha':                            #68b581,
-            'beta':                             #00a388,
-            'gamma':                            #046380,
-            'delta':                            #4bb5c1,
-            'epsilon':                          #beeb9f,
+            'alpha':                        #68b581,
+            'beta':                         #00a388,
+            'gamma':                        #046380,
+            'delta':                        #4bb5c1,
+            'epsilon':                      #beeb9f,
         ),
         'treehouse-2': (
-            'alpha':                            #a3cc52,
-            'beta':                             #cc4452,
-            'gamma':                            #8e3557,
-            'delta':                            #f7f2b2,
-            'epsilon':                          #4a1a2c,
+            'alpha':                        #a3cc52,
+            'beta':                         #cc4452,
+            'gamma':                        #8e3557,
+            'delta':                        #f7f2b2,
+            'epsilon':                      #4a1a2c,
         ),
         'treehouse-3': (
-            'alpha':                            #eebf3e,
-            'beta':                             #e2ad3b,
-            'gamma':                            #bf5c00,
-            'delta':                            #77c4d3,
-            'epsilon':                          #901811,
+            'alpha':                        #eebf3e,
+            'beta':                         #e2ad3b,
+            'gamma':                        #bf5c00,
+            'delta':                        #77c4d3,
+            'epsilon':                      #901811,
         ),
         'treehouse-4': (
-            'alpha':                            #0092b2,
-            'beta':                             #046380,
-            'gamma':                            #a8c545,
-            'delta':                            #fff6c5,
-            'epsilon':                          #ffd55c,
+            'alpha':                        #0092b2,
+            'beta':                         #046380,
+            'gamma':                        #a8c545,
+            'delta':                        #fff6c5,
+            'epsilon':                      #ffd55c,
         ),
         'treehouse-5': (
-            'alpha':                            #dd7e43,
-            'beta':                             #d45c45,
-            'gamma':                            #911146,
-            'delta':                            #9cc264,
-            'epsilon':                          #306e73,
+            'alpha':                        #dd7e43,
+            'beta':                         #d45c45,
+            'gamma':                        #911146,
+            'delta':                        #9cc264,
+            'epsilon':                      #306e73,
         ),
         'treehouse-6': (
-            'alpha':                            #b7ca79,
-            'beta':                             #677e52,
-            'gamma':                            #b0cc99,
-            'delta':                            #89725b,
-            'epsilon':                          #f6e8b1,
+            'alpha':                        #b7ca79,
+            'beta':                         #677e52,
+            'gamma':                        #b0cc99,
+            'delta':                        #89725b,
+            'epsilon':                      #f6e8b1,
         ),
     )
 );
@@ -196,3 +193,10 @@ $o-color-palettes-compatibility-indexes: (
     22: 'generic-16',
     23: 'generic-17',
 );
+
+//------------------------------------------------------------------------------
+// Shapes
+//------------------------------------------------------------------------------
+
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Rainy/08_001', (1: 1, 4: 1));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/12', (1: 2, 2: 2, 3: 2, 5: 2));
diff --git a/theme_treehouse/views/images_library.xml b/theme_treehouse/views/images_library.xml
index 32b5e697e..c3ce033ef 100644
--- a/theme_treehouse/views/images_library.xml
+++ b/theme_treehouse/views/images_library.xml
@@ -1,253 +1,272 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Backgrounds -->
-    <record id="bg_img_01" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_01</field>
-        <field name="name">background_img_01.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/01.jpg</field>
-    </record>
-    <record id="bg_img_02" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_02</field>
-        <field name="name">background_img_02.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/02.jpg</field>
-    </record>
-    <record id="bg_img_03" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_03</field>
-        <field name="name">background_img_03.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/03.jpg</field>
-    </record>
-    <record id="bg_img_04" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_04</field>
-        <field name="name">background_img_04.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/04.jpg</field>
-    </record>
-    <record id="bg_img_05" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_05</field>
-        <field name="name">background_img_05.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/05.jpg</field>
-    </record>
-    <record id="bg_img_06" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_06</field>
-        <field name="name">background_img_06.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/06.jpg</field>
-    </record>
-    <record id="bg_img_07" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_07</field>
-        <field name="name">background_img_07.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/07.jpg</field>
-    </record>
-    <record id="bg_img_08" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_08</field>
-        <field name="name">background_img_08.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/08.jpg</field>
-    </record>
-    <record id="bg_img_09" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_09</field>
-        <field name="name">background_img_09.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/09.jpg</field>
-    </record>
-    <record id="bg_img_10" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_10</field>
-        <field name="name">background_img_10.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/10.jpg</field>
-    </record>
-    <record id="bg_img_11" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_11</field>
-        <field name="name">background_img_11.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/11.jpg</field>
-    </record>
-    <record id="bg_img_12" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_12</field>
-        <field name="name">background_img_12.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/12.jpg</field>
-    </record>
-    <record id="bg_img_13" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_13</field>
-        <field name="name">background_img_13.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/13.jpg</field>
-    </record>
-    <record id="bg_img_14" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_14</field>
-        <field name="name">background_img_14.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/14.jpg</field>
-    </record>
-    <record id="bg_img_15" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_15</field>
-        <field name="name">background_img_15.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/15.jpg</field>
-    </record>
-    <record id="bg_img_16" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_img_16</field>
-        <field name="name">background_img_16.jpg</field>
-        <field name="url">/theme_treehouse/static/src/img/backgrounds/16.jpg</field>
-    </record>
 
-    <!-- Patterns -->
-    <record id="bg_pattern_01" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_01</field>
-        <field name="name">background_pattern_01.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/01.png</field>
-    </record>
-    <record id="bg_pattern_02" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_02</field>
-        <field name="name">background_pattern_02.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/02.png</field>
-    </record>
-    <record id="bg_pattern_03" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_03</field>
-        <field name="name">background_pattern_03.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/03.png</field>
-    </record>
-    <record id="bg_pattern_04" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_04</field>
-        <field name="name">background_pattern_04.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/04.png</field>
-    </record>
-    <record id="bg_pattern_05" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_05</field>
-        <field name="name">background_pattern_05.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/05.png</field>
-    </record>
-    <record id="bg_pattern_06" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_06</field>
-        <field name="name">background_pattern_06.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/06.png</field>
-    </record>
-    <record id="bg_pattern_07" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_07</field>
-        <field name="name">background_pattern_07.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/07.png</field>
-    </record>
-    <record id="bg_pattern_08" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_08</field>
-        <field name="name">background_pattern_08.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/08.png</field>
-    </record>
-    <record id="bg_pattern_09" model="theme.ir.attachment">
-        <field name="key">theme_treehouse.bg_pattern_09</field>
-        <field name="name">background_pattern_09.png</field>
-        <field name="url">/theme_treehouse/static/src/img/patterns/09.png</field>
-    </record>
+<!-- Backgrounds -->
+<record id="bg_img_01" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_01</field>
+    <field name="name">background_img_01.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/01.jpg</field>
+</record>
+<record id="bg_img_02" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_02</field>
+    <field name="name">background_img_02.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/02.jpg</field>
+</record>
+<record id="bg_img_03" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_03</field>
+    <field name="name">background_img_03.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/03.jpg</field>
+</record>
+<record id="bg_img_04" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_04</field>
+    <field name="name">background_img_04.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/04.jpg</field>
+</record>
+<record id="bg_img_05" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_05</field>
+    <field name="name">background_img_05.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/05.jpg</field>
+</record>
+<record id="bg_img_06" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_06</field>
+    <field name="name">background_img_06.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/06.jpg</field>
+</record>
+<record id="bg_img_07" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_07</field>
+    <field name="name">background_img_07.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/07.jpg</field>
+</record>
+<record id="bg_img_08" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_08</field>
+    <field name="name">background_img_08.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/08.jpg</field>
+</record>
+<record id="bg_img_09" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_09</field>
+    <field name="name">background_img_09.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/09.jpg</field>
+</record>
+<record id="bg_img_10" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_10</field>
+    <field name="name">background_img_10.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/10.jpg</field>
+</record>
+<record id="bg_img_11" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_11</field>
+    <field name="name">background_img_11.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/11.jpg</field>
+</record>
+<record id="bg_img_12" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_12</field>
+    <field name="name">background_img_12.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/12.jpg</field>
+</record>
+<record id="bg_img_13" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_13</field>
+    <field name="name">background_img_13.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/13.jpg</field>
+</record>
+<record id="bg_img_14" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_14</field>
+    <field name="name">background_img_14.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/14.jpg</field>
+</record>
+<record id="bg_img_15" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_15</field>
+    <field name="name">background_img_15.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/15.jpg</field>
+</record>
+<record id="bg_img_16" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_img_16</field>
+    <field name="name">background_img_16.jpg</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/16.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_treehouse/static/src/img/content/cover.jpg</field>
-    </record>
+<!-- Patterns -->
+<record id="bg_pattern_01" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_01</field>
+    <field name="name">background_pattern_01.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/01.png</field>
+</record>
+<record id="bg_pattern_02" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_02</field>
+    <field name="name">background_pattern_02.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/02.png</field>
+</record>
+<record id="bg_pattern_03" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_03</field>
+    <field name="name">background_pattern_03.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/03.png</field>
+</record>
+<record id="bg_pattern_04" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_04</field>
+    <field name="name">background_pattern_04.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/04.png</field>
+</record>
+<record id="bg_pattern_05" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_05</field>
+    <field name="name">background_pattern_05.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/05.png</field>
+</record>
+<record id="bg_pattern_06" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_06</field>
+    <field name="name">background_pattern_06.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/06.png</field>
+</record>
+<record id="bg_pattern_07" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_07</field>
+    <field name="name">background_pattern_07.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/07.png</field>
+</record>
+<record id="bg_pattern_08" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_08</field>
+    <field name="name">background_pattern_08.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/08.png</field>
+</record>
+<record id="bg_pattern_09" model="theme.ir.attachment">
+    <field name="key">theme_treehouse.bg_pattern_09</field>
+    <field name="name">background_pattern_09.png</field>
+    <field name="url">/theme_treehouse/static/src/img/patterns/09.png</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_treehouse/static/src/img/backgrounds/02.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_treehouse/static/src/img/content/cover.jpg</field>
+</record>
 
-    <!-- Text-Image -->
-    <record id="s_text_image_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_text_image_default_image</field>
-        <field name="name">website.s_text_image_default_image</field>
-        <field name="url">/theme_treehouse/static/src/img/content/text_image.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_treehouse/static/src/img/backgrounds/02.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_treehouse/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_treehouse/static/src/img/content/text_image.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_treehouse/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_treehouse/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_treehouse/static/src/img/content/three_columns_03.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_treehouse/static/src/img/content/image_text.jpg</field>
+</record>
 
-    <!-- Picture -->
-    <record id="s_picture_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_picture_default_image</field>
-        <field name="name">website.s_picture_default_image</field>
-        <field name="url">/theme_treehouse/static/src/img/content/picture.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_treehouse/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_treehouse/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_treehouse/static/src/img/content/three_columns_03.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_treehouse/static/src/img/content/masonry_block.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_treehouse/static/src/img/backgrounds/01.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_treehouse/static/src/img/backgrounds/11.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_treehouse/static/src/img/backgrounds/12.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_treehouse/static/src/img/backgrounds/03.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_treehouse/static/src/img/content/masonry_block.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_treehouse/static/src/img/content/three_columns_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_treehouse/static/src/img/content/three_columns_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_treehouse/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_treehouse/static/src/img/backgrounds/11.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_treehouse/static/src/img/backgrounds/12.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_treehouse/static/src/img/backgrounds/03.jpg</field>
+</record>
 
-    <!-- Company Team -->
-    <record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_01.jpg</field>
-    </record>
-    <record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_02.jpg</field>
-    </record>
-    <record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_03.jpg</field>
-    </record>
-    <record id="s_company_team_default_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_treehouse/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_treehouse/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_treehouse/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_treehouse/static/src/img/content/media_list_03.jpg</field>
+</record>
+
+<!-- Company Team -->
+<record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_01.jpg</field>
+</record>
+<record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_02.jpg</field>
+</record>
+<record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_03.jpg</field>
+</record>
+<record id="s_company_team_default_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_treehouse/static/src/img/content/company_team_04.jpg</field>
+</record>
+
+<!-- Quotes Carousel -->
+<record id="s_quotes_carousel_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_default_image_1</field>
+    <field name="name">website.s_quotes_carousel_default_image_1</field>
+    <field name="url">/theme_treehouse/static/src/img/content/quotes_carousel.jpg</field>
+</record>
+
+<!-- Image Gallery -->
+<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_treehouse/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_treehouse/static/src/img/backgrounds/05.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_treehouse/static/src/img/backgrounds/15.jpg</field>
+</record>
 
-    <!-- Quotes Carousel -->
-    <record id="s_quotes_carousel_default_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_quotes_carousel_default_image_1</field>
-        <field name="name">website.s_quotes_carousel_default_image_1</field>
-        <field name="url">/theme_treehouse/static/src/img/content/quotes_carousel.jpg</field>
-    </record>
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_banner.xml b/theme_treehouse/views/snippets/s_banner.xml
new file mode 100644
index 000000000..6a297ac1b
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_banner.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12"}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
+    </xpath>
+    <xpath expr="//*[hasclass('s_parallax_bg')]" position="attributes">
+        <attribute name="style" add="background-position: 50% 100%;" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Hello Planet.
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_call_to_action.xml b/theme_treehouse/views/snippets/s_call_to_action.xml
index f48d15b97..ffc71055e 100644
--- a/theme_treehouse/views/snippets/s_call_to_action.xml
+++ b/theme_treehouse/views/snippets/s_call_to_action.xml
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_call_to_action" inherit_id="website.s_call_to_action">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt64 pb48" remove="pt48 pb24 bg-200" separator=" "/>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]" position="attributes">
-            <attribute name="class" add="col-lg-12 text-center" remove="col-lg-9" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]//h3" position="replace">
-            <h3><b>Help us protect and preserve</b> for future generations</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]//p" position="replace">
-            <p>Join us and make the planet a better place.</p>
-        </xpath>
-        <!-- Column #02 -->
-       <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
-            <attribute name="class" add="col-lg-12" remove="col-lg-3" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]//p" position="attributes">
-            <attribute name="style">text-align: center;</attribute>
-        </xpath>
-    </template>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb48" remove="pt48 pb24" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001"}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_08_001"/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//div[hasclass('row')]/*[1]" position="attributes">
+        <attribute name="class" add="col-lg-12" remove="col-lg-9" separator=" "/>
+    </xpath>
+    <xpath expr="//h3" position="replace">
+        <h3 style="text-align: center;">Help us protect and preserve for future generations</h3>
+    </xpath>
+    <xpath expr="//p" position="replace">
+        <p class="lead" style="text-align: center;">Join us and make the planet a better place.</p>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//div[hasclass('row')]/*[2]" position="attributes">
+        <attribute name="class" add="col-lg-12" remove="col-lg-3" separator=" "/>
+    </xpath>
+    <xpath expr="(//p)[2]" position="attributes">
+        <attribute name="style">text-align: center;</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_carousel.xml b/theme_treehouse/views/snippets/s_carousel.xml
index e8d2d70bc..9d00b69c3 100644
--- a/theme_treehouse/views/snippets/s_carousel.xml
+++ b/theme_treehouse/views/snippets/s_carousel.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_carousel" inherit_id="website.s_carousel">
-        <!-- Carousel -->
-        <xpath expr="//div[hasclass('s_carousel')]" position="attributes">
-            <attribute name="class" add="s_carousel_rounded" remove="s_carousel_default" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_carousel" inherit_id="website.s_carousel">
+    <!-- Carousel -->
+    <xpath expr="//div[hasclass('s_carousel')]" position="attributes">
+        <attribute name="class" add="s_carousel_rounded" remove="s_carousel_default" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_color_blocks_2.xml b/theme_treehouse/views/snippets/s_color_blocks_2.xml
index 1f1a4d305..e5710e1dc 100644
--- a/theme_treehouse/views/snippets/s_color_blocks_2.xml
+++ b/theme_treehouse/views/snippets/s_color_blocks_2.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]//i" position="replace">
-            <i class="fa fa-4x fa-cloud bg-white text-secondary rounded-circle shadow mb-3"/>
-        </xpath>
-        <xpath expr="//h2" position="replace">
-            <h2>Sky is the limit</h2>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]/div[2]" position="replace">
-            <div class="col-lg-6 p-0">
-                <img src="/theme_treehouse/static/src/img/backgrounds/01.jpg" class="w-100 h-100" style="object-fit: cover;" alt=""/>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
+    <!-- Column #01 -->
+    <xpath expr="//i" position="replace">
+        <i class="fa fa-2x fa-cloud bg-white text-secondary rounded-circle m-4 mx-auto"/>
+    </xpath>
+    <xpath expr="//h2" position="replace" mode="inner">
+        Sky is the limit.
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//div[hasclass('row')]/*[2]" position="replace">
+        <div class="col-lg-6 p-0">
+            <img src="/theme_treehouse/static/src/img/backgrounds/06.jpg" class="w-100 h-100" style="object-fit: cover;" alt=""/>
+        </div>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_comparisons.xml b/theme_treehouse/views/snippets/s_comparisons.xml
new file mode 100644
index 000000000..e4a2a1c53
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_comparisons.xml
@@ -0,0 +1,11 @@
+<?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="class" add="o_cc o_cc2 pt64 pb64" remove="pt32 pb32" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_cover.xml b/theme_treehouse/views/snippets/s_cover.xml
index f7502e073..22a1dad91 100644
--- a/theme_treehouse/views/snippets/s_cover.xml
+++ b/theme_treehouse/views/snippets/s_cover.xml
@@ -1,24 +1,29 @@
 <?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="pt128 pb128" remove="pt96 pb96" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1 style="text-align: center;">
-                <font style="font-size: 62px;"><b>Life on Earth</b></font>
-            </h1>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//p" position="replace">
-            <p class="lead" style="text-align: center;">Our mission is to create a shared plan for saving the planet’s most exceptional wild places.</p>
-            <p class="lead" style="text-align: center;"><br/></p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="//a" position="replace">
-            <a t-att-href="cta_btn_href" class="btn btn-primary btn-lg mb-2"><t t-esc="cta_btn_text">Get involved</t></a>
-        </xpath>
-    </template>
+
+<template id="s_cover" inherit_id="website.s_cover">
+    <!-- Section -->
+    <xpath expr="section" position="attributes">
+        <attribute name="class" add="pt160 pb160" remove="pt96 pb96" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="before">
+        <i class="fa fa-2x fa-bug d-block my-3 mx-auto rounded-circle bg-o-color-4 text-o-color-1"/>
+    </xpath>
+    <xpath expr="//h1" position="replace" mode="inner">
+        <font style="font-size: 62px;"><b>— Life on Earth —</b></font>
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p" position="replace" mode="inner">
+        Our mission is to create a shared plan<br/> for saving the planet’s most exceptional wild places.
+    </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">
+        Get involved
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_faq_collapse.xml b/theme_treehouse/views/snippets/s_faq_collapse.xml
new file mode 100644
index 000000000..6033fc347
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_faq_collapse.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_faq_collapse" inherit_id="website.s_faq_collapse">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pt64 pb64" remove="pt32 pb32" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_features.xml b/theme_treehouse/views/snippets/s_features.xml
index 4d332d908..06c03b054 100644
--- a/theme_treehouse/views/snippets/s_features.xml
+++ b/theme_treehouse/views/snippets/s_features.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_features" inherit_id="website.s_features">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt48 pb48" remove="pt32 pb32" separator=" "/>
-        </xpath>
-        <!-- Icons -->
-        <xpath expr="//div[hasclass('row')]/div[1]/i" position="attributes">
-            <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/i" position="attributes">
-            <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]/i" position="attributes">
-            <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_features" inherit_id="website.s_features">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt48 pb48" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Icons -->
+    <xpath expr="(//i)[1]" position="attributes">
+        <attribute name="class" add="fa-2x fa-leaf m-4 rounded-circle" remove="fa-3x fa-gear m-3 rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[2]" position="attributes">
+        <attribute name="class" add="fa-2x fa-flash m-4 rounded-circle" remove="fa-3x fa-photo m-3 rounded" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[3]" position="attributes">
+        <attribute name="class" add="fa-2x fa-tint m-4 rounded-circle" remove="fa-3x fa-leaf m-3 rounded" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_image_text.xml b/theme_treehouse/views/snippets/s_image_text.xml
index 3877d8f12..3ee55243f 100644
--- a/theme_treehouse/views/snippets/s_image_text.xml
+++ b/theme_treehouse/views/snippets/s_image_text.xml
@@ -1,13 +1,19 @@
 <?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="p-3 img-thumbnail" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_image_text" inherit_id="website.s_image_text">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb80 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: 15px;" separator=" "/>
+    </xpath>
+    <xpath expr="//p[2]" position="after">
+        <p><br/></p>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_media_list.xml b/theme_treehouse/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..45eb2a45f
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_media_list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Items -->
+    <xpath expr="//div[hasclass('s_media_list_item')][1]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][2]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_item')][3]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_picture.xml b/theme_treehouse/views/snippets/s_picture.xml
new file mode 100644
index 000000000..2da9b8a50
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_picture.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc o_cc2" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Working Together
+    </xpath>
+    <!-- Image + Shape -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="class" add="img-fluid" remove="img-thumbnail padding-large" separator=" "/>
+        <attribute name="src">/web_editor/image_shape/website.s_picture_default_image/web_editor/special/spl_filter_1.svg</attribute>
+        <attribute name="data-file-name">01.svg</attribute>
+        <attribute name="data-shape">web_editor/special/spl_filter_1</attribute>
+        <attribute name="data-shape-colors">;#046380;;;</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_quotes_carousel.xml b/theme_treehouse/views/snippets/s_quotes_carousel.xml
index 8e9c9c210..40dab77ca 100644
--- a/theme_treehouse/views/snippets/s_quotes_carousel.xml
+++ b/theme_treehouse/views/snippets/s_quotes_carousel.xml
@@ -1,9 +1,11 @@
 <?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>
-    </template>
+
+<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>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_share.xml b/theme_treehouse/views/snippets/s_share.xml
deleted file mode 100644
index 542c03c03..000000000
--- a/theme_treehouse/views/snippets/s_share.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <template id="s_share" inherit_id="website.s_share">
-        <!-- Title -->
-        <xpath expr="//*[hasclass('s_share_title')]" position="attributes">
-            <attribute name="class" add="d-none" separator=" "/>
-        </xpath>
-        <!-- Disk -->
-        <xpath expr="//a[1]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-        <xpath expr="//a[2]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-        <xpath expr="//a[3]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-        <xpath expr="//a[4]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-        <xpath expr="//a[5]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-        <xpath expr="//a[6]/i" position="attributes">
-            <attribute name="class" add="rounded-circle shadow-sm" separator=" "/>
-        </xpath>
-    </template>
-</odoo>
diff --git a/theme_treehouse/views/snippets/s_tabs.xml b/theme_treehouse/views/snippets/s_tabs.xml
new file mode 100644
index 000000000..8f63b42fb
--- /dev/null
+++ b/theme_treehouse/views/snippets/s_tabs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_tabs" inherit_id="website.s_tabs">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pt64 pb64" remove="pt48 pb48" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('nav')]" position="attributes">
+        <attribute name="class" add="card-header-tabs nav-tabs" remove="justify-content-center nav-pills" separator=" "/>
+    </xpath>
+    <!-- Card -->
+    <xpath expr="//*[hasclass('s_tabs_main')]" position="attributes">
+        <attribute name="class" add="card" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('s_tabs_content')]" position="attributes">
+        <attribute name="class" add="card-body" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('s_tabs_nav')]" position="attributes">
+        <attribute name="class" add="card-header" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/snippets/s_text_block.xml b/theme_treehouse/views/snippets/s_text_block.xml
index 828ce4ebc..439beb987 100644
--- a/theme_treehouse/views/snippets/s_text_block.xml
+++ b/theme_treehouse/views/snippets/s_text_block.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_text_block" inherit_id="website.s_text_block">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt96 pb96" remove="pt40 pb40" separator=" "/>
-        </xpath>
-        <!-- Content -->
-        <xpath expr="//div[hasclass('container')]" position="attributes">
-            <attribute name="class" add="o_container_small" remove="container" separator=" "/>
-        </xpath>
-    </template>
+
+<!-- TODO remove me in master ? -->
+<template id="s_text_block" inherit_id="website.s_text_block">
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_text_image.xml b/theme_treehouse/views/snippets/s_text_image.xml
index 5147ddd4c..01f508695 100644
--- a/theme_treehouse/views/snippets/s_text_image.xml
+++ b/theme_treehouse/views/snippets/s_text_image.xml
@@ -1,21 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_text_image" inherit_id="website.s_text_image">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2>Shaping our future</h2>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p[1]" position="replace">
-            <p>With all the global problems our planet faces today,<br/> communities of people concerned with them are growing<br/> to prevent the negative impact.</p>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p[2]" position="replace">
-            <p><br/></p>
-        </xpath>
-    </template>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb80" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Shaping our future
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        With all the global problems our planet faces today,<br/> communities of people concerned with them are growing<br/> to prevent the negative impact.
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p[2]" position="replace">
+        <p><br/></p>
+    </xpath>
+    <!-- Image + Shape -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/basic/bsc_organic_2.svg</attribute>
+        <attribute name="data-file-name">text_image.svg</attribute>
+        <attribute name="data-shape">web_editor/basic/bsc_organic_2</attribute>
+        <attribute name="data-shape-colors">;;;;</attribute>
+    </xpath>
+    <!-- Subtitle -->
+    <xpath expr="//h2" position="before">
+        <p style="font-size: 12px;"><b>ABOUT US</b></p>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_three_columns.xml b/theme_treehouse/views/snippets/s_three_columns.xml
index 97aa95c9b..eb11fed6a 100644
--- a/theme_treehouse/views/snippets/s_three_columns.xml
+++ b/theme_treehouse/views/snippets/s_three_columns.xml
@@ -1,30 +1,47 @@
 <?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" remove="pt32 pb32" separator=" "/>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]//*[hasclass('card-title')]" position="replace">
-            <h4 class="card-title">Recycling water</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]//*[hasclass('card-text')]" position="replace">
-            <p class="card-text">Recycling water for reuse applications instead of using freshwater supplies can be a water-saving measure.</p>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]/div[2]//*[hasclass('card-title')]" position="replace">
-            <h4 class="card-title">Habitat Model</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]//*[hasclass('card-text')]" position="replace">
-            <p class="card-text">Habitats with a minimum footprint on the planet and a maximum positive impact on the local community.</p>
-        </xpath>
-        <!-- Column #03 -->
-        <xpath expr="//div[hasclass('row')]/div[3]//*[hasclass('card-title')]" position="replace">
-            <h4 class="card-title">Organic Garden</h4>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]//*[hasclass('card-text')]" position="replace">
-            <p class="card-text">Learn how to use organic gardening methods to grow the freshest food in your fruit and vegetable garden.</p>
-        </xpath>
-    </template>
+
+<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="pt32 pb32 o_cc o_cc2" separator=" "/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="(//*[hasclass('card-title')])[1]" position="replace" mode="inner">
+        Recycling water
+    </xpath>
+    <xpath expr="(//*[hasclass('card-text')])[1]" position="replace" mode="inner">
+        Recycling water for reuse applications instead of using freshwater supplies can be a water-saving measure.
+    </xpath>
+    <xpath expr="(//*[hasclass('card-body')])[1]" position="after">
+        <div class="card-footer">
+            <a href="#" class="card-link">Read more</a>
+        </div>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="(//*[hasclass('card-title')])[2]" position="replace" mode="inner">
+        Habitat Model
+    </xpath>
+    <xpath expr="(//*[hasclass('card-text')])[2]" position="replace" mode="inner">
+        Habitats with a minimum footprint on the planet and a maximum positive impact on the local community.
+    </xpath>
+    <xpath expr="(//*[hasclass('card-body')])[2]" position="after">
+        <div class="card-footer">
+            <a href="#" class="card-link">Read more</a>
+        </div>
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="(//*[hasclass('card-title')])[3]" position="replace" mode="inner">
+        Organic Garden
+    </xpath>
+    <xpath expr="(//*[hasclass('card-text')])[3]" position="replace" mode="inner">
+        Learn how to use organic gardening methods to grow the freshest food in your fruit and vegetable garden.
+    </xpath>
+    <xpath expr="(//*[hasclass('card-body')])[3]" position="after">
+        <div class="card-footer">
+            <a href="#" class="card-link">Read more</a>
+        </div>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_treehouse/views/snippets/s_title.xml b/theme_treehouse/views/snippets/s_title.xml
index c20081564..95fa5e0bb 100644
--- a/theme_treehouse/views/snippets/s_title.xml
+++ b/theme_treehouse/views/snippets/s_title.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_title" inherit_id="website.s_title">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt64 pb64 o_half_screen_height parallax s_parallax_is_fixed o_cc5" remove="pt40 pb40" 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('/web/image/website.s_parallax_default_image'); background-position: 50% 50%;"></span>
-            <div class="o_we_bg_filter bg-black-50"/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h2 style="text-align: center;">Changing the world is possible.<br/> We’ve done it before.</h2>
-        </xpath>
-    </template>
+
+<template id="s_title" inherit_id="website.s_title">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt64 pb64 o_half_screen_height parallax s_parallax_is_fixed o_cc o_cc5" remove="pt40 pb40" 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('/web/image/website.s_parallax_default_image'); background-position: 50% 75%;"></span>
+        <div class="o_we_bg_filter bg-black-50"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        Changing the world is possible.<br/> We’ve done it before.
+    </xpath>
+</template>
+
 </odoo>