diff --git a/theme_real_estate/__manifest__.py b/theme_real_estate/__manifest__.py
index a754925bc..8e1388a4c 100644
--- a/theme_real_estate/__manifest__.py
+++ b/theme_real_estate/__manifest__.py
@@ -14,13 +14,30 @@
         'views/snippets/s_banner.xml',
         'views/snippets/s_picture.xml',
         'views/snippets/s_image_text.xml',
+        'views/snippets/s_text_image.xml',
         'views/snippets/s_three_columns.xml',
         'views/snippets/s_quotes_carousel.xml',
+        'views/snippets/s_text_block.xml',
+        'views/snippets/s_masonry_block.xml',
+        'views/snippets/s_numbers.xml',
+        'views/snippets/s_title.xml',
+        'views/snippets/s_image_gallery.xml',
+        'views/snippets/s_call_to_action.xml',
     ],
     'images': [
         'static/description/real_estate_description.png',
         'static/description/real_estate_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_banner_default_image': '/theme_real_estate/static/src/img/snippets/s_banner.jpg',
+        'website.s_text_image_default_image': '/theme_real_estate/static/src/img/snippets/s_text_image.jpg',
+        'website.s_image_text_default_image': '/theme_real_estate/static/src/img/snippets/s_image_text.jpg',
+        'website.s_three_columns_default_image_1': '/theme_real_estate/static/src/img/snippets/library_image_11.jpg',
+        'website.s_three_columns_default_image_2': '/theme_real_estate/static/src/img/snippets/library_image_13.jpg',
+        'website.s_three_columns_default_image_3': '/theme_real_estate/static/src/img/snippets/library_image_07.jpg',
+        'website.s_masonry_block_default_image_1': '/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg',
+        'website.s_quotes_carousel_demo_image_1': '/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg', 
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-real-estate.odoo.com',
     'assets': {
diff --git a/theme_real_estate/data/ir_asset.xml b/theme_real_estate/data/ir_asset.xml
index 44022788d..eaa1ec7cf 100644
--- a/theme_real_estate/data/ir_asset.xml
+++ b/theme_real_estate/data/ir_asset.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_real_estate.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_real_estate.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_real_estate/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_real_estate.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_real_estate.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_real_estate/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_real_estate.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_real_estate.compatibility_saas_11_4_variables_scss</field>
-            <field name="name">Compatibility saas 11 4 variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">/theme_real_estate/static/src/scss/compatibility-saas-11.4-variables.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_real_estate.compatibility_saas_11_4_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_real_estate.compatibility_saas_11_4_variables_scss</field>
+    <field name="name">Compatibility saas 11 4 variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">/theme_real_estate/static/src/scss/compatibility-saas-11.4-variables.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_real_estate/models/theme_real_estate.py b/theme_real_estate/models/theme_real_estate.py
index 0201b673e..e859e3934 100644
--- a/theme_real_estate/models/theme_real_estate.py
+++ b/theme_real_estate/models/theme_real_estate.py
@@ -8,12 +8,5 @@ class ThemeRealEstate(models.AbstractModel):
         # For compatibility
         # self.enable_asset('theme_common.compatibility_saas_10_2')
 
-        self.disable_view('website.template_header_default')
-        self.enable_view('website.template_header_hamburger')
-        self.enable_header_off_canvas()
-
-        self.disable_view('website.footer_custom')
-        self.enable_view('website.template_footer_descriptive')
-
         self.enable_asset('website.ripple_effect_scss')
         self.enable_asset('website.ripple_effect_js')
diff --git a/theme_real_estate/static/description/real_estate_description.png b/theme_real_estate/static/description/real_estate_description.png
index b7bc4b470..3ca6e9485 100644
Binary files a/theme_real_estate/static/description/real_estate_description.png and b/theme_real_estate/static/description/real_estate_description.png differ
diff --git a/theme_real_estate/static/description/real_estate_screenshot.jpg b/theme_real_estate/static/description/real_estate_screenshot.jpg
index c42f72fd6..0e87eef3d 100644
Binary files a/theme_real_estate/static/description/real_estate_screenshot.jpg and b/theme_real_estate/static/description/real_estate_screenshot.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/library_image_07.jpg b/theme_real_estate/static/src/img/snippets/library_image_07.jpg
index 2d1e109ce..5b665c242 100644
Binary files a/theme_real_estate/static/src/img/snippets/library_image_07.jpg and b/theme_real_estate/static/src/img/snippets/library_image_07.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/library_image_11.jpg b/theme_real_estate/static/src/img/snippets/library_image_11.jpg
index 202261dab..7ce352194 100644
Binary files a/theme_real_estate/static/src/img/snippets/library_image_11.jpg and b/theme_real_estate/static/src/img/snippets/library_image_11.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/library_image_13.jpg b/theme_real_estate/static/src/img/snippets/library_image_13.jpg
index 5a4d4056f..1f86b3953 100644
Binary files a/theme_real_estate/static/src/img/snippets/library_image_13.jpg and b/theme_real_estate/static/src/img/snippets/library_image_13.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_banner.jpg b/theme_real_estate/static/src/img/snippets/s_banner.jpg
index c4234b0a5..d00ca7d01 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_banner.jpg and b/theme_real_estate/static/src/img/snippets/s_banner.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_cover.jpg b/theme_real_estate/static/src/img/snippets/s_cover.jpg
index 6b5a37ac3..47cc84ada 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_cover.jpg and b/theme_real_estate/static/src/img/snippets/s_cover.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_image_text.jpg b/theme_real_estate/static/src/img/snippets/s_image_text.jpg
index a7e6fc53b..fd57d28af 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_image_text.jpg and b/theme_real_estate/static/src/img/snippets/s_image_text.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_01.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_01.jpg
new file mode 100644
index 000000000..7015be754
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_01.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_02.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_02.jpg
new file mode 100644
index 000000000..9096a6e77
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_02.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_03.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_03.jpg
new file mode 100644
index 000000000..0cc0291ad
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_03.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_04.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_04.jpg
new file mode 100644
index 000000000..7d8b01f2d
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_04.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_05.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_05.jpg
new file mode 100644
index 000000000..7c4068cb2
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_05.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_06.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_06.jpg
new file mode 100644
index 000000000..f49b94088
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_06.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_images_wall_07.jpg b/theme_real_estate/static/src/img/snippets/s_images_wall_07.jpg
new file mode 100644
index 000000000..d3778fc7d
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_images_wall_07.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg b/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg
index 129e590ec..43b5cb11a 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg and b/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_media_list_1.jpg b/theme_real_estate/static/src/img/snippets/s_media_list_1.jpg
index 8c8fbf131..838940ef5 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_media_list_1.jpg and b/theme_real_estate/static/src/img/snippets/s_media_list_1.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_media_list_2.jpg b/theme_real_estate/static/src/img/snippets/s_media_list_2.jpg
index dad469cfb..c9785bda6 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_media_list_2.jpg and b/theme_real_estate/static/src/img/snippets/s_media_list_2.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_media_list_3.jpg b/theme_real_estate/static/src/img/snippets/s_media_list_3.jpg
index 134d8bf02..632ed07b1 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_media_list_3.jpg and b/theme_real_estate/static/src/img/snippets/s_media_list_3.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_parallax.jpg b/theme_real_estate/static/src/img/snippets/s_parallax.jpg
index 57702bc64..499b039c3 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_parallax.jpg and b/theme_real_estate/static/src/img/snippets/s_parallax.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_1.jpg b/theme_real_estate/static/src/img/snippets/s_product_1.jpg
index fb34bf4ce..c142855c3 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_1.jpg and b/theme_real_estate/static/src/img/snippets/s_product_1.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_2.jpg b/theme_real_estate/static/src/img/snippets/s_product_2.jpg
index 1c3e2f8a0..b8ba2f461 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_2.jpg and b/theme_real_estate/static/src/img/snippets/s_product_2.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_3.jpg b/theme_real_estate/static/src/img/snippets/s_product_3.jpg
index 9fc5640be..3bc6effbc 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_3.jpg and b/theme_real_estate/static/src/img/snippets/s_product_3.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_4.jpg b/theme_real_estate/static/src/img/snippets/s_product_4.jpg
index 7d1b298df..e1792870f 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_4.jpg and b/theme_real_estate/static/src/img/snippets/s_product_4.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_5.jpg b/theme_real_estate/static/src/img/snippets/s_product_5.jpg
index 4e37abf16..511dac141 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_5.jpg and b/theme_real_estate/static/src/img/snippets/s_product_5.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_product_6.jpg b/theme_real_estate/static/src/img/snippets/s_product_6.jpg
index d0d4a7cee..338dd1c67 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_product_6.jpg and b/theme_real_estate/static/src/img/snippets/s_product_6.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg
index bdaf6e762..4951d37d3 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg and b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg
index 757183d7d..e3aca1319 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg and b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_quotes_carousel_3.jpg b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_3.jpg
new file mode 100644
index 000000000..198dc09d4
Binary files /dev/null and b/theme_real_estate/static/src/img/snippets/s_quotes_carousel_3.jpg differ
diff --git a/theme_real_estate/static/src/img/snippets/s_text_image.jpg b/theme_real_estate/static/src/img/snippets/s_text_image.jpg
index 96c7441f1..ab77a2366 100644
Binary files a/theme_real_estate/static/src/img/snippets/s_text_image.jpg and b/theme_real_estate/static/src/img/snippets/s_text_image.jpg differ
diff --git a/theme_real_estate/static/src/js/tour.js b/theme_real_estate/static/src/js/tour.js
index 33cd5c37a..b08a8ad8f 100644
--- a/theme_real_estate/static/src/js/tour.js
+++ b/theme_real_estate/static/src/js/tour.js
@@ -10,17 +10,37 @@ const snippets = [
         name: 'Banner',
     },
     {
-        id: 's_picture',
-        name: 'Picture',
+        id: 's_text_block',
+        name: 'Text',
+    },
+    {
+        id: 's_text_image',
+        name: 'Text - Image',
     },
     {
         id: 's_image_text',
         name: 'Image - Text',
     },
+    {
+        id: 's_title',
+        name: 'Title',
+    },
     {
         id: 's_three_columns',
         name: 'Columns',
     },
+    {
+        id: 's_title:last-child',
+        name: 'Title',
+    },
+    {
+        id: 's_masonry_block',
+        name: 'Masonry',
+    },
+    {
+        id: 's_numbers',
+        name: 'Numbers',
+    },
     {
         id: 's_quotes_carousel',
         name: 'Quotes',
@@ -34,10 +54,15 @@ wTourUtils.registerThemeHomepageTour("real_estate_tour", [
     wTourUtils.dragNDrop(snippets[1]),
     wTourUtils.dragNDrop(snippets[2]),
     wTourUtils.dragNDrop(snippets[3]),
-    wTourUtils.clickOnSnippet(snippets[3]),
+    wTourUtils.dragNDrop(snippets[4]),
+    wTourUtils.clickOnSnippet(snippets[4]),
     wTourUtils.changeBackgroundColor(),
     wTourUtils.selectColorPalette(),
     wTourUtils.goBackToBlocks(),
-    wTourUtils.dragNDrop(snippets[4]),
+    wTourUtils.dragNDrop(snippets[5]),
+    wTourUtils.dragNDrop(snippets[6]),
+    wTourUtils.dragNDrop(snippets[7]),
+    wTourUtils.dragNDrop(snippets[8]),
+    wTourUtils.dragNDrop(snippets[9]),
 ]);
 });
diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss
index a3bf35052..b222adb1a 100644
--- a/theme_real_estate/static/src/scss/primary_variables.scss
+++ b/theme_real_estate/static/src/scss/primary_variables.scss
@@ -68,23 +68,36 @@ $o-theme-font-configs: (
     ),
 );
 
+$o-theme-h1-font-size-multiplier: (62 / 16);
+$o-theme-h2-font-size-multiplier: (36 / 16);
+$o-theme-h3-font-size-multiplier: (24 / 16);
+$o-theme-h4-font-size-multiplier: (20 / 16);
+$o-theme-h5-font-size-multiplier: (18 / 16);
+$o-theme-h6-font-size-multiplier: (16 / 16);
+
 //------------------------------------------------------------------------------
 // Website customizations
 //------------------------------------------------------------------------------
 
+
+$btn-font-weight: 500;
+
 $o-website-values-palettes: (
     (
-        'color-palettes-name': 'real-estate-1',
-        'header-font-size': (18 / 16) * 1rem,
-        'font': 'Nunito',
-        'headings-font': 'Nunito',
-        'navbar-font': 'Nunito',
-        'buttons-font': 'Nunito',
-        'btn-ripple': true,
-        'header-template': 'hamburger',
-        'hamburger-type': 'off-canvas',
-        'hamburger-position': 'left',
-        'footer-template': 'descriptive',
+        'color-palettes-name': 'real-estate-4',
+        // Header
+        'header-template': 'default',
+
+        // Font
+        'font': 'Roboto',
+        'headings-font': 'Roboto',
+        'navbar-font': 'Roboto',
+        'buttons-font': 'Roboto',
+
+        // Buttons
+        'btn-border-radius': 0px,
+        'btn-border-radius-sm': 0px,
+        'btn-border-radius-lg': 0px,
     ),
 );
 
@@ -118,7 +131,7 @@ $o-color-palettes-compatibility-indexes: (
 // Shapes
 //------------------------------------------------------------------------------
 
+$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/18', (1: 3));
+
+/* Keep for compatibility */
 $o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/14', (4: 4));
-$o-bg-shapes: change-shape-colors-mapping('web_editor', 'Origins/14_001', (4: rgba(255, 255, 255, 0), 3: 4));
-$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Origins/14', 'second', (4: 2));
-$o-bg-shapes: add-extra-shape-colors-mapping('web_editor', 'Origins/14_001', 'second', (4: rgba(255, 255, 255, 0), 3: 2));
diff --git a/theme_real_estate/views/images.xml b/theme_real_estate/views/images.xml
index 0b3b94239..9e951243c 100644
--- a/theme_real_estate/views/images.xml
+++ b/theme_real_estate/views/images.xml
@@ -1,172 +1,215 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Not used anymore by the editor: files and records kept for back-compatibility.
-    Check in theme_monglia's primary_variables.scss, theme.scss and theme_common's mixins.scss -->
-    <record id="image_content_02" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_02</field>
-        <field name="name">theme_common.image_content_02</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_02.jpg</field>
-    </record>
-    <record id="image_content_03" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_03</field>
-        <field name="name">theme_common.image_content_03</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_03.jpg</field>
-    </record>
-    <record id="image_content_07" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_07</field>
-        <field name="name">theme_common.image_content_07</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_07.jpg</field>
-    </record>
-    <record id="image_content_09" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_09</field>
-        <field name="name">theme_common.image_content_09</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_09.jpg</field>
-    </record>
-    <record id="image_content_10" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_10</field>
-        <field name="name">theme_common.image_content_10</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_10.jpg</field>
-    </record>
-    <record id="image_content_11" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_11</field>
-        <field name="name">theme_common.image_content_11</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_11.jpg</field>
-    </record>
-    <record id="image_content_12" model="theme.ir.attachment">
-        <field name="key">theme_common.image_content_12</field>
-        <field name="name">theme_common.image_content_12</field>
-        <field name="url">/theme_real_estate/static/src/img/content/content_img_12.jpg</field>
-    </record>
 
-    <!-- SNIPPETS -->
-        <record id="s_banner_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_banner_default_image</field>
-            <field name="name">website.s_banner_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_banner.jpg</field>
-        </record>
-        <record id="s_popup_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_popup_default_image</field>
-            <field name="name">website.s_popup_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_popup.jpg</field>
-        </record>
-        <record id="s_cover_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_cover_default_image</field>
-            <field name="name">website.s_cover_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_cover.jpg</field>
-        </record>
-        <record id="s_text_image_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_text_image_default_image</field>
-            <field name="name">website.s_text_image_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_text_image.jpg</field>
-        </record>
-        <record id="s_image_text_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_image_text_default_image</field>
-            <field name="name">website.s_image_text_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_image_text.jpg</field>
-        </record>
-        <record id="s_picture_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_picture_default_image</field>
-            <field name="name">website.s_picture_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_picture.jpg</field>
-        </record>
-        <record id="library_image_11" model="theme.ir.attachment">
-            <field name="key">website.library_image_11</field>
-            <field name="name">website.library_image_11</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/library_image_11.jpg</field>
-        </record>
-        <record id="library_image_13" model="theme.ir.attachment">
-            <field name="key">website.library_image_13</field>
-            <field name="name">website.library_image_13</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/library_image_13.jpg</field>
-        </record>
-        <record id="library_image_07" model="theme.ir.attachment">
-            <field name="key">website.library_image_07</field>
-            <field name="name">website.library_image_07</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/library_image_07.jpg</field>
-        </record>
-        <record id="s_masonry_block_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_masonry_block_default_image_1</field>
-            <field name="name">website.s_masonry_block_default_image_1</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg</field>
-        </record>
-        <record id="s_carousel_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_carousel_default_image_1</field>
-            <field name="name">website.s_carousel_default_image_1</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_carousel_1.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_real_estate/static/src/img/snippets/s_carousel_2.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_real_estate/static/src/img/snippets/s_carousel_3.jpg</field>
-        </record>
-        <record id="s_media_list_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_media_list_default_image_1</field>
-            <field name="name">website.s_media_list_default_image_1</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_media_list_1.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_real_estate/static/src/img/snippets/s_media_list_2.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_real_estate/static/src/img/snippets/s_media_list_3.jpg</field>
-        </record>
-        <record id="s_parallax_default_image" model="theme.ir.attachment">
-            <field name="key">website.s_parallax_default_image</field>
-            <field name="name">website.s_parallax_default_image</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_parallax.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_1</field>
-            <field name="name">website.s_product_list_default_image_1</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_1.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_2</field>
-            <field name="name">website.s_product_list_default_image_2</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_2.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_3" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_3</field>
-            <field name="name">website.s_product_list_default_image_3</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_3.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_4" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_4</field>
-            <field name="name">website.s_product_list_default_image_4</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_4.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_5" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_5</field>
-            <field name="name">website.s_product_list_default_image_5</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_5.jpg</field>
-        </record>
-        <record id="s_product_list_default_image_6" model="theme.ir.attachment">
-            <field name="key">website.s_product_list_default_image_6</field>
-            <field name="name">website.s_product_list_default_image_6</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_product_6.jpg</field>
-        </record>
-        <record id="s_quotes_carousel_demo_image_1" model="theme.ir.attachment">
-            <field name="key">website.s_quotes_carousel_demo_image_1</field>
-            <field name="name">website.s_quotes_carousel_demo_image_1</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg</field>
-        </record>
-        <record id="s_quotes_carousel_demo_image_2" model="theme.ir.attachment">
-            <field name="key">website.s_quotes_carousel_demo_image_2</field>
-            <field name="name">website.s_quotes_carousel_demo_image_2</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg</field>
-        </record>
-        <record id="s_newsletter_block" model="theme.ir.attachment">
-            <field name="key">website.library_image_17</field>
-            <field name="name">website.library_image_17</field>
-            <field name="url">/theme_real_estate/static/src/img/snippets/s_newsletter.jpg</field>
-        </record>
+<!-- Not used anymore by the editor: files and records kept for back-compatibility.
+Check in theme_monglia's primary_variables.scss, theme.scss and theme_common's mixins.scss -->
+<record id="image_content_02" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_02</field>
+    <field name="name">theme_common.image_content_02</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_02.jpg</field>
+</record>
+<record id="image_content_03" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_03</field>
+    <field name="name">theme_common.image_content_03</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_03.jpg</field>
+</record>
+<record id="image_content_07" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_07</field>
+    <field name="name">theme_common.image_content_07</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_07.jpg</field>
+</record>
+<record id="image_content_09" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_09</field>
+    <field name="name">theme_common.image_content_09</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_09.jpg</field>
+</record>
+<record id="image_content_10" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_10</field>
+    <field name="name">theme_common.image_content_10</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_10.jpg</field>
+</record>
+<record id="image_content_11" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_11</field>
+    <field name="name">theme_common.image_content_11</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_11.jpg</field>
+</record>
+<record id="image_content_12" model="theme.ir.attachment">
+    <field name="key">theme_common.image_content_12</field>
+    <field name="name">theme_common.image_content_12</field>
+    <field name="url">/theme_real_estate/static/src/img/content/content_img_12.jpg</field>
+</record>
+
+<!-- SNIPPETS -->
+<record id="s_banner_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_banner_default_image</field>
+    <field name="name">website.s_banner_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_banner.jpg</field>
+</record>
+<record id="s_popup_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_popup_default_image</field>
+    <field name="name">website.s_popup_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_popup.jpg</field>
+</record>
+<record id="s_cover_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_cover_default_image</field>
+    <field name="name">website.s_cover_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_cover.jpg</field>
+</record>
+<record id="s_text_image_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_text_image_default_image</field>
+    <field name="name">website.s_text_image_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_text_image.jpg</field>
+</record>
+<record id="s_image_text_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_image_text_default_image</field>
+    <field name="name">website.s_image_text_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_image_text.jpg</field>
+</record>
+<record id="s_picture_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_picture_default_image</field>
+    <field name="name">website.s_picture_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_picture.jpg</field>
+</record>
+<record id="library_image_11" model="theme.ir.attachment">
+    <field name="key">website.library_image_11</field>
+    <field name="name">website.library_image_11</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/library_image_11.jpg</field>
+</record>
+<record id="library_image_13" model="theme.ir.attachment">
+    <field name="key">website.library_image_13</field>
+    <field name="name">website.library_image_13</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/library_image_13.jpg</field>
+</record>
+<record id="library_image_07" model="theme.ir.attachment">
+    <field name="key">website.library_image_07</field>
+    <field name="name">website.library_image_07</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/library_image_07.jpg</field>
+</record>
+<!-- Gallery Wall -->
+<record id="library_image_03" model="theme.ir.attachment">
+    <field name="key">website.library_image_03</field>
+    <field name="name">website.library_image_03</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_01.jpg</field>
+</record>
+<record id="library_image_10" model="theme.ir.attachment">
+    <field name="key">website.library_image_10</field>
+    <field name="name">website.library_image_10</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_02.jpg</field>
+</record>
+<record id="library_image_19" model="theme.ir.attachment">
+    <field name="key">website.library_image_19</field>
+    <field name="name">website.library_image_19</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_03.jpg</field>
+</record>
+<record id="library_image_21" model="theme.ir.attachment">
+    <field name="key">website.library_image_21</field>
+    <field name="name">website.library_image_21</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_07.jpg</field>
+</record>
+<record id="library_image_05" model="theme.ir.attachment">
+    <field name="key">website.library_image_05</field>
+    <field name="name">website.library_image_05</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_04.jpg</field>
+</record>
+<record id="library_image_14" model="theme.ir.attachment">
+    <field name="key">website.library_image_14</field>
+    <field name="name">website.library_image_14</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_06.jpg</field>
+</record>
+<record id="library_image_16" model="theme.ir.attachment">
+    <field name="key">website.library_image_16</field>
+    <field name="name">website.library_image_16</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_images_wall_05.jpg</field>
+</record>
+<record id="s_masonry_block_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_masonry_block_default_image_1</field>
+    <field name="name">website.s_masonry_block_default_image_1</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_masonry_block.jpg</field>
+</record>
+<record id="s_carousel_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_carousel_default_image_1</field>
+    <field name="name">website.s_carousel_default_image_1</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_carousel_1.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_real_estate/static/src/img/snippets/s_carousel_2.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_real_estate/static/src/img/snippets/s_carousel_3.jpg</field>
+</record>
+<record id="s_media_list_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_media_list_default_image_1</field>
+    <field name="name">website.s_media_list_default_image_1</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_media_list_1.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_real_estate/static/src/img/snippets/s_media_list_2.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_real_estate/static/src/img/snippets/s_media_list_3.jpg</field>
+</record>
+<record id="s_parallax_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_parallax_default_image</field>
+    <field name="name">website.s_parallax_default_image</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_parallax.jpg</field>
+</record>
+<record id="s_product_list_default_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_1</field>
+    <field name="name">website.s_product_list_default_image_1</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_1.jpg</field>
+</record>
+<record id="s_product_list_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_2</field>
+    <field name="name">website.s_product_list_default_image_2</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_2.jpg</field>
+</record>
+<record id="s_product_list_default_image_3" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_3</field>
+    <field name="name">website.s_product_list_default_image_3</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_3.jpg</field>
+</record>
+<record id="s_product_list_default_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_4</field>
+    <field name="name">website.s_product_list_default_image_4</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_4.jpg</field>
+</record>
+<record id="s_product_list_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_5</field>
+    <field name="name">website.s_product_list_default_image_5</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_5.jpg</field>
+</record>
+<record id="s_product_list_default_image_6" model="theme.ir.attachment">
+    <field name="key">website.s_product_list_default_image_6</field>
+    <field name="name">website.s_product_list_default_image_6</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_product_6.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_0" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_0</field>
+    <field name="name">website.s_quotes_carousel_demo_image_0</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_quotes_carousel_3.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_1" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_1</field>
+    <field name="name">website.s_quotes_carousel_demo_image_1</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_quotes_carousel_1.jpg</field>
+</record>
+<record id="s_quotes_carousel_demo_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_quotes_carousel_demo_image_2</field>
+    <field name="name">website.s_quotes_carousel_demo_image_2</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_quotes_carousel_2.jpg</field>
+</record>
+<record id="s_newsletter_block" model="theme.ir.attachment">
+    <field name="key">website.library_image_17</field>
+    <field name="name">website.library_image_17</field>
+    <field name="url">/theme_real_estate/static/src/img/snippets/s_newsletter.jpg</field>
+</record>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_banner.xml b/theme_real_estate/views/snippets/s_banner.xml
index 447c8a9bb..ec4051f1e 100644
--- a/theme_real_estate/views/snippets/s_banner.xml
+++ b/theme_real_estate/views/snippets/s_banner.xml
@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_banner" inherit_id="website.s_banner">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":[]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//section//*[last()]" position="after">
-            <div class="o_we_shape o_web_editor_Origins_14_001"/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1>
-                <font style="font-size: 48px;">Real Estate Agencies.<br/>
-                Near You.</font>
-            </h1>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p" position="replace">
-            <p class="lead">We are specialist in the sale and rental of residential real estate.</p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="//t[@t-esc='cta_btn_text']" position="replace">
-            <t t-esc="cta_btn_text">Properties</t>
-        </xpath>
-    </template>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc3" remove="pt96 pb96" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
+    </xpath>
+
+    <xpath expr="//span[hasclass('s_parallax_bg')]" position="after">
+        <div class="o_we_bg_filter bg-black-50"></div>
+        <div class="o_we_shape o_web_editor_Origins_18 o_we_flip_x"/>
+    </xpath>
+
+    <!-- Title -->
+    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div" position="attributes">
+        <attribute name="class" add="col-lg-7 h-100 pt160 pb160" remove="col-lg-6 jumbotron rounded o_cc o_cc1 pt32 pb32" separator=" "/>
+    </xpath>
+    <xpath expr="//h1" position="replace" mode="inner">
+        <b>Real Estate Agency.<br/>Near You.</b>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace">
+        <p class="lead">Now you can find more than 5,000+ property choices with our professional agents!<br/></p>
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//t[@t-esc='cta_btn_text']" position="replace" mode="inner">
+        See properties
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_call_to_action.xml b/theme_real_estate/views/snippets/s_call_to_action.xml
new file mode 100644
index 000000000..63b474fc6
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_call_to_action.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <xpath expr="//h3" position="replace" mode="inner">
+        Want To Become A Real Estate Agent?
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        We'll help you to grow your career and growth.
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_image_gallery.xml b/theme_real_estate/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..756bbed5c
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_image_gallery.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt96 pb96" remove="pt24 pb24" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('o_masonry_col')][2]//img" position="replace">
+        <img class="img img-fluid d-block" src="/web/image/website.library_image_21" data-index="4" data-name="Image"/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_image_text.xml b/theme_real_estate/views/snippets/s_image_text.xml
index 041529b10..b077ef0e6 100644
--- a/theme_real_estate/views/snippets/s_image_text.xml
+++ b/theme_real_estate/views/snippets/s_image_text.xml
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_image_text" inherit_id="website.s_image_text">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc o_cc4 pb128" remove="pb32" separator=" "/>
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":[]}</attribute>
-        </xpath>
-        <!-- Shape -->
-        <xpath expr="//div[hasclass('container')]" position="before">
-            <div class="o_we_shape o_web_editor_Origins_14_001 o_second_extra_shape_mapping"/>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="(//div[hasclass('col-lg-6')])[2]" position="replace">
-            <div class="col-lg-6 pt16 pb16">
-                <h2>Bored with your interior?</h2>
-                <p>Our decoration experts are at your disposal to guide you step by step in the design of your interior and will give you the best advice for your interior design.</p>
-                <p>Discover our tailor-made services to embellish the decoration of your home.</p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_image_text" inherit_id="website.s_image_text">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb32 pb32" separator=" "/>
+    </xpath>
+
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Bored with your interior?
+    </xpath>
+
+    <!-- Paragraph -->
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        Our decoration experts are at your disposal to guide you step by step in the design of your interior and will give you the best advice for your interior design.
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+        Discover our tailor-made services to embellish the decoration of your home.
+    </xpath>
+    <xpath expr="//p[3]" position="replace">
+        <p><a href="#" class="btn btn-primary">Explore our services</a></p>
+    </xpath>
+
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_image_text_default_image/web_editor/solid/sld_square_2.svg?c1=o-color-3</attribute>
+        <attribute name="data-shape">web_editor/solid/sld_square_2</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_image_text.svg</attribute>
+        <attribute name="data-shape-colors">o-color-3;;;;</attribute>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_masonry_block.xml b/theme_real_estate/views/snippets/s_masonry_block.xml
new file mode 100644
index 000000000..a08afd05e
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_masonry_block.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_masonry_block" inherit_id="website.s_masonry_block" name="Masonry">
+    <xpath expr="//section/div" position="attributes">
+        <attribute name="class" add="container" remove="container-fluid" />
+    </xpath>
+</template>
+
+<template id="s_masonry_block_default_template" inherit_id="website.s_masonry_block_default_template">
+    <!-- Little block #1 -->
+    <!-- Main div -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" />
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/h3" position="before">
+        <span class="fa fa-star fa-2x mb-4"></span>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/h3" position="replace" mode="inner">
+        Increased Visibility
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')]/p" position="replace" mode="inner">
+        Increase Visitor retention. Customer engagement on a website with virtual tour is 5 times longer compared to a site without it.
+    </xpath>
+
+    <!-- Little block #2 -->
+    <!-- Main div -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc3" />
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]/h3" position="before">
+        <span class="fa fa-tag fa-2x mb-4"></span>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]/h3" position="replace" mode="inner">
+        No fixed fees
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][2]/p" position="replace" mode="inner">
+        At Real Estate Agency we have fixed price fees. This means we only charge when your home sale is confirmed.
+    </xpath>
+
+    <!-- Little block #3 -->
+    <!-- Main div -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc4" />
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]/h3" position="before">
+        <span class="fa fa-camera fa-2x mb-4"></span>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]/h3" position="replace" mode="inner">
+        Pro Photo Shoot
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][3]/p" position="replace" mode="inner">
+        They say an image is worth a thousand words and we know you know how important it is to have the best photography.
+    </xpath>
+
+    <!-- Little block #4 -->
+    <!-- Main div -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" />
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/h3" position="before">
+        <span class="fa fa-check fa-2x mb-4"></span>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/h3" position="replace" mode="inner">
+        Premium Quality
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//div[hasclass('col-lg-6')][4]/p" position="replace" mode="inner">
+        We are committed to delivering high quality services that enhance your brand by allowing visitors to interact virtually.
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_numbers.xml b/theme_real_estate/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..dc0cae522
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_numbers.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_numbers" inherit_id="website.s_numbers">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1 pt32 pb56" remove="o_cc2 pt24 pb24" separator=" "/>
+    </xpath>
+    <!-- Column #01 -->
+    <xpath expr="//div[hasclass('col-lg-3')][1]/h6" position="replace" mode="inner">
+        properties already sold
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-3')][1]/span" position="replace" mode="inner">
+        14,000
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//div[hasclass('col-lg-3')][2]/span" position="replace" mode="inner">
+        97%
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-3')][2]/h6" position="replace" mode="inner">
+        happy customers
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="//div[hasclass('col-lg-3')][3]/span" position="replace" mode="inner">
+        142
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-3')][3]/h6" position="replace" mode="inner">
+        amazing agents
+    </xpath>
+    <!-- Column #04 -->
+    <xpath expr="//div[hasclass('col-lg-3')][4]/span" position="replace" mode="inner">
+        100+
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-3')][4]/h6" position="replace" mode="inner">
+        offices
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_picture.xml b/theme_real_estate/views/snippets/s_picture.xml
index f341d8e9c..9b29f4cbf 100644
--- a/theme_real_estate/views/snippets/s_picture.xml
+++ b/theme_real_estate/views/snippets/s_picture.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_picture" inherit_id="website.s_picture">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2 style="text-align: center;">
-                <font style="font-size: 62px;">Open your horizons</font>
-            </h2>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//p[1]" position="replace">
-            <p class="text-center">We’ve selected properties from all types and all areas.<br/>
-            The house of your dreams is around the corner.</p>
-        </xpath>
-        <!-- Caption -->
-        <xpath expr="//figcaption" position="replace">
-            <figcaption class="figure-caption text-muted py-3">Property on the coasts of the Mediterranean.</figcaption>
-        </xpath>
-    </template>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Open your horizons
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        We’ve selected properties from all types and all areas.<br/>
+        The house of your dreams is around the corner.
+    </xpath>
+    <!-- Caption -->
+    <xpath expr="//figcaption" position="replace">
+        <figcaption class="figure-caption text-muted py-3">Property on the coasts of the Mediterranean.</figcaption>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_quotes_carousel.xml b/theme_real_estate/views/snippets/s_quotes_carousel.xml
index 10ab82d63..e7334a77a 100644
--- a/theme_real_estate/views/snippets/s_quotes_carousel.xml
+++ b/theme_real_estate/views/snippets/s_quotes_carousel.xml
@@ -1,47 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
-        <!-- Shape 1 -->
-        <xpath expr="(//div[hasclass('carousel-item')])[1]" position="attributes">
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
-        </xpath>
-        <xpath expr="(//div[hasclass('carousel-item')])[1]/div" position="before">
-            <div class="o_we_shape o_web_editor_Origins_14_001 o_we_flip_y o_second_extra_shape_mapping"/>
-        </xpath>
-        <!-- Shape 2 -->
-        <xpath expr="(//div[hasclass('carousel-item')])[2]" position="attributes">
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
-        </xpath>
-        <xpath expr="(//div[hasclass('carousel-item')])[2]/div" position="before">
-            <div class="o_we_shape o_web_editor_Origins_14_001 o_we_flip_y o_second_extra_shape_mapping"/>
-        </xpath>
-        <!-- Shape 3 -->
-        <xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
-            <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001","flip":["y"]}</attribute>
-        </xpath>
-        <xpath expr="(//div[hasclass('carousel-item')])[3]/div" position="before">
-            <div class="o_we_shape o_web_editor_Origins_14_001 o_we_flip_y o_second_extra_shape_mapping"/>
-        </xpath>
-        <!-- Quote 1 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace">
-            <p>Amazing team! smiling, always nice to talk with, they always have the best advices for you, adapted to your needs!</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace">
-            <span class="s_blockquote_author"><b>Jane Doe</b> • Customer, bought a house</span>
-        </xpath>
-        <!-- Quote 2 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace">
-            <p>From start to finish, they were extremely professional, friendly, helpful and easy to do business with. Very happy with the experience and the company.</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace">
-            <span class="s_blockquote_author"><b>John Doe</b> • Customer, bought an appartement</span>
-        </xpath>
-        <!-- Quote 3 -->
-        <xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace">
-            <p>Positive energy, great team spirit, hard workers and awesome people! I warmly recommend them!</p>
-        </xpath>
-        <xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace">
-            <span class="s_blockquote_author"><b>Iris Doe</b> • Customer, sold an appartement</span>
-        </xpath>
-    </template>
+
+<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
+    <!-- Quote 1 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
+        Amazing team! smiling, always nice to talk with, they always have the best advices for you, adapted to your needs!
+    </xpath>
+    <xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace" mode="inner">
+        <b>Jane Doe</b> • Customer, bought a house
+    </xpath>
+    <!-- Quote 2 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace" mode="inner">
+        From start to finish, they were extremely professional, friendly, helpful and easy to do business with. Very happy with the experience and the company.
+    </xpath>
+    <xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace" mode="inner">
+        <b>John Doe</b> • Customer, bought an appartement
+    </xpath>
+    <!-- Quote 3 -->
+    <xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace" mode="inner">
+        Positive energy, great team spirit, hard workers and awesome people! I warmly recommend them!
+    </xpath>
+    <xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace" mode="inner">
+        <b>Iris Doe</b> • Customer, sold an appartement
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_text_block.xml b/theme_real_estate/views/snippets/s_text_block.xml
new file mode 100644
index 000000000..0009f57da
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_text_block.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_text_block" inherit_id="website.s_text_block">
+    <!-- Section/span -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc4 pb56 pt56" remove="pt96 pb96" separator=" "/>
+    </xpath>
+    <xpath expr="//p" position="replace" mode="inner">
+        We are <b>Odoo Travel Agency</b>, dedicated to making your vacation dreams come true! Overwhelmed with too many choices on the internet? We offer you answers, support, advice, and itineraries that will amaze you with their <b>thoroughness and thoughtfulness</b>.
+    </xpath>
+    <xpath expr="//p[2]" position="replace" mode="inner">
+            At <b>Odoo Travel Agency</b> our agents are more than a consultant, they are fellow <b>travelers with a passion</b> to help you explore the world. With more than 75 years combined experience you can be sure we are devoted to finding the best solutions for your travel plans.
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_text_image.xml b/theme_real_estate/views/snippets/s_text_image.xml
new file mode 100644
index 000000000..eb272c1c0
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_text_image.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt48 pb0" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Are you thinking of selling?
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p[1]" position="replace" mode="inner">
+        Make an appointment for a free valuation of your property. We visit the property, advise you on a realistic asking price and we explain our way of working. <br/>
+        You can decide in all freedom whether or not you would like to work with us for the sale of your property.
+    </xpath>
+    <!-- Paragraph 2 -->
+    <xpath expr="//p[2]" position="replace" />
+    <!-- Image -->
+    <xpath expr="//img" position="attributes">
+        <attribute name="src">/web_editor/image_shape/website.s_text_image_default_image/web_editor/solid/sld_square_1.svg?c2=o-color-3</attribute>
+        <attribute name="data-shape">web_editor/solid/sld_square_1</attribute>
+        <attribute name="data-original-mimetype">image/jpeg</attribute>
+        <attribute name="data-file-name">s_text_image.svg</attribute>
+        <attribute name="data-shape-colors">;o-color-3;;;</attribute>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_real_estate/views/snippets/s_three_columns.xml b/theme_real_estate/views/snippets/s_three_columns.xml
index 4af477a4e..bd70ba79d 100644
--- a/theme_real_estate/views/snippets/s_three_columns.xml
+++ b/theme_real_estate/views/snippets/s_three_columns.xml
@@ -1,26 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_three_columns" inherit_id="website.s_three_columns">
-        <!-- Column 1 -->
-        <xpath expr="//div[hasclass('card-body')]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">I sell. What should I do?</h3>
-                <p class="card-text">Discover tips and tricks when you sell a property. Whether it's appointments with the notary, fees, etc...</p>
-            </div>
-        </xpath>
-        <!-- Column 2 -->
-        <xpath expr="(//div[hasclass('card-body')])[2]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">What’s the value of my property?</h3>
-                <p class="card-text">Our online estimation tool, 100% free of charge, will guide you through the different steps to have a rigorous evaluation.</p>
-            </div>
-        </xpath>
-        <!-- Column 3 -->
-        <xpath expr="(//div[hasclass('card-body')])[3]" position="replace">
-            <div class="card-body">
-                <h3 class="card-title">Building and renovating</h3>
-                <p class="card-text">Here are some tips to get you started on a new construction or renovation project. Because it can't be improvised. </p>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_three_columns" inherit_id="website.s_three_columns">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3 pt0 pb72" remove="o_cc2 pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Column #1 -->
+    <xpath expr="//h3" position="before">
+        <span class="text-600 font-weight-bold">$295,000</span>
+    </xpath>
+    <xpath expr="//h3" position="replace" mode="inner">
+        House On The Hill
+    </xpath>
+    <xpath expr="//p[hasclass('card-text')]" position="replace" mode="inner">
+        Waste no time in viewing this truly stunning property. The property's surroundings really set it apart, offering idyllic sea views overlooking a park.
+    </xpath>
+    <xpath expr="//p[hasclass('card-text')]" position="after" >
+        <a href="#" class="btn btn-primary mb-0">View details</a>
+    </xpath>
+
+    <!-- Column 2 -->
+    <xpath expr="(//h3)[2]" position="before">
+        <span class="text-600 font-weight-bold">$1,295,000,000</span>
+    </xpath>
+    <xpath expr="(//h3)[2]" position="replace" mode="inner">
+        Moutain View
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[2]" position="replace" mode="inner">
+        The house is surrounded by garden terraces that create unique spaces and an intimate ambience. With no overlooking neighbours, the garden offers real privacy.
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[2]" position="after" >
+        <a href="#" class="btn btn-primary mb-0">View details</a>
+    </xpath>
+
+    <!-- Column 3 -->
+    <xpath expr="(//h3)[3]" position="before">
+        <span class="text-600 font-weight-bold">$455,000</span>
+    </xpath>
+    <xpath expr="(//h3)[3]" position="replace" mode="inner">
+        Paradise Residence
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[3]" position="replace" mode="inner">
+        Elegant, modern sophisticated architecture with an impressive in large scale home designed with the finest imported finishes. Pyrgon, marble and wood floors...
+    </xpath>
+    <xpath expr="(//p[hasclass('card-text')])[3]" position="after" >
+        <a href="#" class="btn btn-primary mb-0">View details</a>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_real_estate/views/snippets/s_title.xml b/theme_real_estate/views/snippets/s_title.xml
new file mode 100644
index 000000000..a20309956
--- /dev/null
+++ b/theme_real_estate/views/snippets/s_title.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_title" inherit_id="website.s_title">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt72" remove="pt40" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>