diff --git a/theme_paptic/__manifest__.py b/theme_paptic/__manifest__.py
index 3ec69350d..d951f8211 100644
--- a/theme_paptic/__manifest__.py
+++ b/theme_paptic/__manifest__.py
@@ -4,7 +4,7 @@
     'category': 'Theme/Corporate',
     'summary': 'Consultancy, Design, Tech, Computers, IT, Blogs',
     'sequence': 110,
-    'version': '2.0.0',
+    'version': '2.1.0',
     'author': 'Odoo S.A.',
     'depends': ['website'],
     'data': [
@@ -16,6 +16,11 @@
         'static/description/paptic_poster.jpg',
         'static/description/paptic_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_three_columns_default_image_1': '/theme_paptic/static/src/img/pictures/s_three_columns_1.jpg',
+        'website.s_three_columns_default_image_2': '/theme_paptic/static/src/img/pictures/s_three_columns_2.jpg',
+        'website.s_three_columns_default_image_3': '/theme_paptic/static/src/img/pictures/s_three_columns_3.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-paptic.odoo.com',
     'assets': {
diff --git a/theme_paptic/data/ir_asset.xml b/theme_paptic/data/ir_asset.xml
index 5d957208c..ca39f4708 100644
--- a/theme_paptic/data/ir_asset.xml
+++ b/theme_paptic/data/ir_asset.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_paptic.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_paptic.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_paptic/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_paptic.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_paptic.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_paptic/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_paptic.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_paptic.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_paptic/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_paptic.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_paptic.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_paptic/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_paptic/static/description/paptic_poster.jpg b/theme_paptic/static/description/paptic_poster.jpg
index 0e407f4fe..8d9164d3a 100644
Binary files a/theme_paptic/static/description/paptic_poster.jpg and b/theme_paptic/static/description/paptic_poster.jpg differ
diff --git a/theme_paptic/static/description/paptic_screenshot.jpg b/theme_paptic/static/description/paptic_screenshot.jpg
index 27c01f244..795ba9bfd 100644
Binary files a/theme_paptic/static/description/paptic_screenshot.jpg and b/theme_paptic/static/description/paptic_screenshot.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_banner.jpg b/theme_paptic/static/src/img/pictures/s_banner.jpg
index 1f33e0b10..fb2b0e319 100644
Binary files a/theme_paptic/static/src/img/pictures/s_banner.jpg and b/theme_paptic/static/src/img/pictures/s_banner.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_carousel_1.jpg b/theme_paptic/static/src/img/pictures/s_carousel_1.jpg
index 8ac463717..d501097c7 100644
Binary files a/theme_paptic/static/src/img/pictures/s_carousel_1.jpg and b/theme_paptic/static/src/img/pictures/s_carousel_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_carousel_2.jpg b/theme_paptic/static/src/img/pictures/s_carousel_2.jpg
index c2edba5cf..dbbf4311b 100644
Binary files a/theme_paptic/static/src/img/pictures/s_carousel_2.jpg and b/theme_paptic/static/src/img/pictures/s_carousel_2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_carousel_3.jpg b/theme_paptic/static/src/img/pictures/s_carousel_3.jpg
index f72d5f3f8..3c06eddfa 100644
Binary files a/theme_paptic/static/src/img/pictures/s_carousel_3.jpg and b/theme_paptic/static/src/img/pictures/s_carousel_3.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_company_team_image_1.jpg b/theme_paptic/static/src/img/pictures/s_company_team_image_1.jpg
index aeca08853..605e6c107 100644
Binary files a/theme_paptic/static/src/img/pictures/s_company_team_image_1.jpg and b/theme_paptic/static/src/img/pictures/s_company_team_image_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_company_team_image_2.jpg b/theme_paptic/static/src/img/pictures/s_company_team_image_2.jpg
index 1e8b3daa6..58c48fa91 100644
Binary files a/theme_paptic/static/src/img/pictures/s_company_team_image_2.jpg and b/theme_paptic/static/src/img/pictures/s_company_team_image_2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_company_team_image_3.jpg b/theme_paptic/static/src/img/pictures/s_company_team_image_3.jpg
index c34d5d99a..e743cad20 100644
Binary files a/theme_paptic/static/src/img/pictures/s_company_team_image_3.jpg and b/theme_paptic/static/src/img/pictures/s_company_team_image_3.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_company_team_image_4.jpg b/theme_paptic/static/src/img/pictures/s_company_team_image_4.jpg
index 7f38a283e..18b14146f 100644
Binary files a/theme_paptic/static/src/img/pictures/s_company_team_image_4.jpg and b/theme_paptic/static/src/img/pictures/s_company_team_image_4.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_masonry_block_1.jpg b/theme_paptic/static/src/img/pictures/s_masonry_block_1.jpg
index c9562e573..21b052a41 100644
Binary files a/theme_paptic/static/src/img/pictures/s_masonry_block_1.jpg and b/theme_paptic/static/src/img/pictures/s_masonry_block_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_media_list_1.jpg b/theme_paptic/static/src/img/pictures/s_media_list_1.jpg
index 27622bb0b..4eea819dd 100644
Binary files a/theme_paptic/static/src/img/pictures/s_media_list_1.jpg and b/theme_paptic/static/src/img/pictures/s_media_list_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_media_list_2.jpg b/theme_paptic/static/src/img/pictures/s_media_list_2.jpg
index ed2c95840..109cc2103 100644
Binary files a/theme_paptic/static/src/img/pictures/s_media_list_2.jpg and b/theme_paptic/static/src/img/pictures/s_media_list_2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_media_list_3.jpg b/theme_paptic/static/src/img/pictures/s_media_list_3.jpg
index 3d3d4242b..bc0fb7e29 100644
Binary files a/theme_paptic/static/src/img/pictures/s_media_list_3.jpg and b/theme_paptic/static/src/img/pictures/s_media_list_3.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_parallax.jpg b/theme_paptic/static/src/img/pictures/s_parallax.jpg
index cf31254c7..ebe243334 100644
Binary files a/theme_paptic/static/src/img/pictures/s_parallax.jpg and b/theme_paptic/static/src/img/pictures/s_parallax.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_picture.jpg b/theme_paptic/static/src/img/pictures/s_picture.jpg
index 17238fd4d..57502e519 100644
Binary files a/theme_paptic/static/src/img/pictures/s_picture.jpg and b/theme_paptic/static/src/img/pictures/s_picture.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_popup.jpg b/theme_paptic/static/src/img/pictures/s_popup.jpg
index 01c114a77..3aed254de 100644
Binary files a/theme_paptic/static/src/img/pictures/s_popup.jpg and b/theme_paptic/static/src/img/pictures/s_popup.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_catalog.jpg b/theme_paptic/static/src/img/pictures/s_product_catalog.jpg
index 375e2d959..7dd344c25 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_catalog.jpg and b/theme_paptic/static/src/img/pictures/s_product_catalog.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_1.jpg b/theme_paptic/static/src/img/pictures/s_product_list_1.jpg
index e400c526a..7ae36f207 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_1.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_2.jpg b/theme_paptic/static/src/img/pictures/s_product_list_2.jpg
index f0fd46a3a..91160c77c 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_2.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_3.jpg b/theme_paptic/static/src/img/pictures/s_product_list_3.jpg
index 60d3594e2..7c0b0aed2 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_3.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_3.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_4.jpg b/theme_paptic/static/src/img/pictures/s_product_list_4.jpg
index 1463ad62b..866aae529 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_4.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_4.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_5.jpg b/theme_paptic/static/src/img/pictures/s_product_list_5.jpg
index e8e6956bb..6b7135b46 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_5.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_5.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_product_list_6.jpg b/theme_paptic/static/src/img/pictures/s_product_list_6.jpg
index 64e777c30..a68a96c39 100644
Binary files a/theme_paptic/static/src/img/pictures/s_product_list_6.jpg and b/theme_paptic/static/src/img/pictures/s_product_list_6.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg b/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg
index 65ef19dd1..5ce65cfcc 100644
Binary files a/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg and b/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg b/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg
index fe126d572..cacdabe3c 100644
Binary files a/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg and b/theme_paptic/static/src/img/pictures/s_quotes_carousel_bg_slide3.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_three_columns_1.jpg b/theme_paptic/static/src/img/pictures/s_three_columns_1.jpg
index 47644366d..7ef0053a2 100644
Binary files a/theme_paptic/static/src/img/pictures/s_three_columns_1.jpg and b/theme_paptic/static/src/img/pictures/s_three_columns_1.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_three_columns_2.jpg b/theme_paptic/static/src/img/pictures/s_three_columns_2.jpg
index cfb9b2403..d931dd897 100644
Binary files a/theme_paptic/static/src/img/pictures/s_three_columns_2.jpg and b/theme_paptic/static/src/img/pictures/s_three_columns_2.jpg differ
diff --git a/theme_paptic/static/src/img/pictures/s_three_columns_3.jpg b/theme_paptic/static/src/img/pictures/s_three_columns_3.jpg
index 27b92dcc9..011c7170c 100644
Binary files a/theme_paptic/static/src/img/pictures/s_three_columns_3.jpg and b/theme_paptic/static/src/img/pictures/s_three_columns_3.jpg differ
diff --git a/theme_paptic/static/src/js/tour.js b/theme_paptic/static/src/js/tour.js
index e64120d90..117f3b123 100644
--- a/theme_paptic/static/src/js/tour.js
+++ b/theme_paptic/static/src/js/tour.js
@@ -1,11 +1,6 @@
-odoo.define("theme_paptic.tour.paptic", function (require) {
-"use strict";
+/** @odoo-module */
 
-const core = require("web.core");
-const _t = core._t;
-
-const wTourUtils = require("website.tour_utils");
-var tour = require("web_tour.tour");
+import wTourUtils from 'website.tour_utils';
 
 const snippets = [
     {
@@ -24,6 +19,14 @@ const snippets = [
         id: 's_three_columns',
         name: 'Columns',
     },
+    {
+        id: 's_comparisons',
+        name: 'Comparisons',
+    },
+    {
+        id: 's_call_to_action',
+        name: 'Call to Action',
+    },
 ];
 
 
@@ -31,9 +34,9 @@ wTourUtils.registerThemeHomepageTour("paptic_tour", [
     wTourUtils.dragNDrop(snippets[0], 'top'),
     wTourUtils.clickOnText(snippets[0], 'h1', 'top'),
     wTourUtils.goBackToBlocks(),
-
     wTourUtils.dragNDrop(snippets[1], 'top'),
     wTourUtils.dragNDrop(snippets[2], 'top'),
     wTourUtils.dragNDrop(snippets[3], 'top'),
+    wTourUtils.dragNDrop(snippets[4], 'top'),
+    wTourUtils.dragNDrop(snippets[5], 'top'),
 ]);
-});
diff --git a/theme_paptic/static/src/scss/primary_variables.scss b/theme_paptic/static/src/scss/primary_variables.scss
index a65ad09d0..493420a06 100644
--- a/theme_paptic/static/src/scss/primary_variables.scss
+++ b/theme_paptic/static/src/scss/primary_variables.scss
@@ -2,12 +2,12 @@
 // Fonts
 //------------------------------------------------------------------------------
 
-$o-theme-h1-font-size-multiplier: (48.83 / 16);
-$o-theme-h2-font-size-multiplier: (39.06 / 16);
-$o-theme-h3-font-size-multiplier: (31.25 / 16);
-$o-theme-h4-font-size-multiplier: (25.00 / 16);
-$o-theme-h5-font-size-multiplier: (20.00 / 16);
-$o-theme-h6-font-size-multiplier: 1.1;
+$o-theme-h1-font-size-multiplier: (48 / 14);
+$o-theme-h2-font-size-multiplier: (38 / 14);
+$o-theme-h3-font-size-multiplier: (28 / 14);
+$o-theme-h4-font-size-multiplier: (24 / 14);
+$o-theme-h5-font-size-multiplier: (21 / 14);
+$o-theme-h6-font-size-multiplier: (18 / 14);
 
 $o-theme-font-configs: (
     'Inter': (
@@ -87,4 +87,9 @@ $o-color-palettes-compatibility-indexes: (
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blocks/04', (3: 1));
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/03', (3: 1));
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/01', (2: 3, 5: 3));
-$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/02_001', (4: 1, 5: rgba(0, 0, 0, 0)));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/02_001', (4: 1, 5: 3));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/07_002', (3: 1, 4: 3, 5: 1));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Floats/03', (1: 4, 2: 2, 3: 3, 5: 2));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Airy/12_001', (1: 5, 3: 1));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Bold/08', (1: 3));
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Blocks/01_001', (1: 4, 3: 2, 5: 4));
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index fd2ec323b..7fe2a51ce 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -10,13 +10,13 @@
     </xpath>
 </template>
 
-
 <!-- Snippets -->
 
 <!-- ==== Cover ===== -->
 <template id="s_cover" inherit_id="website.s_cover" name="Paptic s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 pt192" remove="pt96 pb96 bg-black-50 s_parallax_is_fixed s_parallax" separator=" "/>
+        <attribute name="class" add="pb0 pt192 o_cc o_cc5" remove="pt96 pb96 bg-black-50 s_parallax_is_fixed s_parallax" separator=" "/>
+        <attribute name="data-scroll-background-ratio">0</attribute>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["x"]}</attribute>
     </xpath>
 
@@ -35,16 +35,15 @@
     <!-- Remove color filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 
-
     <xpath expr="//h1" position="replace">
-        <h1 class="text-o-color-4">Grow your Business.<br/>Optimize your time.</h1>
+        <h1>Grow your Business.<br/>Optimize your time.</h1>
     </xpath>
     <xpath expr="//p" position="replace">
-        <p class="text-o-color-3">&#160;</p>
+        <p>&#160;</p>
     </xpath>
 
     <xpath expr="//p[2]" position="replace">
-        <p class="text-o-color-3">
+        <p>
             <a href="#" class="btn btn-lg btn-primary mb-2">START NOW</a>&#160;&#160;&#160;&#160;
             <a t-att-href="cta_btn_href" class="btn btn-lg btn-secondary mb-2"><t t-esc="cta_btn_text and cta_btn_text.upper()">SCHEDULE A DEMO</t></a>
         </p>
@@ -55,7 +54,7 @@
         <div class="row">
             <div class="o_colored_level col-lg-6"/>
             <div class="o_colored_level col-lg-6">
-                <img src="/web_editor/shape/theme_paptic/s_cover_person.svg?c1=%236772E5" style="width: 100%;" alt="Man waiting at the airport"/>
+                <img src="/web_editor/shape/theme_paptic/s_cover_person.svg?c1=o-color-1" style="width: 100%;" alt="Man waiting at the airport"/>
             </div>
         </div>
     </xpath>
@@ -69,7 +68,7 @@
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Paptic s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt96 pb16 o_cc o_cc3" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt160 pb16 o_cc o_cc3" remove="pt32 pb32" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["y"]}</attribute>
     </xpath>
 
@@ -78,15 +77,17 @@
     </xpath>
 
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_image_text.svg?c1=%236772E5</attribute>
+        <attribute name="src">/web_editor/shape/theme_paptic/s_image_text.svg?c1=o-color-1</attribute>
     </xpath>
 
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
 
-    <xpath expr="//h2" position="replace">
-        <h2>Help you grow</h2>
+    <xpath expr="//h2" position="replace" mode="inner">
+        <font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">Help you grow</font>
+    </xpath>
+    <xpath expr="//h2" position="after">
         <p>&#160;</p>
     </xpath>
 
@@ -104,7 +105,7 @@
     </xpath>
 
     <xpath expr="//a[hasclass('btn')]" position="replace">
-        <a href="#" class="btn btn-link mb-2">DISCOVER MORE <i class="fa fa-chevron-right"/></a>
+        <a href="#" class="btn btn-link mb-2">DISCOVER MORE &#160;<i class="fa fa-chevron-right"/></a>
     </xpath>
 
     <xpath expr="//img" position="attributes">
@@ -117,22 +118,23 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt80 pb88 o_cc o_cc3" remove="pt32 pb32" separator=" "/>
     </xpath>
-
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_text_image.svg?c1=%236772E5</attribute>
+        <attribute name="src">/web_editor/shape/theme_paptic/s_text_image.svg?c1=o-color-1</attribute>
     </xpath>
-
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="offset-lg-1" separator=" "/>
     </xpath>
+    <xpath expr="//h2" position="replace" mode="inner">
+        <font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">A Section Subtitle</font>
+    </xpath>
 </template>
 
 <!-- ==== Showcase ===== -->
 <template id="s_showcase" inherit_id="website.s_showcase" name="Paptic s_showcase">
-     <xpath expr="//i[hasclass('text-secondary')]" position="attributes">
+    <xpath expr="//i[hasclass('text-secondary')]" position="attributes">
         <attribute name="class" remove="text-secondary" separator=" "/>
     </xpath>
     <xpath expr="//i[hasclass('text-secondary')]" position="attributes">
@@ -151,13 +153,17 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt96 pb80" remove="pt40 pb40" separator=" "/>
     </xpath>
-     <xpath expr="//h1" position="replace">
-        <h1 style="text-align: center">Unique experiences.</h1>
+     <xpath expr="//h1" position="replace" mode="inner">
+        Unique experiences.
     </xpath>
 </template>
 
 <!-- ======== QUOTES ======== -->
  <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel" name="Paptic s_quotes_carousel">
+    <!-- Remove preset color -->
+    <xpath expr="//section/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc2" separator=" "/>
+    </xpath>
     <!-- Assign slide3 as 'active' and move it in first position -->
     <xpath expr="//div[hasclass('carousel-inner')]/div" position="attributes">
         <attribute name="class" remove="active" separator=" "/>
@@ -202,36 +208,63 @@
 <!-- ==== Three Columns ===== -->
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Paptic s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pt32 pb32 o_cc o_cc2" add="pt120 pb120" separator=" "/>
+        <attribute name="class" remove="pt32 pb32 o_cc2" add="pt120 pb120 o_cc3 o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
         <div class="o_we_shape o_web_editor_Origins_02_001"></div>
     </xpath>
     <xpath expr="//div[hasclass('row')]" position="before">
-        <h3 style="text-align: center;">SUCCESS STORIES</h3>
+        <h3 style="text-align: center;"><font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">SUCCESS STORIES</font></h3>
         <p>&#160;</p>
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div/div" position="replace">
-        <img class="d-block img-fluid figure-img rounded shadow-lg img-thumbnail padding-medium" src="/web/image/website.s_three_columns_default_image_1" alt="s_three_columns_1"/>
-        &#160;
-        <h5 class="text-o-color-3">HeyNosf Inc. Digital Transformation</h5>
-        &#160;
-        <p>HeyNosf Inc. is a communication agency that was founded in 2006, by Jean-Louis Dewinter. He always had a strong interest in languages and decided to create a company reflecting his own interests.</p>
+
+    <!-- Card #1 -->
+    <xpath expr="//div[hasclass('card')]" position="attributes">
+        <attribute name="style" add="border-width: 0px !important; box-shadow: 0px 8px 12px 0px rgba(0, 0, 0, 0.05) !important;" separator=";"/>
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[2]/div" position="replace">
-        <img class="d-block img-fluid figure-img rounded shadow-lg img-thumbnail padding-medium" src="/web/image/website.s_three_columns_default_image_2" alt="s_three_columns_2"/>
-        &#160;
-        <h5 class="text-o-color-3">Fallanzy Integration Explained</h5>
-        &#160;
-        <p>Fallanzy has been active in the workspace design and ergonomics consulting business for over 20 years. Discover how we answered to the challenges of this company.</p>
+    <!-- Card #1 - Title & text -->
+    <xpath expr="//h3[hasclass('card-title')]" position="replace" mode="inner">
+        HeyNosf Inc. Digital Transformation
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[3]/div" position="replace">
-        <img class="d-block img-fluid figure-img rounded shadow-lg img-thumbnail padding-medium" src="/web/image/website.s_three_columns_default_image_3" alt="s_three_columns_3"/>
-        &#160;
-        <h5 class="text-o-color-3">Hotels Improvement Study</h5>
-        &#160;
-        <p>Our solution is suitable for Hotels as well. We help management to optimize their time and employee to be more efficient and more productive. Discover our study.</p>
+    <xpath expr="//p[hasclass('card-text')]" position="replace" mode="inner">
+        HeyNosf Inc. is a communication agency that was founded in 2006, by Jean-Louis Dewinter. He always had a strong interest in languages and decided to create a company reflecting his own interests.
+    </xpath>
+    <!-- Card #1 - Image -->
+    <xpath expr="//img[hasclass('card-img-top')]" position="attributes">
+        <attribute name="style">padding: 8px !important;</attribute>
+    </xpath>
+
+    <!-- Card #2 -->
+    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
+        <attribute name="style" add="border-width: 0px !important; box-shadow: 0px 8px 12px 0px rgba(0, 0, 0, 0.05) !important;" separator=";"/>
+    </xpath>
+    <!-- Card #2 - Title & text -->
+    <xpath expr="(//h3[hasclass('card-title')])[2]" position="replace" mode="inner">
+        Fallanzy Integration Explained
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[2]" position="replace" mode="inner">
+        Fallanzy has been active in the workspace design and ergonomics consulting business for over 20 years. Discover how we answered to the challenges of this company.
+    </xpath>
+    <!-- Card #2 - Image -->
+    <xpath expr="(//img[hasclass('card-img-top')])[2]" position="attributes">
+        <attribute name="style">padding: 8px !important;</attribute>
+    </xpath>
+
+    <!-- Card #3 -->
+    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
+        <attribute name="style" add="border-width: 0px !important; box-shadow: 0px 8px 12px 0px rgba(0, 0, 0, 0.05) !important;" separator=";"/>
+    </xpath>
+    <!-- Card #3 - Title & text -->
+    <xpath expr="(//h3[hasclass('card-title')])[3]" position="replace" mode="inner">
+        Hotels Improvement Study
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[3]" position="replace" mode="inner">
+        Our solution is suitable for Hotels as well. We help management to optimize their time and employee to be more efficient and more productive. Discover our study.
+    </xpath>
+    <!-- Card #3 - Image -->
+    <xpath expr="(//img[hasclass('card-img-top')])[3]" position="attributes">
+        <attribute name="style">padding: 8px !important;</attribute>
     </xpath>
 </template>
 
@@ -239,16 +272,165 @@
 <template id="s_picture" inherit_id="website.s_picture" name="Paptic s_picture">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 o_cc1" remove="o_cc2 pt48" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/08","flip":[]}</attribute>
     </xpath>
-
-    <xpath expr="//section/div" position="before">
-        <div class="o_we_shape o_web_editor_Bold_08"/>
-    </xpath>
-
     <xpath expr="//img" position="attributes">
-        <attribute name="src">/web_editor/shape/theme_paptic/s_picture.svg?c1=%236772E5</attribute>
-        <attribute name="class" add="" remove="img-thumbnail padding-large" separator=" "/>
+        <attribute name="src">/web_editor/shape/theme_paptic/s_picture.svg?c1=o-color-1</attribute>
+        <attribute name="class" add="img-fluid" remove="img-thumbnail" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Comparisons ===== -->
+<template id="s_comparisons" inherit_id="website.s_comparisons" name="Paptic s_comparisons">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt0 pb80" remove="pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/03","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_03"/>
+    </xpath>
+    <!-- Left card -->
+    <xpath expr="//div[hasclass('card')]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-200" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Call to action ===== -->
+<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Paptic s_call_to_action">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt120 pb120 o_cc1" remove="pt48 pb24 o_cc3" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/12_001","flip":["y"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Airy_12_001 o_we_flip_y"/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        <b>50,000+ companies</b> run Paptic to grow their businesses.
+    </xpath>
+</template>
+
+<!-- ==== Banner ===== -->
+<template id="s_banner" inherit_id="website.s_banner" name="Paptic s_banner">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
+    </xpath>
+    <!-- Jumbotron -->
+    <xpath expr="//div[hasclass('jumbotron')]" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//a[hasclass('btn')]" position="attributes">
+        <attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Numbers ===== -->
+<template id="s_numbers" inherit_id="website.s_numbers" name="Paptic s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80 pb80 o_cc4" remove="pt24 pb24 o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/01_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_01_001"/>
+    </xpath>
+</template>
+
+<!-- ==== Big Boxes ===== -->
+<template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Paptic s_color_blocks_2">
+    <!-- Left column -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/03","flip":["y"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')]/i" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_03 o_we_flip_y"/>
+    </xpath>
+    <!-- Right column -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/03","flip":["x","y"]}</attribute>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')][2]/i" position="before">
+        <div class="o_we_shape o_web_editor_Blocks_03 o_we_flip_x o_we_flip_y"/>
+    </xpath>
+</template>
+
+<!-- ==== Features ===== -->
+<template id="s_features" inherit_id="website.s_features" name="Paptic s_features">
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid" remove="container" separator=" "/>
+    </xpath>
+    <!-- Column #1 -->
+    <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
+    </xpath>
+    <!-- Column #2 -->
+    <xpath expr="//div[hasclass('col-lg-4')][2]" position="attributes">
+        <attribute name="class" add="o_cc o_cc3" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-4')][2]/i" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-5" separator=" "/>
+    </xpath>
+    <!-- Column #3 -->
+    <xpath expr="//div[hasclass('col-lg-4')][3]" position="attributes">
+        <attribute name="class" add="o_cc o_cc2" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-4')][3]/i" position="attributes">
+        <attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Media List ===== -->
+<template id="s_media_list" inherit_id="website.s_media_list" name="Paptic s_media_list">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/07_002","flip":["x"]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Origins_07_002 o_we_flip_x"/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="o_container_small" remove="container" separator=" "/>
+    </xpath>
+    <!-- Item #1 -->
+    <xpath expr="//div[hasclass('s_media_list_item')]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Item #2 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][2]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <!-- Item #3 -->
+    <xpath expr="//div[hasclass('s_media_list_item')][3]/div" position="attributes">
+        <attribute name="class" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Features Grid ===== -->
+<template id="s_features_grid" inherit_id="website.s_features_grid" name="Paptic s_features_grid">
+    <!-- Icon #4 -->
+    <xpath expr="(//i)[4]" position="attributes">
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+    </xpath>
+    <!-- Icon #5 -->
+    <xpath expr="(//i)[5]" position="attributes">
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+    </xpath>
+    <!-- Icon #6 -->
+    <xpath expr="(//i)[6]" position="attributes">
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+    </xpath>
+</template>
+
+<!-- ==== Pricelist ===== -->
+<template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Paptic s_product_catalog">
+    <!-- Filter -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-white-75"/>
     </xpath>
 </template>