diff --git a/theme_enark/__manifest__.py b/theme_enark/__manifest__.py
index 85170bf4e..b2cc98ab4 100644
--- a/theme_enark/__manifest__.py
+++ b/theme_enark/__manifest__.py
@@ -13,16 +13,31 @@
         'views/image_library.xml',
 
         'views/snippets/s_banner.xml',
+        'views/snippets/s_cover.xml',
         'views/snippets/s_text_image.xml',
         'views/snippets/s_picture.xml',
         'views/snippets/s_media_list.xml',
         'views/snippets/s_call_to_action.xml',
+        'views/snippets/s_parallax.xml',
+        'views/snippets/s_numbers.xml',
+        'views/snippets/s_image_gallery.xml',
 
         ],
     'images': [
         'static/description/enark_description.jpg',
         'static/description/enark_screenshot.jpg',
     ],
+    'images_preview_theme': {
+        'website.s_banner_default_image': '/theme_enark/static/src/img/snippets/s_banner.jpg',
+        'website.s_picture_default_image': '/theme_enark/static/src/img/snippets/s_picture.jpg',
+        'website.s_text_image_default_image': '/theme_enark/static/src/img/snippets/s_text_image.jpg',
+        'website.library_image_10': '/theme_enark/static/src/img/snippets/library_image_03.jpg',
+        'website.library_image_05': '/theme_enark/static/src/img/snippets/library_image_15.jpg',
+        'website.library_image_16': '/theme_enark/static/src/img/snippets/library_image_14.jpg',
+        'website.library_image_13': '/theme_enark/static/src/img/snippets/library_image_10.jpg',
+        'website.library_image_08': '/theme_enark/static/src/img/snippets/library_image_05.jpg',
+        'website.library_image_02': '/theme_enark/static/src/img/snippets/library_image_16.jpg',
+    },
     'license': 'LGPL-3',
     'live_test_url': 'https://theme-enark.odoo.com',
     'assets': {
diff --git a/theme_enark/data/ir_asset.xml b/theme_enark/data/ir_asset.xml
index df08e6cc8..d893932e3 100644
--- a/theme_enark/data/ir_asset.xml
+++ b/theme_enark/data/ir_asset.xml
@@ -1,53 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="theme_enark.s_big_image_parallax_000_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.s_big_image_parallax_000_scss</field>
-            <field name="name">Big image parallax 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_enark/static/src/old_snippets/s_big_image_parallax/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_enark.s_big_image_parallax_000_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.s_big_image_parallax_000_scss</field>
+    <field name="name">Big image parallax 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_enark/static/src/old_snippets/s_big_image_parallax/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_enark.s_big_image_000_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.s_big_image_000_scss</field>
-            <field name="name">Big image 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_enark/static/src/old_snippets/s_big_image/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_enark.s_big_image_000_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.s_big_image_000_scss</field>
+    <field name="name">Big image 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_enark/static/src/old_snippets/s_big_image/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_enark.s_icon_box_000_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.s_icon_box_000_scss</field>
-            <field name="name">Icon box 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_enark/static/src/old_snippets/s_icon_box/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_enark.s_icon_box_000_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.s_icon_box_000_scss</field>
+    <field name="name">Icon box 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_enark/static/src/old_snippets/s_icon_box/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_enark.s_big_icons_000_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.s_big_icons_000_scss</field>
-            <field name="name">Big icons 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">theme_enark/static/src/old_snippets/s_big_icons/000.scss</field>
-            <field name="active" eval="False"/>
-        </record>
+<record id="theme_enark.s_big_icons_000_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.s_big_icons_000_scss</field>
+    <field name="name">Big icons 000 SCSS</field>
+    <field name="bundle">web.assets_frontend</field>
+    <field name="path">theme_enark/static/src/old_snippets/s_big_icons/000.scss</field>
+    <field name="active" eval="False"/>
+</record>
 
-        <record id="theme_enark.primary_variables_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.primary_variables_scss</field>
-            <field name="name">Primary variables SCSS</field>
-            <field name="bundle">web._assets_primary_variables</field>
-            <field name="path">theme_enark/static/src/scss/primary_variables.scss</field>
-        </record>
+<record id="theme_enark.primary_variables_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.primary_variables_scss</field>
+    <field name="name">Primary variables SCSS</field>
+    <field name="bundle">web._assets_primary_variables</field>
+    <field name="path">theme_enark/static/src/scss/primary_variables.scss</field>
+</record>
 
-        <record id="theme_enark.bootstrap_overridden_scss" model="theme.ir.asset">
-            <field name="key">theme_enark.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_enark/static/src/scss/bootstrap_overridden.scss</field>
-        </record>
+<record id="theme_enark.bootstrap_overridden_scss" model="theme.ir.asset">
+    <field name="key">theme_enark.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_enark/static/src/scss/bootstrap_overridden.scss</field>
+</record>
 
-    </data>
 </odoo>
diff --git a/theme_enark/models/theme_enark.py b/theme_enark/models/theme_enark.py
index 3e0fc8e01..4a91a78f8 100644
--- a/theme_enark/models/theme_enark.py
+++ b/theme_enark/models/theme_enark.py
@@ -5,8 +5,5 @@ class ThemeEnark(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_enark_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
-        self.enable_view('website.template_header_hamburger')
-
         self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
diff --git a/theme_enark/static/description/enark_screenshot.jpg b/theme_enark/static/description/enark_screenshot.jpg
index 81d748f7b..2a14e01af 100644
Binary files a/theme_enark/static/description/enark_screenshot.jpg and b/theme_enark/static/description/enark_screenshot.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_02.jpg b/theme_enark/static/src/img/snippets/library_image_02.jpg
new file mode 100644
index 000000000..8f2335c62
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_02.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_03.jpg b/theme_enark/static/src/img/snippets/library_image_03.jpg
new file mode 100644
index 000000000..42c2f67a6
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_03.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_05.jpg b/theme_enark/static/src/img/snippets/library_image_05.jpg
new file mode 100644
index 000000000..ffb422e30
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_05.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_08.jpg b/theme_enark/static/src/img/snippets/library_image_08.jpg
new file mode 100644
index 000000000..222a03bbc
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_08.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_10.jpg b/theme_enark/static/src/img/snippets/library_image_10.jpg
new file mode 100644
index 000000000..b921b0f37
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_10.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_14.jpg b/theme_enark/static/src/img/snippets/library_image_14.jpg
new file mode 100644
index 000000000..30ecec3cf
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_14.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_15.jpg b/theme_enark/static/src/img/snippets/library_image_15.jpg
new file mode 100644
index 000000000..ca6f9823a
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_15.jpg differ
diff --git a/theme_enark/static/src/img/snippets/library_image_16.jpg b/theme_enark/static/src/img/snippets/library_image_16.jpg
new file mode 100644
index 000000000..dd7d4d14c
Binary files /dev/null and b/theme_enark/static/src/img/snippets/library_image_16.jpg differ
diff --git a/theme_enark/static/src/img/snippets/s_picture.jpg b/theme_enark/static/src/img/snippets/s_picture.jpg
index 38bd22efa..5a1c74da7 100644
Binary files a/theme_enark/static/src/img/snippets/s_picture.jpg and b/theme_enark/static/src/img/snippets/s_picture.jpg differ
diff --git a/theme_enark/static/src/js/tour.js b/theme_enark/static/src/js/tour.js
index 22e198737..a5fdc1924 100644
--- a/theme_enark/static/src/js/tour.js
+++ b/theme_enark/static/src/js/tour.js
@@ -15,13 +15,17 @@ const snippets = [
         id: 's_picture',
         name: 'Picture',
     },
+    {
+        id: 's_numbers',
+        name: 'Numbers',
+    },
     {
         id: 's_text_image',
         name: 'Text - Image',
     },
     {
-        id: 's_media_list',
-        name: 'Media List',
+        id: 's_image_wall',
+        name: 'Images Wall',
     },
     {
         id: 's_call_to_action',
@@ -37,7 +41,6 @@ wTourUtils.registerThemeHomepageTour("enark_tour", [
     wTourUtils.dragNDrop(snippets[2]),
     wTourUtils.dragNDrop(snippets[3]),
     wTourUtils.dragNDrop(snippets[4]),
-    wTourUtils.clickOnSnippet(snippets[4]),
-    wTourUtils.changeOption('ScrollButton', 'we-button-group.o_we_user_value_widget', _t('height')),
+    wTourUtils.dragNDrop(snippets[5]),
 ]);
 });
diff --git a/theme_enark/static/src/scss/primary_variables.scss b/theme_enark/static/src/scss/primary_variables.scss
index d889a3a1a..a9270424a 100644
--- a/theme_enark/static/src/scss/primary_variables.scss
+++ b/theme_enark/static/src/scss/primary_variables.scss
@@ -78,12 +78,12 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes,
 // Fonts
 //------------------------------------------------------------------------------
 
-$o-theme-h1-font-size-multiplier: (54 / 16);
+$o-theme-h1-font-size-multiplier: (62 / 16);
 $o-theme-h2-font-size-multiplier: (48 / 16);
-$o-theme-h3-font-size-multiplier: (44 / 16);
-$o-theme-h4-font-size-multiplier: (31 / 16);
-$o-theme-h5-font-size-multiplier: (27 / 16);
-$o-theme-h6-font-size-multiplier: (20 / 16);
+$o-theme-h3-font-size-multiplier: (32 / 16);
+$o-theme-h4-font-size-multiplier: (24 / 16);
+$o-theme-h5-font-size-multiplier: (20 / 16);
+$o-theme-h6-font-size-multiplier: (18 / 16);
 
 $o-theme-font-configs: (
     'Ubuntu': (
@@ -139,15 +139,14 @@ $o-theme-font-configs: (
 $o-website-values-palettes: (
     (
         'color-palettes-name': 'enark-1',
-        'header-font-size': 1.3rem,
-        'font': 'Raleway',
-        'headings-font': 'Abel',
-        'navbar-font': 'Abel',
-        'buttons-font': 'Abel',
-        'header-template': 'hamburger',
-        'footer-template': 'descriptive',
-        'header-links-style': 'outline',
-        'btn-primary-outline': 'true',
+        'header-font-size':     1rem,
+        'font':                 'Open Sans',
+        'headings-font':        'Bitter',
+        'navbar-font':          'Bitter',
+        'buttons-font':         'Bitter',
+        'footer-template':      'descriptive',
+        'header-links-style':   'outline',
+        'btn-primary-outline':  'true',
     ),
 );
 
diff --git a/theme_enark/views/image_library.xml b/theme_enark/views/image_library.xml
index 7558c908a..32957b80d 100644
--- a/theme_enark/views/image_library.xml
+++ b/theme_enark/views/image_library.xml
@@ -1,139 +1,189 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <!-- Website Builder Custom Images -->
-    <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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/static/src/img/snippets/s_parallax.jpg</field>
-    </record>
-    <record id="s_product_catalog_default_image" model="theme.ir.attachment">
-        <field name="key">website.s_product_catalog_default_image</field>
-        <field name="name">website.s_product_catalog_default_image</field>
-        <field name="url">/theme_enark/static/src/img/snippets/s_product_catalog.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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/static/src/img/snippets/s_newsletter.jpg</field>
-    </record>
+
+<!-- Website Builder Custom Images -->
+<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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/static/src/img/snippets/library_image_15.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_enark/static/src/img/snippets/library_image_07.jpg</field>
+</record>
+<!-- Image 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_enark/static/src/img/snippets/library_image_03.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_enark/static/src/img/snippets/library_image_10.jpg</field>
+</record>
+<record id="library_image_15" model="theme.ir.attachment">
+    <field name="key">website.library_image_15</field>
+    <field name="name">website.library_image_15</field>
+    <field name="url">/theme_enark/static/src/img/snippets/library_image_15.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_enark/static/src/img/snippets/library_image_05.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_enark/static/src/img/snippets/library_image_14.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_enark/static/src/img/snippets/library_image_16.jpg</field>
+</record>
+<!-- Image Slideshow -->
+<record id="library_image_08" model="theme.ir.attachment">
+    <field name="key">website.library_image_08</field>
+    <field name="name">website.library_image_08</field>
+    <field name="url">/theme_enark/static/src/img/snippets/library_image_08.jpg</field>
+</record>
+<record id="library_image_02" model="theme.ir.attachment">
+    <field name="key">website.library_image_02</field>
+    <field name="name">website.library_image_02</field>
+    <field name="url">/theme_enark/static/src/img/snippets/library_image_02.jpg</field>
+</record>
+<!-- Masonry Block -->
+<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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/static/src/img/snippets/s_parallax.jpg</field>
+</record>
+<record id="s_product_catalog_default_image" model="theme.ir.attachment">
+    <field name="key">website.s_product_catalog_default_image</field>
+    <field name="name">website.s_product_catalog_default_image</field>
+    <field name="url">/theme_enark/static/src/img/snippets/s_product_catalog.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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/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_enark/static/src/img/snippets/s_newsletter.jpg</field>
+</record>
+<record id="s_three_columns_default_image_2" model="theme.ir.attachment">
+    <field name="key">website.s_three_columns_default_image_2</field>
+    <field name="name">website.s_three_columns_default_image_2</field>
+    <field name="url">/theme_enark/static/src/img/snippets/library_image_13.jpg</field>
+</record>
+
 </odoo>
diff --git a/theme_enark/views/snippets/s_banner.xml b/theme_enark/views/snippets/s_banner.xml
index 788154738..3d5b2a763 100644
--- a/theme_enark/views/snippets/s_banner.xml
+++ b/theme_enark/views/snippets/s_banner.xml
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_banner" inherit_id="website.s_banner">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_full_screen_height" separator=" "/>
-        </xpath>
-        <!-- Banner -->
-        <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-            <attribute name="class" add="offset-lg-6 border p-5" remove="o_cc o_cc1 pt32 pb32" separator=" "/>
-            <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important;" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h1" position="replace">
-            <h1>
-                <font style="font-size: 62px; line-height: 48px;">A Different Viewpoint.</font>
-            </h1>
-        </xpath>
-        <!-- Paragraph -->
-        <xpath expr="//p" position="replace">
-            <p><br/></p>
-            <p class="lead">We are a contemporary architecture firm working mainly in the residential, commercial and office sectors. Our projects are built all over the world, in urban and natural environments.</p>
-        </xpath>
-        <!-- Button -->
-        <xpath expr="//t[@t-esc='cta_btn_text']" position="replace">
-            <t t-esc="cta_btn_text">Discover More</t>
-        </xpath>
-    </template>
+
+<template id="s_banner" inherit_id="website.s_banner">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_full_screen_height" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h1" position="replace" mode="inner">
+        A Different Viewpoint.
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace" mode="inner">
+        We are a contemporary architecture firm working mainly in the residential, commercial and office sectors. Our projects are built all over the world, in urban and natural environments.
+    </xpath>
+    <!-- Button -->
+    <xpath expr="//t[@t-esc='cta_btn_text']" position="replace" mode="inner">
+        Discover More
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_enark/views/snippets/s_call_to_action.xml b/theme_enark/views/snippets/s_call_to_action.xml
index cbd0ba553..90568d63b 100644
--- a/theme_enark/views/snippets/s_call_to_action.xml
+++ b/theme_enark/views/snippets/s_call_to_action.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_call_to_action" inherit_id="website.s_call_to_action">
-        <!-- Paragraph -->
-        <xpath expr="//h3" position="replace">
-            <h3>As <b>436 clients</b> before you, let’s work together</h3>
-        </xpath>
-        <xpath expr="//p" position="replace"/>
-    </template>
+
+<template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <!-- Paragraph -->
+    <xpath expr="//h3" position="replace" mode="inner">
+        As <b>436 clients</b> before you, let’s work together
+    </xpath>
+    <xpath expr="//p" position="replace"/>
+</template>
+
 </odoo>
diff --git a/theme_enark/views/snippets/s_cover.xml b/theme_enark/views/snippets/s_cover.xml
new file mode 100644
index 000000000..be124bb92
--- /dev/null
+++ b/theme_enark/views/snippets/s_cover.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_cover" inherit_id="website.s_cover">
+    <xpath expr="//a" position="attributes">
+        <attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_enark/views/snippets/s_image_gallery.xml b/theme_enark/views/snippets/s_image_gallery.xml
new file mode 100644
index 000000000..3a6abab11
--- /dev/null
+++ b/theme_enark/views/snippets/s_image_gallery.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_image_gallery" inherit_id="website.s_image_gallery">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="s_image_gallery_cover s_image_gallery_indicators_arrows_boxed o_full_screen_height pt0 pb0" remove="pb24 pt24 s_image_gallery_indicators_rounded" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid" remove="container" separator=" "/>
+    </xpath>
+</template>
+
+<template id="s_images_wall" inherit_id="website.s_images_wall">
+    <!-- Container -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc3 pt0 pb0 o_spc-none" remove="pb24 pt24 o_spc-small" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="class" add="container-fluid" remove="container" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_enark/views/snippets/s_media_list.xml b/theme_enark/views/snippets/s_media_list.xml
index 09e4f179d..f2c92661c 100644
--- a/theme_enark/views/snippets/s_media_list.xml
+++ b/theme_enark/views/snippets/s_media_list.xml
@@ -1,50 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_media_list" inherit_id="website.s_media_list">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
-        </xpath>
-        <!-- Row 1 -->
-        <xpath expr="(//div[hasclass('row')])[2]" position="attributes">
-            <attribute name="class" add="border rounded" separator=" "/>
-            <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
-        </xpath>
-        <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
-            <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
-        </xpath>
-        <!-- Row 2 -->
-        <xpath expr="(//div[hasclass('row')])[3]" position="attributes">
-            <attribute name="class" add="border rounded" separator=" "/>
-            <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
-        </xpath>
-        <!-- Row 3 -->
-        <xpath expr="(//div[hasclass('row')])[4]" position="attributes">
-            <attribute name="class" add="o_cc o_cc5 flex-row-reverse border rounded" remove="o_cc o_cc1" separator=" "/>
-            <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
-        </xpath>
-        <!-- Text 3 -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[3]" position="replace">
-            <div class="col-lg-8 s_media_list_body">
-                <h3 class="card-title">Know our clients.</h3>
-                <p class="card-text">We always start by exploring our clients goals, priorities, lifestyle, and tastes.</p>
-                <a href="#">Continue reading <i class="fa fa-long-arrow-right align-middle ml-1"></i></a>
-            </div>
-        </xpath>
-        <!-- Text 2 -->
-        <xpath expr="(//div[hasclass('col-lg-8')])[2]" position="replace">
-            <div class="col-lg-8 s_media_list_body">
-                <h3 class="card-title">Nature friendly</h3>
-                <p class="card-text">Our creations integrate and are in perfect harmony with their environment.</p>
-            </div>
-        </xpath>
-         <!-- Text 1 -->
-        <xpath expr="//div[hasclass('col-lg-8')]" position="replace">
-            <div class="col-lg-6 s_media_list_body">
-                <h3 class="card-title">Construction site</h3>
-                <p class="card-text">Our mastery of construction techniques has been built up over time through our close collaboration with the workers and our sustained presence on the construction sites.</p>
-                <a href="#" class="btn btn-primary mb-2">Discover more</a>
-            </div>
-        </xpath>
-    </template>
+
+<template id="s_media_list" inherit_id="website.s_media_list">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
+    </xpath>
+    <!-- Row 1 - Layout -->
+    <xpath expr="(//div[hasclass('row')])[2]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-4')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-4" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-8')]" position="attributes">
+        <attribute name="class" add="col-lg-6" remove="col-lg-8" separator=" "/>
+    </xpath>
+    <!-- Row #1 - Title & paragraph -->
+    <xpath expr="//div[hasclass('s_media_list_body')]//h3" position="replace" mode="inner">
+        Construction site
+    </xpath>
+    <xpath expr="//div[hasclass('s_media_list_body')]//p" position="replace" mode="inner">
+        Our mastery of construction techniques has been built up over time through our close collaboration with the workers and our sustained presence on the construction sites.
+    </xpath>
+    <!-- Row 2 - Layout -->
+    <xpath expr="(//div[hasclass('row')])[3]" position="attributes">
+        <attribute name="class" add="border rounded" separator=" "/>
+        <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
+    </xpath>
+    <!-- Row #2 - Title & paragraph -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]//h3" position="replace" mode="inner">
+        Nature friendly
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_body')])[2]//p" position="replace" mode="inner">
+        Our creations integrate and are in perfect harmony with their environment.
+    </xpath>
+    <!-- Row 3 - Layout -->
+    <xpath expr="(//div[hasclass('row')])[4]" position="attributes">
+        <attribute name="class" add="o_cc o_cc5 flex-row-reverse border rounded" remove="o_cc o_cc1" separator=" "/>
+        <attribute name="style" add="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;" separator=" "/>
+    </xpath>
+    <!-- Row #3 - Title & paragraph -->
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]//h3" position="replace" mode="inner">
+        Know our clients.
+    </xpath>
+    <xpath expr="(//div[hasclass('s_media_list_body')])[3]//p" position="replace" mode="inner">
+        We always start by exploring our clients goals, priorities, lifestyle, and tastes.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_enark/views/snippets/s_numbers.xml b/theme_enark/views/snippets/s_numbers.xml
new file mode 100644
index 000000000..69822b2ca
--- /dev/null
+++ b/theme_enark/views/snippets/s_numbers.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_numbers" inherit_id="website.s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc1 pb48 pt0" remove="pt24 pb24 o_cc2" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div" position="attributes">
+        <attribute name="class" add="col-lg-4 d-flex align-items-center justify-content-center " remove="col-lg-3" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
+        <attribute name="class" add="col-lg-4 d-flex align-items-center justify-content-center " remove="col-lg-3" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
+        <attribute name="class" add="col-lg-4 d-flex align-items-center justify-content-center " remove="col-lg-3" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[4]" position="replace">
+        <attribute name="class" remove="col-lg-3" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[1]" position="attributes">
+        <attribute name="class" add="m-0 pl-3" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[2]" position="attributes">
+        <attribute name="class" add="m-0 pl-3" separator=" "/>
+    </xpath>
+    <xpath expr="(//h6)[3]" position="attributes">
+        <attribute name="class" add="m-0 pl-3" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_enark/views/snippets/s_parallax.xml b/theme_enark/views/snippets/s_parallax.xml
new file mode 100644
index 000000000..73704726a
--- /dev/null
+++ b/theme_enark/views/snippets/s_parallax.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_parallax" inherit_id="website.s_parallax">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_full_screen_height justify-content-center" remove="o_half_screen_height" separator=" "/>
+    </xpath>
+    <!-- Text -->
+    <xpath expr="//div[hasclass('oe_empty')]" position="after">
+        <div class="container">
+            <div class="row d-flex justify-content-start">
+                <h1><i>“One of the great beauties of architecture is that each time, it is like life starting all over again.”</i></h1>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_enark/views/snippets/s_picture.xml b/theme_enark/views/snippets/s_picture.xml
index 272b7ae0f..27e808f71 100644
--- a/theme_enark/views/snippets/s_picture.xml
+++ b/theme_enark/views/snippets/s_picture.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_picture" inherit_id="website.s_picture">
-        <!-- Section -->
-        <xpath expr="//section" position="attributes">
-            <attribute name="class" add="pt80" remove="pt48 o_cc o_cc2" separator=" "/>
-        </xpath>
-        <!-- Title -->
-        <xpath expr="//h2" position="replace">
-            <h2 style="text-align: center;">
-                <font style="font-size: 62px; line-height: 48px;">Creating places that enhance the human experience.</font>
-            </h2>
-        </xpath>
-        <!-- Paragraphs -->
-        <xpath expr="//p[1]" position="replace">
-            <p class="text-center pt48">We always put people and nature at the center of our projects.</p>
-        </xpath>
-        <!-- Caption -->
-        <xpath expr="//figcaption" position="replace"/>
-    </template>
+
+<template id="s_picture" inherit_id="website.s_picture">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt80" remove="pt48 o_cc o_cc2" separator=" "/>
+    </xpath>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">
+        Creating places that enhance the human experience.
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p[1]" position="replace" />
+    <!-- Caption -->
+    <xpath expr="//figcaption" position="replace" mode="inner">
+        We always put people and nature at the center of our projects.
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_enark/views/snippets/s_text_image.xml b/theme_enark/views/snippets/s_text_image.xml
index 9617ec945..1d913a525 100644
--- a/theme_enark/views/snippets/s_text_image.xml
+++ b/theme_enark/views/snippets/s_text_image.xml
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="s_text_image" inherit_id="website.s_text_image">
-        <!-- Title & Paragraph -->
-        <xpath expr="//div[hasclass('col-lg-6')]" position="replace">
-            <div class="col-lg-6 p-5 border rounded" style="border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;">
-                <h2>Building Castle in Cloud</h2>
-                <p><br/></p>
-                <p>When designing an architectural concept, we take into account the nine criteria that Zumthor considers to be important in creating an architectural atmosphere.</p>
-            </div>
-        </xpath>
-        <!-- Col 2 -->
-        <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>
-    </template>
+
+<template id="s_text_image" inherit_id="website.s_text_image">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5 pb96 pt96" remove="pt32 pb32" separator=" "/>
+    </xpath>
+    <!-- Wrapper -->
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">        
+        <attribute name="class" add="border" separator=" "/>
+        <attribute name="style" add="padding:24px; border-width: 1px !important; border-color: rgb(70, 77, 83) !important; border-radius: 4px !important;"/>
+    </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>
+    <!-- Title -->
+    <xpath expr="//h2" position="replace" mode="inner">        
+        Building Castle in Cloud
+    </xpath>
+    <!-- Paragraphs -->
+    <xpath expr="//p" position="replace" />
+    <xpath expr="//p[1]" position="replace" mode="inner">        
+        When designing an architectural concept, we take into account the nine criteria that Zumthor considers to be important in creating an architectural atmosphere.
+    </xpath>
+    <xpath expr="//p[2]" position="replace" />        
+</template>
+
 </odoo>
diff --git a/theme_enark/views/snippets_options.xml b/theme_enark/views/snippets_options.xml
index 249b32dd9..21e586f8e 100644
--- a/theme_enark/views/snippets_options.xml
+++ b/theme_enark/views/snippets_options.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="enark_snippet_options" inherit_id="website.snippet_options">
-        <xpath expr="//div[@data-js='sizing_x']" position="attributes">
-            <attribute name="data-selector" add=".row.simple-stepwizard-row > .simple-stepwizard-step"/>
-            <attribute name="data-drop-near" add=".row.simple-stepwizard-row"/>
-        </xpath>
 
-        <xpath expr="//div[@data-js='Box']" position="before">
-            <div data-js="gradientpicker"
-                data-selector="section, .carousel, .parallax, .s_color_blocks_2 .row > div, .s_team_profile_box">
-                <we-select string="Gradients">
-                    <we-button data-select-class="">None</we-button>
-                    <we-divider/>
-                    <we-button data-select-class="bg_gradient_primary_up"><div class="bg_option_menu_gradient bg_gradient_primary_up d-block mx-auto"/></we-button>
-                    <we-button data-select-class="bg_gradient_primary_down"><div class="bg_option_menu_gradient bg_gradient_primary_down d-block mx-auto"/></we-button>
-                    <we-button data-select-class="bg_gradient_white_up"><div class="bg_option_menu_gradient bg_gradient_white_up_thumb d-block mx-auto"/></we-button>
-                    <we-button data-select-class="bg_gradient_white_down"><div class="bg_option_menu_gradient bg_gradient_white_down_thumb d-block mx-auto"/></we-button>
-                    <we-button data-select-class="bg_gradient_black_up"><div class="bg_option_menu_gradient bg_gradient_black_up d-block mx-auto"/></we-button>
-                    <we-button data-select-class="bg_gradient_black_down"><div class="bg_option_menu_gradient bg_gradient_black_down d-block mx-auto"/></we-button>
-                </we-select>
-            </div>
-        </xpath>
-    </template>
+<template id="enark_snippet_options" inherit_id="website.snippet_options">
+    <xpath expr="//div[@data-js='sizing_x']" position="attributes">
+        <attribute name="data-selector" add=".row.simple-stepwizard-row > .simple-stepwizard-step"/>
+        <attribute name="data-drop-near" add=".row.simple-stepwizard-row"/>
+    </xpath>
+
+    <xpath expr="//div[@data-js='Box']" position="before">
+        <div data-js="gradientpicker"
+            data-selector="section, .carousel, .parallax, .s_color_blocks_2 .row > div, .s_team_profile_box">
+            <we-select string="Gradients">
+                <we-button data-select-class="">None</we-button>
+                <we-divider/>
+                <we-button data-select-class="bg_gradient_primary_up"><div class="bg_option_menu_gradient bg_gradient_primary_up d-block mx-auto"/></we-button>
+                <we-button data-select-class="bg_gradient_primary_down"><div class="bg_option_menu_gradient bg_gradient_primary_down d-block mx-auto"/></we-button>
+                <we-button data-select-class="bg_gradient_white_up"><div class="bg_option_menu_gradient bg_gradient_white_up_thumb d-block mx-auto"/></we-button>
+                <we-button data-select-class="bg_gradient_white_down"><div class="bg_option_menu_gradient bg_gradient_white_down_thumb d-block mx-auto"/></we-button>
+                <we-button data-select-class="bg_gradient_black_up"><div class="bg_option_menu_gradient bg_gradient_black_up d-block mx-auto"/></we-button>
+                <we-button data-select-class="bg_gradient_black_down"><div class="bg_option_menu_gradient bg_gradient_black_down d-block mx-auto"/></we-button>
+            </we-select>
+        </div>
+    </xpath>
+</template>
+
 </odoo>