diff --git a/theme_zap/__manifest__.py b/theme_zap/__manifest__.py
index 1b2b701ca..c1e054b9e 100644
--- a/theme_zap/__manifest__.py
+++ b/theme_zap/__manifest__.py
@@ -12,16 +12,30 @@
         'views/images_library.xml',
 
         'views/snippets/s_banner.xml',
+        'views/snippets/s_call_to_action.xml',
         'views/snippets/s_color_blocks_2.xml',
+        'views/snippets/s_cover.xml',
         'views/snippets/s_features.xml',
+        'views/snippets/s_masonry_block.xml',
+        'views/snippets/s_media_list.xml',
         'views/snippets/s_numbers.xml',
         'views/snippets/s_references.xml',
-        'views/snippets/s_masonry_block.xml',
+        'views/snippets/s_image_text.xml',
+        'views/snippets/s_three_columns.xml',
     ],
     'images': [
         'static/description/zap_cover.gif',
         'static/description/zap_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_banner_default_image': '/theme_zap/static/src/img/content/banner.jpg',
+        'website.s_three_columns_default_image_1': '/theme_zap/static/src/img/content/three_columns_01.jpg',
+        'website.s_three_columns_default_image_2': '/theme_zap/static/src/img/content/three_columns_02.jpg',
+        'website.s_three_columns_default_image_3': '/theme_zap/static/src/img/content/three_columns_03.jpg',
+        'website.library_image_08': '/theme_zap/static/src/img/backgrounds/01.jpg',
+        'website.s_masonry_block_default_image_1': '/theme_zap/static/src/img/backgrounds/16.jpg',
+        'website.library_image_02': '/theme_zap/static/src/img/content/masonry_block_02.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-zap.odoo.com',
     'assets': {
diff --git a/theme_zap/data/ir_asset.xml b/theme_zap/data/ir_asset.xml
index fc14c0233..04d446af4 100644
--- a/theme_zap/data/ir_asset.xml
+++ b/theme_zap/data/ir_asset.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_zap.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_zap.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_zap/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_zap.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_zap.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_zap/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_zap.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_zap.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_zap/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_zap.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_zap.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_zap/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_zap/static/description/zap_screenshot.jpg b/theme_zap/static/description/zap_screenshot.jpg
index c7f0bacc6..9b53e132a 100644
Binary files a/theme_zap/static/description/zap_screenshot.jpg and b/theme_zap/static/description/zap_screenshot.jpg differ
diff --git a/theme_zap/static/src/img/content/banner.jpg b/theme_zap/static/src/img/content/banner.jpg
new file mode 100644
index 000000000..14094f204
Binary files /dev/null and b/theme_zap/static/src/img/content/banner.jpg differ
diff --git a/theme_zap/static/src/img/content/masonry_block_02.jpg b/theme_zap/static/src/img/content/masonry_block_02.jpg
new file mode 100644
index 000000000..2271e4349
Binary files /dev/null and b/theme_zap/static/src/img/content/masonry_block_02.jpg differ
diff --git a/theme_zap/static/src/img/content/parallax.jpg b/theme_zap/static/src/img/content/parallax.jpg
new file mode 100644
index 000000000..a3b7b2af8
Binary files /dev/null and b/theme_zap/static/src/img/content/parallax.jpg differ
diff --git a/theme_zap/static/src/img/content/text_image.jpg b/theme_zap/static/src/img/content/text_image.jpg
index a6b23a172..fa4af6667 100644
Binary files a/theme_zap/static/src/img/content/text_image.jpg and b/theme_zap/static/src/img/content/text_image.jpg differ
diff --git a/theme_zap/static/src/img/content/three_columns_01.jpg b/theme_zap/static/src/img/content/three_columns_01.jpg
index beda221ef..bbcf4f921 100644
Binary files a/theme_zap/static/src/img/content/three_columns_01.jpg and b/theme_zap/static/src/img/content/three_columns_01.jpg differ
diff --git a/theme_zap/static/src/img/content/three_columns_02.jpg b/theme_zap/static/src/img/content/three_columns_02.jpg
index ed33dd462..04ec092e5 100644
Binary files a/theme_zap/static/src/img/content/three_columns_02.jpg and b/theme_zap/static/src/img/content/three_columns_02.jpg differ
diff --git a/theme_zap/static/src/img/content/three_columns_03.jpg b/theme_zap/static/src/img/content/three_columns_03.jpg
index 67f950184..4ac0138b8 100644
Binary files a/theme_zap/static/src/img/content/three_columns_03.jpg and b/theme_zap/static/src/img/content/three_columns_03.jpg differ
diff --git a/theme_zap/static/src/js/tour.js b/theme_zap/static/src/js/tour.js
index fa2f48725..fde80a559 100644
--- a/theme_zap/static/src/js/tour.js
+++ b/theme_zap/static/src/js/tour.js
@@ -1,8 +1,6 @@
-odoo.define("theme_zap.tour.zap", 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 = [
     {
@@ -10,8 +8,8 @@ const snippets = [
         name: 'Banner',
     },
     {
-        id: 's_numbers',
-        name: 'Numbers',
+        id: 's_three_columns',
+        name: 'Columns',
     },
     {
         id: 's_color_blocks_2',
@@ -44,4 +42,3 @@ wTourUtils.registerThemeHomepageTour("zap_tour", [
     wTourUtils.changeBackgroundColor(),
     wTourUtils.selectColorPalette(),
 ]);
-});
diff --git a/theme_zap/static/src/scss/bootstrap_overridden.scss b/theme_zap/static/src/scss/bootstrap_overridden.scss
index b432f5844..d76f31a8a 100644
--- a/theme_zap/static/src/scss/bootstrap_overridden.scss
+++ b/theme_zap/static/src/scss/bootstrap_overridden.scss
@@ -3,74 +3,53 @@
 //------------------------------------------------------------------------------//
 
 // Headings
-@if o-website-value('headings-font-number') == 1 {
-    // Roboto
+@if o-website-value('headings-font') == 'Roboto' {
     $o-theme-headings-font-weight:          500;
 }
-@else if o-website-value('headings-font-number') == 4 {
-    // Lato
-    $o-theme-headings-font-weight:          300;
-}
-@else if o-website-value('headings-font-number') == 5 {
-    // Advent Pro
-    $o-theme-h1-font-size-multiplier:       4;
-    $o-theme-h2-font-size-multiplier:       3.5;
+@else if o-website-value('headings-font') == 'Nunito' {
     $o-theme-headings-font-weight:          600;
 }
-@else if o-website-value('headings-font-number') == 6 {
-    // Oswald
-    $o-theme-h1-font-size-multiplier:       4;
-    $o-theme-h2-font-size-multiplier:       3.5;
+@else if o-website-value('headings-font') == 'Advent Pro' {
+    $o-theme-headings-font-weight:          600;
 }
 
 // Body
-@if o-website-value('font-number') == 1 {
-    // Roboto
+@if o-website-value('font') == 'Roboto' {
     $o-theme-font-weight-bold:              500;
 }
-@else if o-website-value('font-number') == 4 {
-    // Lato
+@else if o-website-value('font') == 'Lato' {
     $o-theme-font-weight-light:             300;
     $o-theme-font-weight-bold:              600;
 }
-@else if o-website-value('font-number') == 5 {
-    // Advent Pro
+@else if o-website-value('font') == 'Advent Pro' {
     $o-theme-font-weight-bold:              600;
 }
-@else if o-website-value('font-number') == 6 {
-    // Oswald
+@else if o-website-value('font') == 'Oswald' {
     $o-theme-font-weight-light:             200;
     $o-theme-font-weight-normal:            300;
     $o-theme-font-weight-bold:              400;
 }
-@else if o-website-value('font-number') == 8 {
-    // Open Sans
+@else if o-website-value('font') == 'Open Sans' {
     $o-theme-font-weight-bold:              600;
 }
-@else if o-website-value('font-number') == 10 {
-    // Montserrat Alternates
+@else if o-website-value('font') == 'Montserrat Alternates' {
     $o-theme-font-weight-bold:              600;
 }
 
 // Buttons
-@if o-website-value('buttons-font-number') == 1 {
-    // Roboto
+@if o-website-value('buttons-font') == 'Roboto' {
     $o-theme-btn-font-weight:               500;
 }
-@else if o-website-value('buttons-font-number') == 5 {
-    // Advent Pro
+@else if o-website-value('buttons-font') == 'Advent Pro' {
     $o-theme-btn-font-weight:               600;
 }
-@else if o-website-value('buttons-font-number') == 6 {
-    // Oswald
+@else if o-website-value('buttons-font') == 'Oswald' {
     $o-theme-btn-font-weight:               200;
 }
-@else if o-website-value('buttons-font-number') == 8 {
-    // Open Sans
+@else if o-website-value('buttons-font') == 'Open Sans' {
     $o-theme-btn-font-weight:               600;
 }
-@else if o-website-value('buttons-font-number') == 10 {
-    // Montserrat Alternates
+@else if o-website-value('buttons-font') == 'Montserrat Alternates' {
     $o-theme-btn-font-weight:               600;
 }
 
diff --git a/theme_zap/static/src/scss/primary_variables.scss b/theme_zap/static/src/scss/primary_variables.scss
index 9ff160361..c42a35c16 100644
--- a/theme_zap/static/src/scss/primary_variables.scss
+++ b/theme_zap/static/src/scss/primary_variables.scss
@@ -4,24 +4,34 @@
 
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'zap-1',
+        'color-palettes-name':              'zap-1',
+
         // Header
         'header-template':                  'hamburger',
         'logo-height':                      2.75rem,
         'fixed-logo-height':                2rem,
         'header-links-style':               'fill',
 
-        'header-font-size':                 (14 / 16) * 1rem,
-        'font-size-base':                   (14 / 16) * 1rem,
-        'hamburger-position':               'right',
-
         // Font
-        'font':                             'Roboto',
-        'headings-font':                    'Montserrat Alternates',
-        'navbar-font':                      'Roboto',
-        'buttons-font':                     'Montserrat Alternates',
+        'font':                             'Lato',
+        'headings-font':                    'Lato',
+        'navbar-font':                      'Lato',
+        'buttons-font':                     'Lato',
+
+        // Buttons
+        'btn-padding-y':                    .625rem,
+        'btn-padding-x':                    1.5rem,
+        'btn-padding-y-sm':                 .375rem,
+        'btn-padding-x-sm':                 .75rem,
+        'btn-padding-y-lg':                 .75rem,
+        'btn-padding-x-lg':                 2rem,
+
         'btn-ripple':                       true,
 
+        'input-padding-y':                  .75rem,
+        'input-padding-y-sm':               .375rem,
+        'input-padding-y-lg':               .75rem,
+
         // Footer
         'footer-template':                  'links',
     ),
@@ -51,16 +61,18 @@ $o-theme-font-configs: (
     'Advent Pro': (
         'family': ('Advent Pro', sans-serif),
         'url': 'Advent+Pro:300,300i,400,400i,600,600i',
-        'base': (
-            'font-size-base': 1.125rem,
-        ),
+        'properties': (
+            'base': (
+                'font-size-base':           1.125rem,
+            ),
+        )
     ),
     'Oswald': (
         'family': ('Oswald', sans-serif),
         'url': 'Oswald:300,300i,400,400i,700,700i',
         'properties': (
             'base': (
-                'font-size-base': 1.25rem,
+                'font-size-base':           1.25rem,
             ),
         )
     ),
@@ -82,7 +94,12 @@ $o-theme-font-configs: (
     ),
     'Nunito': (
         'family': ('Nunito', sans-serif),
-        'url': 'Nunito:300,300i,400,400i,700,700i',
+        'url': 'Nunito:300,300i,400,400i,600,600i',
+        'properties' : (
+            'base': (
+                'header-font-size':         (15 / 16) * 1rem,
+            ),
+        )
     ),
 );
 
@@ -90,10 +107,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;
 
@@ -118,46 +131,46 @@ $o-theme-btn-font-weight:                   400;
 $o-theme-color-palettes: map-merge($o-theme-color-palettes,
     (
         'zap-1': (
-            'alpha':                            #337ab7,
-            'beta':                             #5cb85c,
-            'gamma':                            #5bc0de,
-            'delta':                            #f0ad4e,
-            'epsilon':                          #d9534f,
+            'alpha':                        #337ab7,
+            'beta':                         #5cb85c,
+            'gamma':                        #5bc0de,
+            'delta':                        #f0ad4e,
+            'epsilon':                      #d9534f,
         ),
         'zap-2': (
-            'alpha':                            #ed8c2b,
-            'beta':                             #cf4a30,
-            'gamma':                            #911146,
-            'delta':                            #35203b,
-            'epsilon':                          #88a825,
+            'alpha':                        #ed8c2b,
+            'beta':                         #cf4a30,
+            'gamma':                        #911146,
+            'delta':                        #35203b,
+            'epsilon':                      #88a825,
         ),
         'zap-3': (
-            'alpha':                            #79bd8f,
-            'beta':                             #00a388,
-            'gamma':                            #046380,
-            'delta':                            #4bb5c1,
-            'epsilon':                          #beeb9f,
+            'alpha':                        #79bd8f,
+            'beta':                         #00a388,
+            'gamma':                        #046380,
+            'delta':                        #4bb5c1,
+            'epsilon':                      #beeb9f,
         ),
         'zap-4': (
-            'alpha':                            #16c6cc,
-            'beta':                             #d72d3C,
-            'gamma':                            #ff6d3b,
-            'delta':                            #ffb733,
-            'epsilon':                          #ffd55c,
+            'alpha':                        #16c6cc,
+            'beta':                         #d72d3C,
+            'gamma':                        #ff6d3b,
+            'delta':                        #ffb733,
+            'epsilon':                      #ffd55c,
         ),
         'zap-5': (
-            'alpha':                            #14212b,
-            'beta':                             #e6e2af,
-            'gamma':                            #c9de55,
-            'delta':                            #962d3e,
-            'epsilon':                          #413659,
+            'alpha':                        #14212b,
+            'beta':                         #e6e2af,
+            'gamma':                        #c9de55,
+            'delta':                        #962d3e,
+            'epsilon':                      #413659,
         ),
         'zap-6': (
-            'alpha':                            #ee592f,
-            'beta':                             #59c1b0,
-            'gamma':                            #1fa58d,
-            'delta':                            #f8c63b,
-            'epsilon':                          #dcb038,
+            'alpha':                        #ee592f,
+            'beta':                         #59c1b0,
+            'gamma':                        #1fa58d,
+            'delta':                        #f8c63b,
+            'epsilon':                      #dcb038,
         ),
     )
 );
@@ -189,3 +202,9 @@ $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: 4));
diff --git a/theme_zap/views/images_library.xml b/theme_zap/views/images_library.xml
index 5beab58a8..04d1965b3 100644
--- a/theme_zap/views/images_library.xml
+++ b/theme_zap/views/images_library.xml
@@ -1,248 +1,269 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- BACKGROUNDS -->
-    <record id="bg_img_01" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_01</field>
-        <field name="name">theme_zap.background_img_01</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/01.jpg</field>
-    </record>
-    <record id="bg_img_02" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_02</field>
-        <field name="name">theme_zap.background_img_02</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/02.jpg</field>
-    </record>
-    <record id="bg_img_03" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_03</field>
-        <field name="name">theme_zap.background_img_03</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/03.jpg</field>
-    </record>
-    <record id="bg_img_04" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_04</field>
-        <field name="name">theme_zap.background_img_04</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/04.jpg</field>
-    </record>
-    <record id="bg_img_05" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_05</field>
-        <field name="name">theme_zap.background_img_05</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/05.jpg</field>
-    </record>
-    <record id="bg_img_06" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_06</field>
-        <field name="name">theme_zap.background_img_06</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/06.jpg</field>
-    </record>
-    <record id="bg_img_07" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_07</field>
-        <field name="name">theme_zap.background_img_07</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/07.jpg</field>
-    </record>
-    <record id="bg_img_08" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_08</field>
-        <field name="name">theme_zap.background_img_08</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/08.jpg</field>
-    </record>
-    <record id="bg_img_09" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_09</field>
-        <field name="name">theme_zap.background_img_09</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/09.jpg</field>
-    </record>
-    <record id="bg_img_10" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_10</field>
-        <field name="name">theme_zap.background_img_10</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/10.jpg</field>
-    </record>
-    <record id="bg_img_11" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_11</field>
-        <field name="name">theme_zap.background_img_11</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/11.jpg</field>
-    </record>
-    <record id="bg_img_12" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_12</field>
-        <field name="name">theme_zap.background_img_12</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/12.jpg</field>
-    </record>
-    <record id="bg_img_13" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_13</field>
-        <field name="name">theme_zap.background_img_13</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/13.jpg</field>
-    </record>
-    <record id="bg_img_14" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_14</field>
-        <field name="name">theme_zap.background_img_14</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/14.jpg</field>
-    </record>
-    <record id="bg_img_15" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_15</field>
-        <field name="name">theme_zap.background_img_15</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/15.jpg</field>
-    </record>
-    <record id="bg_img_16" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_img_16</field>
-        <field name="name">theme_zap.background_img_16</field>
-        <field name="url">/theme_zap/static/src/img/backgrounds/16.jpg</field>
-    </record>
 
-    <!-- PATTERNS -->
-    <record id="bg_pattern_01" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_01</field>
-        <field name="name">theme_zap.background_pattern_01</field>
-        <field name="url">/theme_zap/static/src/img/patterns/01.png</field>
-    </record>
-    <record id="bg_pattern_02" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_02</field>
-        <field name="name">theme_zap.background_pattern_02</field>
-        <field name="url">/theme_zap/static/src/img/patterns/02.png</field>
-    </record>
-    <record id="bg_pattern_03" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_03</field>
-        <field name="name">theme_zap.background_pattern_03</field>
-        <field name="url">/theme_zap/static/src/img/patterns/03.png</field>
-    </record>
-    <record id="bg_pattern_04" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_04</field>
-        <field name="name">theme_zap.background_pattern_04</field>
-        <field name="url">/theme_zap/static/src/img/patterns/04.png</field>
-    </record>
-    <record id="bg_pattern_05" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_05</field>
-        <field name="name">theme_zap.background_pattern_05</field>
-        <field name="url">/theme_zap/static/src/img/patterns/05.png</field>
-    </record>
-    <record id="bg_pattern_06" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_06</field>
-        <field name="name">theme_zap.background_pattern_06</field>
-        <field name="url">/theme_zap/static/src/img/patterns/06.png</field>
-    </record>
-    <record id="bg_pattern_07" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_07</field>
-        <field name="name">theme_zap.background_pattern_07</field>
-        <field name="url">/theme_zap/static/src/img/patterns/07.png</field>
-    </record>
-    <record id="bg_pattern_06" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_06</field>
-        <field name="name">theme_zap.background_pattern_06</field>
-        <field name="url">/theme_zap/static/src/img/patterns/08.png</field>
-    </record>
-    <record id="bg_pattern_07" model="theme.ir.attachment">
-        <field name="key">theme_zap.bg_pattern_07</field>
-        <field name="name">theme_zap.background_pattern_07</field>
-        <field name="url">/theme_zap/static/src/img/patterns/09.png</field>
-    </record>
+<!-- BACKGROUNDS -->
+<record id="bg_img_01" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_01</field>
+    <field name="name">theme_zap.background_img_01</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/01.jpg</field>
+</record>
+<record id="bg_img_02" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_02</field>
+    <field name="name">theme_zap.background_img_02</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/02.jpg</field>
+</record>
+<record id="bg_img_03" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_03</field>
+    <field name="name">theme_zap.background_img_03</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/03.jpg</field>
+</record>
+<record id="bg_img_04" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_04</field>
+    <field name="name">theme_zap.background_img_04</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/04.jpg</field>
+</record>
+<record id="bg_img_05" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_05</field>
+    <field name="name">theme_zap.background_img_05</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/05.jpg</field>
+</record>
+<record id="bg_img_06" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_06</field>
+    <field name="name">theme_zap.background_img_06</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/06.jpg</field>
+</record>
+<record id="bg_img_07" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_07</field>
+    <field name="name">theme_zap.background_img_07</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/07.jpg</field>
+</record>
+<record id="bg_img_08" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_08</field>
+    <field name="name">theme_zap.background_img_08</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/08.jpg</field>
+</record>
+<record id="bg_img_09" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_09</field>
+    <field name="name">theme_zap.background_img_09</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/09.jpg</field>
+</record>
+<record id="bg_img_10" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_10</field>
+    <field name="name">theme_zap.background_img_10</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/10.jpg</field>
+</record>
+<record id="bg_img_11" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_11</field>
+    <field name="name">theme_zap.background_img_11</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/11.jpg</field>
+</record>
+<record id="bg_img_12" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_12</field>
+    <field name="name">theme_zap.background_img_12</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/12.jpg</field>
+</record>
+<record id="bg_img_13" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_13</field>
+    <field name="name">theme_zap.background_img_13</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/13.jpg</field>
+</record>
+<record id="bg_img_14" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_14</field>
+    <field name="name">theme_zap.background_img_14</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/14.jpg</field>
+</record>
+<record id="bg_img_15" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_15</field>
+    <field name="name">theme_zap.background_img_15</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/15.jpg</field>
+</record>
+<record id="bg_img_16" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_img_16</field>
+    <field name="name">theme_zap.background_img_16</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/16.jpg</field>
+</record>
 
-    <!-- Change default images of snippets -->
+<!-- PATTERNS -->
+<record id="bg_pattern_01" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_01</field>
+    <field name="name">theme_zap.background_pattern_01</field>
+    <field name="url">/theme_zap/static/src/img/patterns/01.png</field>
+</record>
+<record id="bg_pattern_02" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_02</field>
+    <field name="name">theme_zap.background_pattern_02</field>
+    <field name="url">/theme_zap/static/src/img/patterns/02.png</field>
+</record>
+<record id="bg_pattern_03" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_03</field>
+    <field name="name">theme_zap.background_pattern_03</field>
+    <field name="url">/theme_zap/static/src/img/patterns/03.png</field>
+</record>
+<record id="bg_pattern_04" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_04</field>
+    <field name="name">theme_zap.background_pattern_04</field>
+    <field name="url">/theme_zap/static/src/img/patterns/04.png</field>
+</record>
+<record id="bg_pattern_05" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_05</field>
+    <field name="name">theme_zap.background_pattern_05</field>
+    <field name="url">/theme_zap/static/src/img/patterns/05.png</field>
+</record>
+<record id="bg_pattern_06" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_06</field>
+    <field name="name">theme_zap.background_pattern_06</field>
+    <field name="url">/theme_zap/static/src/img/patterns/06.png</field>
+</record>
+<record id="bg_pattern_07" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_07</field>
+    <field name="name">theme_zap.background_pattern_07</field>
+    <field name="url">/theme_zap/static/src/img/patterns/07.png</field>
+</record>
+<record id="bg_pattern_06" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_06</field>
+    <field name="name">theme_zap.background_pattern_06</field>
+    <field name="url">/theme_zap/static/src/img/patterns/08.png</field>
+</record>
+<record id="bg_pattern_07" model="theme.ir.attachment">
+    <field name="key">theme_zap.bg_pattern_07</field>
+    <field name="name">theme_zap.background_pattern_07</field>
+    <field name="url">/theme_zap/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_zap/static/src/img/backgrounds/09.jpg</field>
-    </record>
+<!-- Change default images of snippets -->
 
-    <!-- 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_zap/static/src/img/backgrounds/09.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_zap/static/src/img/content/banner.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_zap/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_zap/static/src/img/backgrounds/09.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_zap/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_zap/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_zap/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_zap/static/src/img/content/image_text.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_zap/static/src/img/backgrounds/16.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_zap/static/src/img/content/picture.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_zap/static/src/img/backgrounds/05.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_zap/static/src/img/backgrounds/08.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_zap/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_zap/static/src/img/backgrounds/16.jpg</field>
+</record>
+<record id="s_masonry_block_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_masonry_block_default_image_2</field>
+    <field name="name">website.s_masonry_block_default_image_2</field>
+    <field name="url">/theme_zap/static/src/img/content/masonry_block_02.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_zap/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_zap/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_zap/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_zap/static/src/img/backgrounds/05.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_zap/static/src/img/backgrounds/08.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_zap/static/src/img/backgrounds/07.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_zap/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_zap/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_zap/static/src/img/content/media_list_03.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_zap/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_zap/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_zap/static/src/img/content/three_columns_03.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_zap/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_zap/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_zap/static/src/img/content/media_list_03.jpg</field>
+</record>
+
+<!-- Company Team -->
+<record id="s_company_team_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_company_team_image_1</field>
+    <field name="name">website.s_company_team_image_1</field>
+    <field name="url">/theme_zap/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_image_2</field>
+    <field name="url">/theme_zap/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_image_3</field>
+    <field name="url">/theme_zap/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_image_4</field>
+    <field name="url">/theme_zap/static/src/img/content/company_team_04.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_zap/static/src/img/content/parallax.jpg</field>
+</record>
+
+<!-- Color Blocks -->
+<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_zap/static/src/img/backgrounds/01.jpg</field>
+</record>
 
-    <!-- Company Team -->
-    <record id="s_company_team_image_1" model="theme.ir.attachment">
-        <field name="key">website.s_company_team_image_1</field>
-        <field name="name">website.s_company_team_image_1</field>
-        <field name="url">/theme_zap/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_image_2</field>
-        <field name="url">/theme_zap/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_image_3</field>
-        <field name="url">/theme_zap/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_image_4</field>
-        <field name="url">/theme_zap/static/src/img/content/company_team_04.jpg</field>
-    </record>
 </odoo>
diff --git a/theme_zap/views/snippets/s_banner.xml b/theme_zap/views/snippets/s_banner.xml
index d29d3b792..57e1a7f52 100644
--- a/theme_zap/views/snippets/s_banner.xml
+++ b/theme_zap/views/snippets/s_banner.xml
@@ -1,25 +1,35 @@
 <?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="pt152" remove="pt96 pb96" separator=" "/>
-        </xpath>
-        <!-- Column -->
-        <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-            <attribute name="class" add="col-lg-12 text-center pt80 pb80" remove="col-lg-6" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1><b>Digital Transformation</b></h1>
-        </xpath>
-        <!-- Text -->
-        <xpath expr="//p" position="replace">
-            <p class="lead">Software Innovation as its best.<br/> Harness the power of disruptive technologies to increase your day-to-day business operations.</p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="//t[@t-esc='cta_btn_text']" position="replace">
-            <t t-esc="cta_btn_text">Our Solutions</t>
-        </xpath>
-    </template>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt256 pb48" remove="pt96 pb96" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/04_001","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//*[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_04_001 o_we_flip_y"/>
+    </xpath>
+    <!-- Column -->
+    <xpath expr="//*[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="col-lg-8 pt48 px-5" remove="col-lg-6 pt32" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        <b>Software innovation</b><br/> as its best.
+    </xpath>
+    <!-- Text -->
+    <xpath expr="//p" position="replace">
+        <p class="lead">Harness the power of disruptive technologies to increase<br/> your day-to-day business operations.</p>
+    </xpath>
+    <xpath expr="//p" position="after">
+        <p><br/></p>
+    </xpath>
+    <!-- Buttons -->
+    <xpath expr="//a//t" position="replace" mode="inner">
+        Our Solutions
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_call_to_action.xml b/theme_zap/views/snippets/s_call_to_action.xml
new file mode 100644
index 000000000..24880fb82
--- /dev/null
+++ b/theme_zap/views/snippets/s_call_to_action.xml
@@ -0,0 +1,11 @@
+<?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 o_cc4" remove="pt48 pb24 o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_zap/views/snippets/s_color_blocks_2.xml b/theme_zap/views/snippets/s_color_blocks_2.xml
index a6b4c7f52..1b603cbb5 100644
--- a/theme_zap/views/snippets/s_color_blocks_2.xml
+++ b/theme_zap/views/snippets/s_color_blocks_2.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
-        <!-- Section -->
-        <xpath expr="//div[hasclass('row')]//div[1]" position="attributes">
-            <attribute name="class" add="o_cc4" remove="o_cc3 text-center" separator=" "/>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]//div[1]//i" position="replace">
-            <i class="fa fa-4x fa-cloud bg-white rounded-circle shadow mb-4"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]//div[1]//h2" position="replace">
-            <h2>Cloud <b>Solution</b></h2>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]//div[1]//p" position="replace">
-            <p>Keep your files in one place. Manage documents online with an easy to use interface. Rely on an highly secure cloud storage.</p>
-        </xpath>
-        <xpath expr="//a" position="replace">
-            <a href="#" class="btn btn-primary mb-2">Learn more</a>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]//div[2]" position="replace">
-            <div class="col-lg-6 p-0">
-                <img src="/theme_zap/static/src/img/backgrounds/01.jpg" class="w-100 h-100 align-self-stretch" 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="//*[hasclass('row')]/*[1]" position="attributes">
+        <attribute name="class" add="o_cc4 pt96 pb96" remove="o_cc3 text-center" separator=" "/>
+    </xpath>
+    <xpath expr="//i" position="replace">
+        <i class="fa fa-2x fa-cloud bg-white text-o-color-1 rounded-circle shadow my-4"/>
+    </xpath>
+    <xpath expr="//h2" position="replace" mode="inner">
+        Cloud <b>Solution</b>
+    </xpath>
+    <xpath expr="//p" position="replace">
+        <p class="lead">Keep your files in one place. <br/>Manage documents online with an easy to use interface. <br/>Rely on an highly secure cloud storage.</p>
+        <p><br/></p>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//*[hasclass('row')]/*[2]" position="replace">
+        <div class="col-lg-6 oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.library_image_08');">
+            <br/>
+        </div>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_cover.xml b/theme_zap/views/snippets/s_cover.xml
new file mode 100644
index 000000000..9c95f1e9b
--- /dev/null
+++ b/theme_zap/views/snippets/s_cover.xml
@@ -0,0 +1,11 @@
+<?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>
+</template>
+
+</odoo>
diff --git a/theme_zap/views/snippets/s_features.xml b/theme_zap/views/snippets/s_features.xml
index 1abe0ab6e..9846884ab 100644
--- a/theme_zap/views/snippets/s_features.xml
+++ b/theme_zap/views/snippets/s_features.xml
@@ -1,45 +1,53 @@
 <?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="o_cc2 pt64 pb64" remove="pt48 pb48" separator=" "/>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]/i" position="replace">
-            <i class="fa fa-3x fa-gear bg-o-color-1 m-3 rounded-circle"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]/h3" position="replace">
-            <h3 class="text-primary">Security</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[1]/p" position="replace">
-            <p>We keep you safe in the cloud.</p>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/i" position="replace">
-            <i class="fa fa-3x fa-file-text bg-o-color-5 m-3 rounded-circle"/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/h3" position="replace">
-            <h3 class="text-dark">Support</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[2]/p" position="replace">
-            <p>All types of files are allowed.</p>
-        </xpath>
-        <!-- Column #03 -->
-        <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]/h3" position="replace">
-            <h3 class="text-secondary">Eco-Friendly</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('row')]/div[3]/p" position="replace">
-            <p>All our data centers are emission-free.</p>
-        </xpath>
-    </template>
+
+<template id="s_features" inherit_id="website.s_features">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pt80 pb80" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="//i" position="replace">
+        <i class="fa fa-2x fa-lock bg-o-color-1 m-3 rounded-circle"/>
+    </xpath>
+    <xpath expr="//h3" position="replace" mode="inner">
+        Security
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        We keep you safe <br/>in the cloud.
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[2]" position="replace">
+        <i class="fa fa-2x fa-file-text bg-o-color-5 m-3 rounded-circle"/>
+    </xpath>
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Support
+    </xpath>
+    <xpath expr="(//p)[2]" position="replace" mode="inner">
+        All types of files <br/>are allowed.
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="//*[hasclass('row')]/*[3]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[3]" position="replace">
+        <i class="fa fa-2x fa-leaf bg-secondary m-3 rounded-circle"/>
+    </xpath>
+    <xpath expr="(//h3)[3]" position="replace" mode="inner">
+        Eco-Friendly
+    </xpath>
+    <xpath expr="(//p)[3]" position="replace" mode="inner">
+        All our data centers <br/>are emission-free.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_image_text.xml b/theme_zap/views/snippets/s_image_text.xml
new file mode 100644
index 000000000..3ee55243f
--- /dev/null
+++ b/theme_zap/views/snippets/s_image_text.xml
@@ -0,0 +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="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_zap/views/snippets/s_masonry_block.xml b/theme_zap/views/snippets/s_masonry_block.xml
index 86e656082..8aa0d4e23 100644
--- a/theme_zap/views/snippets/s_masonry_block.xml
+++ b/theme_zap/views/snippets/s_masonry_block.xml
@@ -1,31 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
-        <!-- Block #01 -->
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/*" position="before">
-            <i class="fa fa-star fa-1x text-secondary rounded shadow-sm mx-auto mb-3"/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/h3" position="replace">
-            <h3>Super <b>Easy</b>.</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/p" position="replace"/>
-        <!-- Block #02 -->
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]" position="replace">
-            <div class="col-lg-6 p-0">
-                <img src="/theme_zap/static/src/img/backgrounds/02.jpg" class="w-100 h-100 align-self-stretch" style="object-fit: cover;" alt=""/>
-            </div>
-        </xpath>
-        <!-- Block #03 -->
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]" position="replace">
-            <div class="col-lg-6 text-center p-5"><p class="lead mb-0"><em>Maintain a position of constant change and evolution, while always aiming for your success.</em></p></div>
-        </xpath>
-        <!-- Block #04 -->
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/h3" position="replace">
-            <h3>Super <b>Fast</b>.</h3>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/p" position="replace"/>
-        <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/*" position="before">
-            <i class="fa fa-rocket fa-1x text-primary rounded shadow-sm mx-auto mb-3"/>
-        </xpath>
-    </template>
+
+<template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
+    <!-- Block #01 -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
+    </xpath>
+    <xpath expr="//h3" position="replace"/>
+    <xpath expr="(//p)[2]" position="replace" mode="inner">
+        <em class="lead">Maintain a position of constant change<br/> and evolution, while always aiming<br/> for your success.</em>
+    </xpath>
+    <!-- Block #02 -->
+    <xpath expr="//h3" position="before">
+        <i class="fa fa-2x fa-star text-o-color-2 rounded-circle shadow mx-auto my-3"/>
+    </xpath>
+    <xpath expr="//h3" position="replace" mode="inner">
+        Super <b>Easy</b>
+    </xpath>
+    <xpath expr="(//p)[3]" position="replace" mode="inner"/>
+    <!-- Block #03 -->
+    <xpath expr="(//h3)[2]" position="before">
+        <i class="fa fa-2x fa-rocket text-o-color-1 rounded-circle shadow mx-auto my-3"/>
+    </xpath>
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Super <b>Fast</b>
+    </xpath>
+    <xpath expr="(//p)[4]" position="replace" mode="inner"/>
+    <!-- Block #04 -->
+    <xpath expr="(//h3)[3]" position="replace" mode="inner"/>
+    <xpath expr="(//p)[5]" position="replace" mode="inner"/>
+    <xpath expr="//*[hasclass('col-lg-6')][2]//*[hasclass('col-lg-6')][4]" position="attributes">
+        <attribute name="class" add="oe_img_bg" separator=" "/>
+        <attribute name="style" add="background-image: url('/web/image/website.s_masonry_block_default_image_2'); background-position: 50% 0%;" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_media_list.xml b/theme_zap/views/snippets/s_media_list.xml
new file mode 100644
index 000000000..6db1f1ac4
--- /dev/null
+++ b/theme_zap/views/snippets/s_media_list.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Items -->
+    <xpath expr="//*[hasclass('s_media_list_item')][1]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;"/>
+    </xpath>
+    <xpath expr="//*[hasclass('s_media_list_item')][2]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;"/>
+    </xpath>
+    <xpath expr="//*[hasclass('s_media_list_item')][3]/div" position="attributes">
+        <attribute name="class" add="rounded" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_zap/views/snippets/s_numbers.xml b/theme_zap/views/snippets/s_numbers.xml
index da361cd64..ae846a109 100644
--- a/theme_zap/views/snippets/s_numbers.xml
+++ b/theme_zap/views/snippets/s_numbers.xml
@@ -1,40 +1,43 @@
 <?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="pt64 pb64" remove="pt48 pb24" separator=" "/>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('col-lg-3')][1]" position="attributes">
-            <attribute name="class" add="shadow-sm bg-white pt64 pb64" remove="pt24 pb24" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')][1]/h6" position="replace">
-            <h6>Business Solutions</h6>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('col-lg-3')][2]" position="attributes">
-            <attribute name="class" add="shadow-sm bg-white pt64 pb64" remove="pt24 pb24" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')][2]/span" position="replace">
-            <span class="s_number display-4">4500</span>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')][2]/h6" position="replace">
-            <h6>Happy Customers</h6>
-        </xpath>
-        <!-- Column #03 -->
-        <xpath expr="//div[hasclass('col-lg-3')][3]" position="attributes">
-            <attribute name="class" add="shadow-sm bg-white pt64 pb64" remove="pt24 pb24" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')][3]/h6" position="replace">
-            <h6>Available Languages</h6>
-        </xpath>
-        <!-- Column #04 -->
-        <xpath expr="//div[hasclass('col-lg-3')][4]" position="attributes">
-            <attribute name="class" add="shadow-sm bg-white pt64 pb64" remove="pt24 pb24" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-3')][4]/h6" position="replace">
-            <h6>Ongoing Projects</h6>
-        </xpath>
-    </template>
+
+<template id="s_numbers" inherit_id="website.s_numbers">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb80" remove="pt48 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[1]" position="replace" mode="inner">
+        <font class="text-o-color-1">Solutions</font>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[2]" position="replace" mode="inner">
+        <font class="text-o-color-1">Customers</font>
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="//*[hasclass('row')]/*[3]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[3]" position="replace" mode="inner">
+        <font class="text-o-color-1">Languages</font>
+    </xpath>
+    <!-- Column #04 -->
+    <xpath expr="//*[hasclass('row')]/*[4]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt64 pb64" remove="pt24 pb24" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[4]" position="replace" mode="inner">
+        <font class="text-o-color-1">Projects</font>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_references.xml b/theme_zap/views/snippets/s_references.xml
index a7d420b27..c38df9b72 100644
--- a/theme_zap/views/snippets/s_references.xml
+++ b/theme_zap/views/snippets/s_references.xml
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_references" inherit_id="website.s_references">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt80 pb64 o_cc2" remove="pt48 pb32" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2 style="text-align: center;">Our <b>References</b></h2>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p" position="after">
-            <p><br/></p>
-        </xpath>
-        <!-- Column #01 -->
-        <xpath expr="//div[hasclass('row')]/div[1]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-        <!-- Column #02 -->
-        <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-        <!-- Column #03 -->
-        <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-        <!-- Column #04 -->
-        <xpath expr="//div[hasclass('row')]/div[4]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-        <!-- Column #05 -->
-        <xpath expr="//div[hasclass('row')]/div[5]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-        <!-- Column #06 -->
-        <xpath expr="//div[hasclass('row')]/div[6]" position="attributes">
-            <attribute name="class" add="rounded bg-white shadow-sm pt48 pb48" remove="" separator=" "/>
-        </xpath>
-    </template>
+
+<template id="s_references" inherit_id="website.s_references">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb64 o_cc2" remove="pt48 pb32" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Our <b>References</b>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="after">
+        <p><br/></p>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="//*[hasclass('row')]/*[3]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <!-- Column #04 -->
+    <xpath expr="//*[hasclass('row')]/*[4]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <!-- Column #05 -->
+    <xpath expr="//*[hasclass('row')]/*[5]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <!-- Column #06 -->
+    <xpath expr="//*[hasclass('row')]/*[6]" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_zap/views/snippets/s_three_columns.xml b/theme_zap/views/snippets/s_three_columns.xml
new file mode 100644
index 000000000..7bd4d976b
--- /dev/null
+++ b/theme_zap/views/snippets/s_three_columns.xml
@@ -0,0 +1,32 @@
+<?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="pt64 pb64" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//*[hasclass('card')]" position="attributes">
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="//*[hasclass('card-title')]" position="replace" mode="inner">
+        Services
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="(//*[hasclass('card')])[2]" position="attributes">
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('card-title')])[2]" position="replace" mode="inner">
+        Features
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="(//*[hasclass('card')])[3]" position="attributes">
+        <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="(//*[hasclass('card-title')])[3]" position="replace" mode="inner">
+        Benefits
+    </xpath>
+</template>
+
+</odoo>