diff --git a/theme_yes/__manifest__.py b/theme_yes/__manifest__.py
index 0881299be..a262d8504 100644
--- a/theme_yes/__manifest__.py
+++ b/theme_yes/__manifest__.py
@@ -56,6 +56,8 @@
         'views/snippets/s_shape_image.xml',
         'views/snippets/s_text_cover.xml',
         'views/snippets/s_empowerment.xml',
+        'views/snippets/s_image_text_overlap.xml',
+        'views/snippets/s_features.xml',
         'views/new_page_template.xml',
     ],
     'images': [
@@ -68,15 +70,20 @@
         'website.s_media_list_default_image_2': '/theme_yes/static/src/img/snippets/s_media_list_2.jpg',
         'website.s_media_list_default_image_3': '/theme_yes/static/src/img/snippets/s_media_list_3.jpg',
         'website.s_quotes_carousel_demo_image_0': '/theme_yes/static/src/img/snippets/s_quotes_carousel_1.jpg',
-        'website.library_image_10': '/theme_yes/static/src/img/snippets/library_image_10.jpg',
-        'website.library_image_05': '/theme_yes/static/src/img/snippets/library_image_05.jpg',
+        'website.s_cover_default_image': '/theme_yes/static/src/img/snippets/s_cover.jpg',
+        'website.s_picture_default_image': '/theme_yes/static/src/img/snippets/s_cover.jpg',
+        'website.library_image_10': '/theme_yes/static/src/img/snippets/library_image_10.webp',
+        'website.library_image_05': '/theme_yes/static/src/img/snippets/library_image_05.webp',
         'website.library_image_08': '/theme_yes/static/src/img/snippets/library_image_08.jpg',
-        'website.library_image_13': '/theme_yes/static/src/img/snippets/library_image_13.jpg',
+        'website.library_image_13': '/theme_yes/static/src/img/snippets/library_image_13.webp',
         'website.library_image_03': '/theme_yes/static/src/img/snippets/library_image_03.jpg',
         'website.library_image_02': '/theme_yes/static/src/img/snippets/library_image_02.jpg',
+        'website.library_image_14': '/theme_yes/static/src/img/snippets/library_image_14.webp',
+        'website.library_image_16': '/theme_yes/static/src/img/snippets/library_image_16.webp',
+        'website.s_parallax_default_image': '/theme_yes/static/src/img/snippets/s_parallax.jpg',
     },
     'configurator_snippets': {
-        'homepage': ['s_cover', 's_title', 's_company_team', 's_media_list', 's_images_wall', 's_quotes_carousel'],
+        'homepage': ['s_kickoff', 's_title', 's_company_team', 's_image_text_overlap', 's_features', 's_freegrid', 's_quotes_carousel', 's_call_to_action'],
     },
     'new_page_templates': {
         'about': {
diff --git a/theme_yes/static/description/theme_yes.svg b/theme_yes/static/description/theme_yes.svg
index 4a138e848..fb6a1cc3d 100644
--- a/theme_yes/static/description/theme_yes.svg
+++ b/theme_yes/static/description/theme_yes.svg
@@ -1,212 +1,204 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="700" height="1850" viewBox="0 0 700 1850">
+<svg width="700" height="2208" viewBox="0 0 700 2208" fill="none" xmlns="http://www.w3.org/2000/svg" data-vsvg="002" class="theme_yes_svg_preview">
     <defs>
-        <!-- Font -->
-        <style>
-            @import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@600&amp;display=swap');
-        </style>
-        <!-- Box-shadow -->
-        <filter id="theme_yes_preview_shadow" x="0" y="0" filterUnits="userSpaceOnUse">
-            <feOffset dy="3" input="SourceAlpha"/>
-            <feGaussianBlur stdDeviation="3" result="blur"/>
-            <feFlood flood-opacity="0.15"/>
-            <feComposite operator="in" in2="blur"/>
-            <feComposite in="SourceGraphic"/>
-        </filter>
-        <!-- Images -->
-        <pattern width="1" height="1" id="theme_yes_s_cover_default_image_id" patternunits="objectBoundingBox">
-            <image width="700" height="375" preserveAspectRatio="xMidYMid slice" href="#s_cover_default_image_url"/>
+        <pattern id="theme_yes_s_parallax_default_image_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#s_parallax_default_image_url" width="700" height="156" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_media_list_default_image_1_id" patternunits="objectBoundingBox">
-            <image width="80" height="110" preserveAspectRatio="xMidYMid slice" href="#s_media_list_default_image_1_url"/>
+        <pattern id="theme_yes_library_image_03_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_03_url" width="59" height="216" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_media_list_default_image_2_id" patternunits="objectBoundingBox">
-            <image width="80" height="110" preserveAspectRatio="xMidYMid slice" href="#s_media_list_default_image_2_url"/>
+        <pattern id="theme_yes_library_image_13_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_13_url" width="156" height="128" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_media_list_default_image_3_id" patternunits="objectBoundingBox">
-            <image width="80" height="110" preserveAspectRatio="xMidYMid slice" href="#s_media_list_default_image_3_url"/>
+        <pattern id="theme_yes_library_image_10_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_10_url" width="156" height="128" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_company_team_image_1_id" patternunits="objectBoundingBox">
-            <image width="80" height="80" preserveAspectRatio="xMidYMid slice" href="/web/image/website.s_company_team_image_1"/>
+        <pattern id="theme_yes_library_image_05_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_05_url" width="175" height="216" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_company_team_image_2_id" patternunits="objectBoundingBox">
-            <image width="80" height="80" preserveAspectRatio="xMidYMid slice" href="/web/image/website.s_company_team_image_2"/>
+        <pattern id="theme_yes_library_image_14_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_14_url" width="154" height="261" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_quotes_carousel_demo_image_0_id" patternunits="objectBoundingBox">
-            <image width="700" height="180" preserveAspectRatio="xMidYMid slice" href="#s_quotes_carousel_demo_image_0_url"/>
+        <pattern id="theme_yes_library_image_16_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#library_image_16_url" width="121" height="216" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_s_quotes_carousel_demo_image_1_id" patternunits="objectBoundingBox">
-            <image width="20" height="20" preserveAspectRatio="xMidYMid slice" href="/web/image/website.s_quotes_carousel_demo_image_3"/>
+        <pattern id="theme_yes_s_picture_default_image_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#s_picture_default_image_url" width="472" height="245" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_10_id" patternunits="objectBoundingBox">
-            <image width="178" height="120" preserveAspectRatio="xMidYMid slice" href="#library_image_10_url"/>
+        <pattern id="theme_yes_s_cover_default_image_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="#s_cover_default_image_url" width="700" height="471" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_05_id" patternunits="objectBoundingBox">
-            <image width="178" height="260" preserveAspectRatio="xMidYMid slice" href="#library_image_05_url"/>
+        <pattern id="theme_yes_s_company_team_image_2_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="/web/image/website.s_company_team_image_2" width="66" height="66" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_08_id" patternunits="objectBoundingBox">
-            <image width="178" height="260" preserveAspectRatio="xMidYMid slice" href="#library_image_08_url"/>
+        <pattern id="theme_yes_s_company_team_image_1_id" width="1" height="1" patternunits="objectBoundingBox">
+            <image href="/web/image/website.s_company_team_image_1" width="66" height="66" preserveAspectRatio="xMidYMid slice"></image>
         </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_13_id" patternunits="objectBoundingBox">
-            <image width="178" height="120" preserveAspectRatio="xMidYMid slice" href="#library_image_13_url"/>
-        </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_03_id" patternunits="objectBoundingBox">
-            <image width="178" height="120" preserveAspectRatio="xMidYMid slice" href="#library_image_03_url"/>
-        </pattern>
-        <pattern width="1" height="1" id="theme_yes_library_image_02_id" patternunits="objectBoundingBox">
-            <image width="178" height="260" preserveAspectRatio="xMidYMid slice" href="#library_image_02_url"/>
-        </pattern>
-        <filter id="filter_readability_yes">
-            <feColorMatrix in="SourceGraphic" type="saturate" values="0"/>
+        <filter id="filter_readability_theme_yes">
+            <feColorMatrix in="SourceGraphic" type="saturate" values="0"></feColorMatrix>
             <feComponentTransfer>
-                <feFuncR type="table" tableValues="1 0"/>
-                <feFuncG type="table" tableValues="1 0"/>
-                <feFuncB type="table" tableValues="1 0"/>
+                <feFuncR type="table" tableValues="1 0"></feFuncR>
+                <feFuncG type="table" tableValues="1 0"></feFuncG>
+                <feFuncB type="table" tableValues="1 0"></feFuncB>
             </feComponentTransfer>
             <feComponentTransfer>
-                <feFuncR type="linear" slope="10000" intercept="-4999.5"/>
-                <feFuncG type="linear" slope="10000" intercept="-4999.5"/>
-                <feFuncB type="linear" slope="10000" intercept="-4999.5"/>
+                <feFuncR type="linear" slope="10000" intercept="-4999.5"></feFuncR>
+                <feFuncG type="linear" slope="10000" intercept="-4999.5"></feFuncG>
+                <feFuncB type="linear" slope="10000" intercept="-4999.5"></feFuncB>
             </feComponentTransfer>
         </filter>
     </defs>
-
-    <g id="theme_yes_preview">
-
-        <g data-name="Header" class="svgc_menu">
-            <rect width="700" height="40" fill="#MENU_COLOR"/>
-            <rect width="40" height="8" rx="2" x="140" y="16" fill="#MENU_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <rect width="40" height="8" rx="2" x="190" y="16" fill="#MENU_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <rect width="40" height="8" rx="2" x="240" y="16" fill="#MENU_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <rect width="50" height="8" rx="2" x="491" y="16" fill="#MENU_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <g class="svgc_btn_group">
-                <rect width="70" height="20" rx="10" x="560" y="10" fill="#3AADAA"/>
-                <text x="574" y="24" fill="#3AADAA" class="svgc_text" filter="url(#filter_readability_yes)" font-size="12" font-family="Trebuchet MS, sans-serif" font-weight="400">Contact</text>
-            </g>
-            <text x="70" y="24" fill="#MENU_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" font-size="14" font-family="Trebuchet MS, sans-serif" font-weight="700">LOGO</text>
+    <rect width="700" height="2208" fill="#ACACAC"></rect>
+    <g clip-path="url(#clip0_255_5)" class="theme_yes">
+        <rect width="700" height="2208" fill="#FFFFFF"></rect>
+        <g class="svgc_footer">
+            <path d="M700 2088H0V2208H700V2088Z" fill="#FOOTER_COLOR" class="svgc_footer_bg"></path>
+            <path d="M355 2154H222V2156H355V2154Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M317 2148H222V2150H317V2148Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M468 2117H223V2119H468V2117Z" fill="#FOOTER_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M434 2123H223V2125H434V2123Z" fill="#FOOTER_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M108 2149H70V2151H108V2149Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M115 2155H70V2157H115V2155Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M623 2155C626.866 2155 630 2151.87 630 2148C630 2144.13 626.866 2141 623 2141C619.134 2141 616 2144.13 616 2148C616 2151.87 619.134 2155 623 2155Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M604 2155C607.866 2155 611 2151.87 611 2148C611 2144.13 607.866 2141 604 2141C600.134 2141 597 2144.13 597 2148C597 2151.87 600.134 2155 604 2155Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M585 2155C588.866 2155 592 2151.87 592 2148C592 2144.13 588.866 2141 585 2141C581.134 2141 578 2144.13 578 2148C578 2151.87 581.134 2155 585 2155Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M139.596 2111H70.3003V2121H139.596V2111Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M160.686 2124H70.3003V2134H160.686V2124Z" fill="#FOOTER_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
         </g>
-
-        <g data-name="Cover">
-            <rect width="700" height="375" x="0" y="40" fill="url(#theme_yes_s_cover_default_image_id)"/>
-            <rect width="700" height="375" x="0" y="40" opacity="0.5"/>
-            <text x="161" y="210" fill="#FFFFFD" font-size="48" font-family="Playfair Display, serif" font-weight="500">Welcome Message</text>
-            <rect width="180" height="8" rx="3" x="260" y="240" fill="#FFFFFD" opacity="0.8"/>
-            <g class="svgc_btn_group">
-                <rect width="70" height="20" rx="10" x="315" y="275" fill="#3AADAA"/>
-                <text x="330" y="290" fill="#3AADAA" class="svgc_text" filter="url(#filter_readability_yes)" font-size="12" font-family="Trebuchet MS, sans-serif" font-weight="400">Details</text>
-            </g>
-            <path d="M700,232.305c-72.558,10.2-202.176,16.993-350,16.993S72.558,242.505,0,232.305v32H700Z" transform="translate(0 160)" fill="#F6F6F6"/>
+        <g class="s_call_to_action">
+            <rect y="1932" width="700" height="156" fill="url(#theme_yes_s_parallax_default_image_id)" class="img_reference_s_parallax_default_image"></rect>
+            <rect y="1932" width="700" height="156" fill="black" fill-opacity="0.4"></rect>
+            <rect x="36" y="2035" width="84" height="23" fill="#3AADAA"></rect>
+            <path d="M245 1987H37V1989H245V1987Z" fill="#383E45" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M245 2005H37V2007H245V2005Z" fill="#383E45" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
         </g>
-
-        <g data-name="Company Team">
-            <rect width="700" height="200" x="0" y="420" fill="#F6F6F6"/>
-            <text x="278" y="463" fill="#3AADAA" font-size="24" font-family="Playfair Display, serif" font-weight="500">Section Title</text>
-            <g data-name="Team_1">
-                <circle r="40" cx="100" cy="533" fill="url(#theme_yes_s_company_team_image_1_id)"/>
-                <text x="165" y="510" fill="#383E45" font-size="16" font-family="Playfair Display, serif" font-weight="500">Entry Title</text>
-                <rect width="50" height="7" rx="2" x="165" y="525" fill="#3AADAA"/>
-                <rect width="120" height="6" rx="2" x="165" y="542" fill="#888"/>
-                <rect width="150" height="6" rx="2" x="165" y="554" fill="#888"/>
-                <rect width="90" height="6" rx="2" x="165" y="566" fill="#888"/>
+        <g class="s_quotes_carousel">
+            <rect y="1732" width="700" height="200" fill="#F6F6F6"></rect>
+            <g>
+                <rect x="649" y="1817" width="28" height="28" rx="4" fill="#D9D9D9"></rect>
+                <path d="M659 1839L667 1831L659 1823" stroke="black" stroke-opacity="0.4" stroke-width="3"></path>
             </g>
-            <g data-name="Team_2">
-                <circle r="40" cx="400" cy="533" fill="url(#theme_yes_s_company_team_image_2_id)"/>
-                <text x="465" y="510" fill="#383E45" font-size="16" font-family="Playfair Display, serif" font-weight="500">Entry Title</text>
-                <rect width="50" height="7" rx="2" x="465" y="525" fill="#3AADAA"/>
-                <rect width="120" height="6" rx="2" x="465" y="542" fill="#888"/>
-                <rect width="150" height="6" rx="2" x="465" y="554" fill="#888"/>
-                <rect width="90" height="6" rx="2" x="465" y="566" fill="#888"/>
+            <g>
+                <rect x="51" y="1846" width="28" height="28" rx="4" transform="rotate(-180 51 1846)" fill="#D9D9D9"></rect>
+                <path d="M41 1824L33 1832L41 1840" stroke="black" stroke-opacity="0.4" stroke-width="3"></path>
             </g>
-            <path d="M700,232.305c-72.558,10.2-202.176,16.993-350,16.993S72.558,242.505,0,232.305v32H700Z" transform="translate(0 365)" fill="#FFFFFD"/>
-        </g>
-
-        <g data-name="Media List">
-            <rect width="700" height="430" x="0" y="625" fill="#FFFFFD"/>
-            <g data-name="Media_1">
-                <g transform="matrix(1, 0, 0, 1, 0, 0)" filter="url(#theme_yes_preview_shadow)">
-                    <rect width="360" height="110" rx="3" x="70" y="655" fill="#FFFFFD"/>
+            <g>
+                <rect x="165" y="1770" width="370" height="126" fill="#FFFFFF"></rect>
+                <g>
+                    <circle cx="350" cy="1860" r="8" fill="#FFFFFF" fill-opacity="0.6" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></circle>
+                    <rect x="323" y="1872" width="54" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+                    <rect x="332" y="1880" width="35" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
                 </g>
-                <rect width="80" height="110" x="350" y="655" fill="url(#theme_yes_s_media_list_default_image_1_id)"/>
-                <text x="90" y="688" fill="#383E45" font-size="18" font-family="Playfair Display, serif" font-weight="500">Entry Title</text>
-                <rect width="150" height="6" rx="2" x="90" y="715" fill="#888"/>
-                <rect width="200" height="6" rx="2" x="90" y="703" fill="#888"/>
-                <g class="svgc_btn_group">
-                    <rect width="70" height="20" rx="10" x="90" y="731" fill="#3AADAA"/>
-                </g>
-            </g>
-            <g data-name="Media_2">
-                <g transform="matrix(1, 0, 0, 1, 0, 0)" filter="url(#theme_yes_preview_shadow)">
-                    <rect width="360" height="110" rx="3" x="165" y="790" fill="#383E45"/>
-                </g>
-                <rect width="80" height="110" x="445" y="790" fill="url(#theme_yes_s_media_list_default_image_2_id)"/>
-                <text x="185" y="823" fill="#fff" font-size="18" font-family="Playfair Display, serif" font-weight="500">Entry Title</text>
-                <rect width="150" height="6" rx="2" x="185" y="850" fill="#383E45" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-                <rect width="200" height="6" rx="2" x="185" y="838" fill="#383E45" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-                <g class="svgc_btn_group">
-                    <rect width="70" height="20" rx="10" x="185" y="866" fill="#3AADAA"/>
-                </g>
-            </g>
-            <g data-name="Media_3">
-                <g transform="matrix(1, 0, 0, 1, 0, 0)" filter="url(#theme_yes_preview_shadow)">
-                    <rect width="360" height="110" rx="3" x="260" y="925" fill="#FFFFFD"/>
-                </g>
-                <rect width="80" height="110" x="540" y="925" fill="url(#theme_yes_s_media_list_default_image_3_id)"/>
-                <text x="280" y="958" fill="#383E45" font-size="18" font-family="Playfair Display, serif" font-weight="500">Entry Title</text>
-                <rect width="150" height="6" rx="2" x="280" y="985" fill="#888"/>
-                <rect width="200" height="6" rx="2" x="280" y="973" fill="#888"/>
-                <g class="svgc_btn_group">
-                    <rect width="70" height="20" rx="10" x="280" y="1001" fill="#3AADAA"/>
+                <g>
+                    <rect x="213" y="1798" width="275" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+                    <rect x="246" y="1808" width="208.668" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+                    <rect x="226" y="1818" width="248.744" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+                    <rect x="265" y="1828" width="171.357" height="2" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
                 </g>
+                <rect x="341" y="1760" width="19" height="19" fill="#FFFFFF" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
             </g>
         </g>
-
-        <g data-name="Images Wall">
-            <rect width="700" height="445" x="0" y="1055" fill="#FFFFFD"/>
-            <rect width="178" height="120" rx="4" x="70" y="1075" fill="url(#theme_yes_library_image_10_id)"/>
-            <rect width="178" height="260" rx="4" x="70" y="1205" fill="url(#theme_yes_library_image_05_id)"/>
-            <rect width="178" height="260" rx="4" x="258" y="1075" fill="url(#theme_yes_library_image_08_id)"/>
-            <rect width="178" height="120" rx="4" x="258" y="1345" fill="url(#theme_yes_library_image_13_id)"/>
-            <rect width="178" height="120" rx="4" x="445" y="1075" fill="url(#theme_yes_library_image_03_id)"/>
-            <rect width="178" height="260" rx="4" x="445" y="1205" fill="url(#theme_yes_library_image_02_id)"/>
+        <g class="s_freegrid">
+            <rect y="1285" width="700" height="447" fill="#F6F6F6"></rect>
+            <path d="M371 1306H330V1308H371V1306Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M467 1334H234V1339H467V1334Z" fill="#F6F6F6" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <path d="M481 1355H220V1360H481V1355Z" fill="#F6F6F6" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <rect x="289" y="1391" width="122" height="23" fill="#3AADAA"></rect>
+            <rect y="1462.38" width="58.75" height="216.25" fill="url(#theme_yes_library_image_03_id)" class="img_reference_library_image_03"></rect>
+            <rect x="67.5" y="1438.62" width="156.25" height="127.5" fill="url(#theme_yes_library_image_13_id)" class="img_reference_library_image_13"></rect>
+            <rect x="67.5" y="1574.88" width="156.25" height="127.5" fill="url(#theme_yes_library_image_10_id)" class="img_reference_library_image_10"></rect>
+            <rect x="232.5" y="1462.38" width="175" height="216.25" fill="url(#theme_yes_library_image_05_id)" class="img_reference_library_image_05"></rect>
+            <rect x="416.25" y="1438.62" width="153.75" height="261.25" fill="url(#theme_yes_library_image_14_id)" class="img_reference_library_image_14"></rect>
+            <rect x="578.75" y="1462.38" width="121.25" height="216.25" fill="url(#theme_yes_library_image_16_id)" class="img_reference_library_image_16"></rect>
         </g>
-
-        <g data-name="Quotes Carousel">
-            <rect width="700" height="180" x="0" y="1500" fill="url(#theme_yes_s_quotes_carousel_demo_image_0_id)"/>
-            <rect width="700" height="180" x="0" y="1500" fill="#000" opacity=".25"/>
-            <rect width="260" height="90" x="233" y="1545" fill="#FFFFFD"/>
-            <path d="M4,0H25a0,0,0,0,1,0,0V25a0,0,0,0,1,0,0H4a4,4,0,0,1-4-4V4A4,4,0,0,1,4,0Z" transform="translate(208 1545)" fill="#3AADAA"/>
-            <rect width="220" height="6" rx="2" x="248" y="1565" fill="#888"/>
-            <rect width="120" height="6" rx="2" x="248" y="1575" fill="#888"/>
-            <circle r="10" cx="260" cy="1608" fill="url(#theme_yes_s_quotes_carousel_demo_image_1_id)"/>
-            <rect width="90" height="6" rx="2" x="278" y="1605" fill="#888"/>
-            <path d="M1293.692,417.043a1.689,1.689,0,0,1-1.2-.5l-7.711-7.711a1.7,1.7,0,0,1,0-2.4l7.711-7.711a1.7,1.7,0,0,1,2.4,0l.9.9a1.7,1.7,0,0,1,0,2.4l-5.589,5.615,5.589,5.615a1.7,1.7,0,0,1,0,2.4l-.9.9A1.689,1.689,0,0,1,1293.692,417.043Z" transform="translate(-1214 1182)" fill="#FFFFFD"/>
-            <path d="M1293.692,417.043a1.689,1.689,0,0,1-1.2-.5l-7.711-7.711a1.7,1.7,0,0,1,0-2.4l7.711-7.711a1.7,1.7,0,0,1,2.4,0l.9.9a1.7,1.7,0,0,1,0,2.4l-5.589,5.615,5.589,5.615a1.7,1.7,0,0,1,0,2.4l-.9.9A1.689,1.689,0,0,1,1293.692,417.043Z" transform="translate(1914 1998) rotate(180)" fill="#FFFFFD"/>
+        <g class="s_features">
+            <rect x="-1" y="1114" width="700" height="171" fill="#F6F6F6"></rect>
+            <g>
+                <circle cx="563.5" cy="1155.5" r="11.5" fill="#D9D9D9"></circle>
+                <path d="M594 1183H533V1185H594V1183Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M660 1199H467V1201H660V1199Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M600 1211H527V1213H600V1211Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            </g>
+            <g>
+                <circle cx="349.5" cy="1155.5" r="11.5" fill="#D9D9D9"></circle>
+                <path d="M380 1183H319V1185H380V1183Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M446 1199H253V1201H446V1199Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M386 1211H313V1213H386V1211Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            </g>
+            <g>
+                <circle cx="135.5" cy="1155.5" r="11.5" fill="#D9D9D9"></circle>
+                <path d="M166 1183H105V1185H166V1183Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M232 1199H39V1201H232V1199Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M172 1211H99V1213H172V1211Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            </g>
         </g>
-
-        <g data-name="Footer" class="svgc_footer">
-            <rect width="700" height="135" x="0" y="1680" fill="#FOOTER_COLOR" class="svgc_footer_bg"/>
-            <text x="70" y="1726" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" font-size="16" font-family="Trebuchet MS, sans-serif" font-weight="500">Section Title</text>
-            <rect width="240" height="6" rx="2" x="70" y="1740" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="240" height="6" rx="2" x="70" y="1764" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="240" height="6" rx="2" x="70" y="1752" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="147" height="6" rx="2" x="70" y="1776" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="90" height="6" rx="2" x="392" y="1752" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="90" height="6" rx="2" x="392" y="1740" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="90" height="6" rx="2" x="392" y="1764" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="50" height="6" rx="2" x="392" y="1776" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <text x="392" y="1724" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" font-size="12" font-family="Trebuchet MS, sans-serif" font-weight="500">Entry Title</text>
-            <rect width="90" height="6" rx="2" x="540" y="1740" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <rect width="90" height="6" rx="2" x="540" y="1752" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.8"/>
-            <text x="540" y="1724" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" font-size="12" font-family="Trebuchet MS, sans-serif" font-weight="500">Entry Title</text>
-            <circle r="8" cx="548" cy="1775" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <circle r="8" cx="570" cy="1775" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <circle r="8" cx="591" cy="1775" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
-            <circle r="8" cx="612" cy="1775" fill="#FOOTER_COLOR" class="svgc_text" filter="url(#filter_readability_yes)" opacity="0.5"/>
+        <g class="s_image_text_overlap">
+            <rect y="813" width="700" height="301" fill="#F6F6F6"></rect>
+            <rect x="193" y="841" width="472" height="245" fill="url(#theme_yes_s_picture_default_image_id)" class="img_reference_s_picture_default_image"></rect>
+            <g>
+                <rect x="35" y="889" width="317" height="148" fill="#FFFFFF"></rect>
+                <path d="M273 986H62V991H273V986Z" fill="#FFFFFF" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M273 954H62V959H273V954Z" fill="#FFFFFF" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M273 970H62V975H273V970Z" fill="#FFFFFF" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M273 1002H62V1007H273V1002Z" fill="#FFFFFF" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M107 929H62V931H107V929Z" fill="#FFFFFF" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            </g>
         </g>
-
-        <g data-name="Copyright">
-            <rect width="700" height="35" x="0" y="1815" fill="#3AADAA"/>
-            <rect width="120" height="6" rx="2" x="70" y="1830" fill="#3AADAA" class="svgc_text" filter="url(#filter_readability_yes)"/>
+        <g class="s_company_team">
+            <rect x="-1" y="648" width="700" height="165" fill="#F6F6F6"></rect>
+            <text fill="#F6F6F6" xml:space="preserve" style="white-space: pre" font-family="Playfair Display" font-size="24" font-weight="bold" letter-spacing="0em" class="svgc_invert" filter="url(#filter_readability_theme_yes)">
+                <tspan x="34" y="680.972">Section Title</tspan>
+            </text>
+            <g>
+                <path d="M648 751H437V753H648V751Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M482 729H437V731H482V729Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M482 715H437V717H482V715Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M656 762H437V764H656V762Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M657 773H437V775H657V773Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M480 784H437V786H480V784Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <circle cx="389" cy="742" r="33" fill="url(#theme_yes_s_company_team_image_2_id)" class="img_reference_s_company_team_image_2"></circle>
+            </g>
+            <g>
+                <path d="M327 751H116V753H327V751Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M161 729H116V731H161V729Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M161 715H116V717H161V715Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M335 762H116V764H335V762Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M336 773H116V775H336V773Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <path d="M159 784H116V786H159V784Z" fill="#F6F6F6" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+                <circle cx="68" cy="742" r="33" fill="url(#theme_yes_s_company_team_image_1_id)" class="img_reference_s_company_team_image_1"></circle>
+            </g>
+        </g>
+        <g class="s_kickoff">
+            <rect y="40" width="700" height="471" fill="url(#theme_yes_s_cover_default_image_id)" class="img_reference_s_cover_default_image"></rect>
+            <rect y="40" width="700" height="471" fill="black" fill-opacity="0.4"></rect>
+            <text fill="#383E45" xml:space="preserve" style="white-space: pre" font-family="Playfair Display" font-size="30" font-weight="bold" letter-spacing="0em" class="svgc_invert" filter="url(#filter_readability_theme_yes)">
+                <tspan x="257.233" y="238.465">Welcome title</tspan>
+            </text>
+            <rect x="177" y="269" width="343" height="5" fill="#383E45" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="308" y="292" width="84" height="23" fill="#FFFFFF"></rect>
+        </g>
+        <path d="M701 511H-1C73.0081 498.371 202.556 490 350 490C497.444 490 626.992 498.371 701 511Z" fill="#F6F6F6"></path>
+        <g class="s_title">
+            <path d="M0 511H700V648H0V511Z" fill="#F6F6F6"></path>
+            <text fill="#F6F6F6" xml:space="preserve" style="white-space: pre" font-family="Playfair Display" font-size="35" font-weight="bold" letter-spacing="0em" class="svgc_invert" filter="url(#filter_readability_theme_yes)">
+                <tspan x="304.357" y="549.042">Large
+                </tspan>
+                <tspan x="256.813" y="596.042">section title</tspan>
+            </text>
+        </g>
+        <g class="svgc_menu">
+            <rect width="700" height="40" fill="#MENU_COLOR" class="svgc_menu_bg"></rect>
+            <path d="M74.3992 24.826V22.621H68.7742V12.1742H66V24.826H74.3992ZM81.4362 25C82.594 25 83.636 24.7448 84.5637 24.236C85.4944 23.7286 86.2282 22.9892 86.7695 22.0208C87.3108 21.0538 87.58 19.8795 87.58 18.4994C87.58 17.1207 87.3093 15.9464 86.768 14.978C86.2282 14.011 85.4944 13.2731 84.5652 12.7643C83.636 12.2554 82.5925 12.0003 81.4347 12.0003C80.2694 12.0003 79.2228 12.2554 78.2951 12.7643C77.3689 13.2717 76.6351 14.011 76.0983 14.978C75.56 15.9464 75.2909 17.1207 75.2909 18.5008C75.2909 19.8752 75.56 21.0466 76.0983 22.015C76.5948 22.9422 77.3574 23.7121 78.2951 24.2331C79.2228 24.7434 80.2694 24.9985 81.4347 24.9985L81.4362 25ZM81.4362 22.6326C80.8148 22.6459 80.2033 22.4803 79.6799 22.1571C79.1792 21.8396 78.7928 21.3742 78.5161 20.761C78.241 20.1477 78.1026 19.3939 78.1026 18.4994C78.1026 17.6064 78.241 16.8525 78.5161 16.2378C78.7913 15.6246 79.1792 15.1592 79.6799 14.8432C80.2027 14.5198 80.8137 14.3542 81.4347 14.3677C82.1053 14.3677 82.6902 14.5257 83.1909 14.8432C83.6901 15.1592 84.078 15.626 84.3532 16.2393C84.6299 16.8525 84.7667 17.6064 84.7667 18.5008C84.7667 19.3939 84.6299 20.1477 84.3532 20.761C84.078 21.3742 83.6916 21.8396 83.1909 22.1571C82.6677 22.4807 82.0576 22.6463 81.4362 22.6326ZM95.3853 24.9985C96.4874 24.9985 97.4663 24.784 98.3203 24.3534C99.1592 23.9371 99.8573 23.2983 100.332 22.5123C100.819 21.7149 101.063 20.761 101.063 19.649V18.0543H95.5717V20.0695H98.3865L98.3805 20.2521C98.3549 20.5957 98.2752 20.9074 98.1444 21.1872L98.0346 21.3902C97.7953 21.7878 97.4382 22.1073 97.0092 22.3078C96.5641 22.5253 96.0258 22.6326 95.3988 22.6326C94.7071 22.6326 94.1057 22.4717 93.5975 22.1484C93.0892 21.8251 92.6953 21.3539 92.4186 20.7363C92.142 20.1188 92.0021 19.3692 92.0021 18.4878C92.0021 17.6064 92.1435 16.8598 92.4246 16.248C92.7073 15.6362 93.1013 15.1694 93.608 14.849C94.1335 14.5225 94.7482 14.3549 95.3732 14.3677C95.7311 14.3677 96.0589 14.4112 96.3566 14.4967C96.6528 14.5837 96.9174 14.7084 97.1505 14.8707C97.3836 15.0331 97.5806 15.2303 97.7429 15.4637C97.9053 15.6956 98.0316 15.9624 98.1219 16.2639H100.941C100.858 15.6571 100.651 15.0722 100.332 14.5431C100.018 14.0225 99.6035 13.5644 99.1112 13.1934C98.5994 12.8072 98.0219 12.5095 97.4046 12.3134C96.7348 12.1005 96.0334 11.9947 95.3281 12.0003C94.5006 11.993 93.6797 12.1422 92.9118 12.4395C92.174 12.7281 91.5079 13.1639 90.9571 13.7182C90.3797 14.3063 89.9357 15.0039 89.6535 15.7667C89.3437 16.5713 89.1888 17.486 89.1888 18.5124C89.1888 19.8462 89.449 20.9987 89.9677 21.9686C90.4526 22.9034 91.2084 23.6825 92.1435 24.2113C93.0757 24.7361 94.1553 24.9985 95.3853 24.9985ZM108.855 24.9985C110.012 24.9985 111.055 24.7448 111.984 24.236C112.913 23.7286 113.648 22.9892 114.188 22.0208C114.729 21.0538 115 19.8795 115 18.4994C115 17.1207 114.729 15.9464 114.188 14.978C113.647 14.011 112.913 13.2731 111.984 12.7643C111.055 12.2554 110.012 12.0003 108.855 12.0003C107.688 12.0003 106.641 12.2554 105.715 12.7643C104.787 13.2717 104.055 14.011 103.517 14.978C102.979 15.9464 102.709 17.1207 102.709 18.5008C102.709 19.8752 102.979 21.0466 103.517 22.015C104.055 22.9834 104.787 23.7228 105.715 24.2331C106.641 24.7434 107.688 24.9985 108.855 24.9985ZM108.855 22.6326C108.184 22.6326 107.598 22.4731 107.098 22.1571C106.599 21.8396 106.211 21.3742 105.936 20.761C105.66 20.1477 105.523 19.3939 105.523 18.4994C105.523 17.6064 105.66 16.8525 105.936 16.2378C106.211 15.6246 106.598 15.1592 107.098 14.8432C107.622 14.5195 108.233 14.3539 108.855 14.3677C109.525 14.3677 110.11 14.5257 110.609 14.8432C111.11 15.1592 111.497 15.626 111.773 16.2393C112.048 16.8525 112.187 17.6064 112.187 18.5008C112.187 19.3939 112.048 20.1477 111.773 20.761C111.497 21.3742 111.11 21.8396 110.609 22.1571C110.087 22.4804 109.476 22.646 108.855 22.6326Z" fill="#MENU_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></path>
+            <rect x="207" y="14" width="44" height="12" fill="#MENU_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="155" y="14" width="44" height="12" fill="#MENU_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="259" y="14" width="44" height="12" fill="#MENU_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="310" y="14" width="44" height="12" fill="#MENU_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="362" y="14" width="44" height="12" fill="#MENU_COLOR" fill-opacity="0.4" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
+            <rect x="555" y="14" width="79" height="12" fill="#MENU_COLOR" class="svgc_invert" filter="url(#filter_readability_theme_yes)"></rect>
         </g>
-
     </g>
+    <defs>
+        <clipPath id="clip0_255_5">
+            <rect width="700" height="2208" fill="#FFFFFF"></rect>
+        </clipPath>
+    </defs>
 </svg>
diff --git a/theme_yes/static/description/yes_description.jpg b/theme_yes/static/description/yes_description.jpg
new file mode 100644
index 000000000..e765236e4
Binary files /dev/null and b/theme_yes/static/description/yes_description.jpg differ
diff --git a/theme_yes/static/description/yes_description.png b/theme_yes/static/description/yes_description.png
deleted file mode 100644
index af05fad59..000000000
Binary files a/theme_yes/static/description/yes_description.png and /dev/null differ
diff --git a/theme_yes/static/description/yes_screenshot.jpg b/theme_yes/static/description/yes_screenshot.jpg
index 0d0d2cfb8..e4fb60d0a 100644
Binary files a/theme_yes/static/description/yes_screenshot.jpg and b/theme_yes/static/description/yes_screenshot.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_03.jpg b/theme_yes/static/src/img/snippets/library_image_03.jpg
index 8567470db..8e80d891c 100644
Binary files a/theme_yes/static/src/img/snippets/library_image_03.jpg and b/theme_yes/static/src/img/snippets/library_image_03.jpg differ
diff --git a/theme_yes/static/src/img/snippets/library_image_05.webp b/theme_yes/static/src/img/snippets/library_image_05.webp
new file mode 100644
index 000000000..ce8b52200
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_05.webp differ
diff --git a/theme_yes/static/src/img/snippets/library_image_10.webp b/theme_yes/static/src/img/snippets/library_image_10.webp
new file mode 100644
index 000000000..ba593501b
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_10.webp differ
diff --git a/theme_yes/static/src/img/snippets/library_image_13.jpg b/theme_yes/static/src/img/snippets/library_image_13.jpg
deleted file mode 100644
index c0bca56ec..000000000
Binary files a/theme_yes/static/src/img/snippets/library_image_13.jpg and /dev/null differ
diff --git a/theme_yes/static/src/img/snippets/library_image_13.webp b/theme_yes/static/src/img/snippets/library_image_13.webp
new file mode 100644
index 000000000..9f2790e40
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_13.webp differ
diff --git a/theme_yes/static/src/img/snippets/library_image_14.webp b/theme_yes/static/src/img/snippets/library_image_14.webp
new file mode 100644
index 000000000..5fa75e057
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_14.webp differ
diff --git a/theme_yes/static/src/img/snippets/library_image_16.webp b/theme_yes/static/src/img/snippets/library_image_16.webp
new file mode 100644
index 000000000..a6b09c306
Binary files /dev/null and b/theme_yes/static/src/img/snippets/library_image_16.webp differ
diff --git a/theme_yes/static/src/img/snippets/s_kickoff_default_image.jpg b/theme_yes/static/src/img/snippets/s_kickoff_default_image.jpg
index e19c858bd..3411469aa 100644
Binary files a/theme_yes/static/src/img/snippets/s_kickoff_default_image.jpg and b/theme_yes/static/src/img/snippets/s_kickoff_default_image.jpg differ
diff --git a/theme_yes/static/src/img/snippets/s_picture.jpg b/theme_yes/static/src/img/snippets/s_picture.jpg
deleted file mode 100644
index 05d5b5289..000000000
Binary files a/theme_yes/static/src/img/snippets/s_picture.jpg and /dev/null differ
diff --git a/theme_yes/static/src/img/snippets/s_picture.webp b/theme_yes/static/src/img/snippets/s_picture.webp
new file mode 100644
index 000000000..5cfe6bfe2
Binary files /dev/null and b/theme_yes/static/src/img/snippets/s_picture.webp differ
diff --git a/theme_yes/static/src/img/snippets/uiface_1.jpg b/theme_yes/static/src/img/snippets/uiface_1.jpg
index b38f9a49a..2ba0869c9 100644
Binary files a/theme_yes/static/src/img/snippets/uiface_1.jpg and b/theme_yes/static/src/img/snippets/uiface_1.jpg differ
diff --git a/theme_yes/static/src/js/tour.js b/theme_yes/static/src/js/tour.js
index e99d425e3..2e8f25431 100644
--- a/theme_yes/static/src/js/tour.js
+++ b/theme_yes/static/src/js/tour.js
@@ -4,8 +4,8 @@ import * as wTourUtils from '@website/js/tours/tour_utils';
 
 const snippets = [
     {
-        id: 's_cover',
-        name: 'Cover',
+        id: 's_kickoff',
+        name: 'Kickoff',
         groupName: "Intro",
     },
     {
@@ -19,19 +19,19 @@ const snippets = [
         groupName: "People",
     },
     {
-        id: 's_media_list',
-        name: 'Media List',
+        id: 's_image_text_overlap',
+        name: 'Image - Text Overlap',
         groupName: "Content",
     },
     {
-        id: 's_images_wall',
-        name: 'Images Wall',
-        groupName: "Images",
+        id: 's_features',
+        name: 'Features',
+        groupName: "Content>",
     },
     {
-        id: 's_quotes_carousel',
-        name: 'Quotes',
-        groupName: "People",
+        id: 's_call_to_action',
+        name: 'Call to Action',
+        groupName: "Content",
     },
 ];
 
diff --git a/theme_yes/static/src/scss/primary_variables.scss b/theme_yes/static/src/scss/primary_variables.scss
index 851c39a78..3d556e606 100644
--- a/theme_yes/static/src/scss/primary_variables.scss
+++ b/theme_yes/static/src/scss/primary_variables.scss
@@ -53,9 +53,11 @@ $o-website-values-palettes: (
         'font':                             'Quicksand',
         'headings-font':                    'Playfair Display',
         'footer-template':                  'descriptive',
-        'btn-border-radius':                10rem,
-        'btn-border-radius-sm':             10rem,
-        'btn-border-radius-lg':             10rem,
+        'btn-padding-y-lg':                 .5rem,
+        'btn-padding-x-lg':                 2rem,
+        'btn-border-radius':                0,
+        'btn-border-radius-sm':             0,
+        'btn-border-radius-lg':             0,
         'btn-ripple':                       true,
     ),
 );
diff --git a/theme_yes/views/images.xml b/theme_yes/views/images.xml
index b41ce298c..c889602b7 100644
--- a/theme_yes/views/images.xml
+++ b/theme_yes/views/images.xml
@@ -84,7 +84,7 @@ Check in theme_kea's primary_variables.scss, theme.scss and theme_common's mixin
 <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_yes/static/src/img/snippets/s_picture.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/s_picture.webp</field>
 </record>
 <!-- // Image Gallery // -->
 <record id="library_image_02" model="theme.ir.attachment">
@@ -106,27 +106,27 @@ Check in theme_kea's primary_variables.scss, theme.scss and theme_common's mixin
 <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_yes/static/src/img/snippets/library_image_10.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_10.webp</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_yes/static/src/img/snippets/library_image_13.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_13.webp</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_yes/static/src/img/snippets/library_image_05.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_05.webp</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_yes/static/src/img/snippets/library_image_14.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_14.webp</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_yes/static/src/img/snippets/library_image_16.jpg</field>
+    <field name="url">/theme_yes/static/src/img/snippets/library_image_16.webp</field>
 </record>
 <record id="library_image_20" model="theme.ir.attachment">
     <field name="key">website.library_image_20</field>
diff --git a/theme_yes/views/snippets/s_call_to_action.xml b/theme_yes/views/snippets/s_call_to_action.xml
index bce056828..73806355c 100644
--- a/theme_yes/views/snippets/s_call_to_action.xml
+++ b/theme_yes/views/snippets/s_call_to_action.xml
@@ -2,14 +2,26 @@
 <odoo>
 
 <template id="s_call_to_action" inherit_id="website.s_call_to_action">
+    <xpath expr="//section" position="attributes">
+        <attribute name="style" add="background-image:url(/web/image/website.s_parallax_default_image)" separator=";"/>
+    </xpath>
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_bg_filter bg-black-25"/>
+    </xpath>
     <!-- Title -->
-    <xpath expr="//h3" position="replace" mode="inner">
-        345 couples trusted us to organize their wedding.
+    <xpath expr="//h3" position="replace">
+        <h2>Discover how we can help you<br/>making this day unforgettable.</h2>
     </xpath>
     <!-- Paragraph -->
-    <xpath expr="//p" position="replace" mode="inner">
-        Join them and let us help you make this day unforgettable.
+    <xpath expr="//p" position="replace">
+        <p><br/></p>
     </xpath>
+    <!-- CTA -->
+    <xpath expr="//p" position="after">
+        <a t-att-href="cta_btn_href" class="btn btn-primary btn-lg"><t t-esc="cta_btn_text">Contact us</t></a>
+    </xpath>
+    <!-- Remove right-side button -->
+    <xpath expr="//div[hasclass('col-lg-3')]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_yes/views/snippets/s_company_team.xml b/theme_yes/views/snippets/s_company_team.xml
index e229aa94f..a8065b4ca 100644
--- a/theme_yes/views/snippets/s_company_team.xml
+++ b/theme_yes/views/snippets/s_company_team.xml
@@ -2,12 +2,17 @@
 <odoo>
 
 <template id="s_company_team" inherit_id="website.s_company_team">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2" separator=" "/>
+    </xpath>
+    <xpath expr="//p" position="replace"/>
     <!-- Row #1 - Col #1 -->
     <xpath expr="//div[hasclass('col-lg-9')]//h4" position="replace" mode="inner">
         Livia Sailor
     </xpath>
     <xpath expr="//div[hasclass('col-lg-9')]//p" position="replace" mode="inner">
-        <font style="font-weight: bolder;" class="text-o-color-1">The Founder &amp; Planner</font>
+        <font style="font-weight: bolder;" class="text-o-color-1">The Planner</font>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-9')]//p[2]" position="replace" mode="inner">
         Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.
@@ -20,22 +25,11 @@
         <font style="font-weight: bolder;" class="text-o-color-1">The Designer</font>
     </xpath>
     <xpath expr="(//div[hasclass('col-lg-9')])[2]//p[2]" position="replace" mode="inner">
-        Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.
+        Clair has a background in both design and photography. With these strong skills in his toolbox, he will take care of the decoration of the place, as well as create lifelong memories for you and your soulmate.
     </xpath>
     <!-- Row -->
     <xpath expr="//*[hasclass('col-lg-6')][4]" position="replace"/>
     <xpath expr="//*[hasclass('col-lg-6')][3]" position="replace"/>
 </template>
 
-<template id="configurator_s_company_team" inherit_id="website.configurator_s_company_team">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001 o_second_extra_shape_mapping bg-o-color-3"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_yes/views/snippets/s_cover.xml b/theme_yes/views/snippets/s_cover.xml
index 3a58e835a..c2a8a1ae6 100644
--- a/theme_yes/views/snippets/s_cover.xml
+++ b/theme_yes/views/snippets/s_cover.xml
@@ -33,15 +33,4 @@
     </xpath>
 </template>
 
-<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//*[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Origins_14_001"/>
-    </xpath>
-</template>
-
 </odoo>
diff --git a/theme_yes/views/snippets/s_features.xml b/theme_yes/views/snippets/s_features.xml
new file mode 100644
index 000000000..244987ae1
--- /dev/null
+++ b/theme_yes/views/snippets/s_features.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_features" inherit_id="website.s_features">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc2 pb88" remove="pb64" separator=" "/>
+    </xpath>
+    <!-- Remove title and subtitle -->
+    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <!-- Column #01 -->
+    <xpath expr="//div[hasclass('row')]/div[1]/div[hasclass('s_hr')]" position="replace"/>
+    <xpath expr="//div[hasclass('row')]/div[1]/i" position="replace">
+        <i class="s_features_icon fa fa-map-o mb-3 fa-2x mx-auto d-block" role="img"/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[1]/div/h3" position="replace">
+        <h3 style="text-align: center;"><span class="h5-fs">Dream venues</span></h3>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[1]/div/p" position="replace">
+        <p style="text-align: center;">We help you discover the ideal location that matches your style and vision.</p>
+    </xpath>
+    <!-- Column #02 -->
+    <xpath expr="//div[hasclass('row')]/div[2]/div[hasclass('s_hr')]" position="replace"/>
+    <xpath expr="//div[hasclass('row')]/div[2]/i" position="replace">
+        <i class="s_features_icon fa fa-file-text-o mb-3 fa-2x mx-auto d-block" role="img"/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[2]/div/h3" position="replace">
+        <h3 style="text-align: center;"><span class="h5-fs">Curating the finest menu</span></h3>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[2]/div/p" position="replace">
+        <p style="text-align: center;">We help you crafting a personalized wedding menu tailored to your tastes.</p>
+    </xpath>
+    <!-- Column #03 -->
+    <xpath expr="//div[hasclass('row')]/div[3]/div[hasclass('s_hr')]" position="replace"/>
+    <xpath expr="//div[hasclass('row')]/div[3]/i" position="replace">
+        <i class="s_features_icon fa fa-diamond mb-3 fa-2x mx-auto d-block" role="img"/>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[3]/div/h3" position="replace">
+        <h3 style="text-align: center;"><span class="h5-fs">Capturing the moment</span></h3>
+    </xpath>
+    <xpath expr="//div[hasclass('row')]/div[3]/div/p" position="replace">
+        <p style="text-align: center;">From photography to videography, we will record all the important moments.</p>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_freegrid.xml b/theme_yes/views/snippets/s_freegrid.xml
index 7d9572ae8..a94e9a43d 100644
--- a/theme_yes/views/snippets/s_freegrid.xml
+++ b/theme_yes/views/snippets/s_freegrid.xml
@@ -2,18 +2,47 @@
 <odoo>
 
 <template id="s_freegrid" inherit_id="website.s_freegrid">
-    <!-- Title -->
-    <xpath expr="//h2" position="replace" mode="inner">
-        Capture Your Love Story in Beautiful Photos
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc2 pt88" remove="o_cc1 pt64" separator=" "/>
     </xpath>
-    <!-- Paragraph -->
-    <xpath expr="//p[hasclass('lead')]" position="replace" mode="inner">
-        Let us help you capture the magic of your special day. Our professional photography services ensure that your wedding memories are preserved beautifully for a lifetime.
+    <!-- Item #1 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[1]" position="attributes">
+        <attribute name="style" add="grid-area: 8 / 1 / 16 / 2;" remove="grid-area: 2 / 1 / 10 / 2" separator=";"/>
     </xpath>
-    <!-- Button -->
-    <xpath expr="//a" position="replace" mode="inner">
-        View Portfolio
+    <!-- Item #2 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+        <attribute name="style" add="grid-area: 7 / 2 / 12 / 5;" remove="grid-area: 1 / 2 / 6 / 5" separator=";"/>
     </xpath>
+    <!-- Item #3 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
+        <attribute name="style" add="grid-area: 12 / 2 / 17 / 5;" remove="grid-area: 6 / 2 / 11 / 5" separator=";"/>
+    </xpath>
+    <!-- Item #4 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
+        <attribute name="style" add="grid-area: 8 / 5 / 16 / 8;" remove="grid-area: 2 / 5 / 10 / 8" separator=";"/>
+    </xpath>
+    <!-- Item #5 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[5]" position="attributes">
+        <attribute name="style" add="grid-area: 7 / 8 / 17 / 11;" remove="grid-area: 1 / 8 / 11 / 11" separator=";"/>
+    </xpath>
+    <!-- Item #6 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[6]" position="attributes">
+        <attribute name="style" add="grid-area: 8 / 11 / 16 / 13;" remove="grid-area: 2 / 11 / 10 / 13" separator=";"/>
+    </xpath>
+    <!-- Item #7 -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[7]" position="replace">
+        <div class="o_grid_item g-col-lg-8 g-height-6 col-lg-8" style="grid-area: 1 / 3 / 7 / 11; z-index: 7;">
+            <p class="o_small" style="text-align: center;"> PORTFOLIO</p>
+            <h2 style="text-align: center;">Discover some of the latest<br/>moments we helped to create</h2>
+            <p><br/></p>
+            <p style="text-align: center;">
+                <a t-att-href="cta_btn_href" class="btn btn-primary btn-lg"><t t-esc="cta_btn_text">View all the pictures</t></a>
+            </p>
+        </div>
+    </xpath>
+    <!-- Remove last item -->
+    <xpath expr="(//div[hasclass('o_grid_item')])[8]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_yes/views/snippets/s_image_text_overlap.xml b/theme_yes/views/snippets/s_image_text_overlap.xml
new file mode 100644
index 000000000..55bee3be3
--- /dev/null
+++ b/theme_yes/views/snippets/s_image_text_overlap.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_image_text_overlap" inherit_id="website.s_image_text_overlap">
+  <xpath expr="//section" position="attributes">
+    <attribute name="class" add="o_cc o_cc2" separator=" "/>
+  </xpath>
+  <xpath expr="//div[hasclass('row')]" position="attributes">
+    <attribute name="data-row-count" add="10" remove="9" separator=" "/>
+  </xpath>
+  <xpath expr="(//div[hasclass('o_grid_item')])[1]" position="attributes">
+    <attribute name="style" add="grid-area: 1 / 4 / 11 / 13; --grid-item-padding-x: 0px;" remove="grid-area: 1 / 1 / 10 / 8;" separator=";"/>
+    <attribute name="class" add="g-col-lg-9 col-lg-9 g-height-10" remove="g-col-lg-7 col-lg-7 g-height-9" separator=" "/>
+  </xpath>
+  <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="attributes">
+    <attribute name="style" add="grid-area: 3 / 1 / 9 / 7;--grid-item-padding-y: 40px;" remove="grid-area: 2 / 7 / 9 / 13;--grid-item-padding-y: 56px;" separator=";"/>
+    <attribute name="class" add="g-height-6 o_cc1" remove="g-height-7 o_cc5" separator=" "/>
+  </xpath>
+  <xpath expr="(//div[hasclass('o_grid_item')])[2]" position="replace" mode="inner">
+    <p class="o_small">OUR MISSION</p>
+    <h3>Our goal is to ensure this day will be unforgettable for you and your beloved soulmate.</h3>
+  </xpath>
+</template>
+
+</odoo>
diff --git a/theme_yes/views/snippets/s_kickoff.xml b/theme_yes/views/snippets/s_kickoff.xml
index e67a927a0..6f4798c16 100644
--- a/theme_yes/views/snippets/s_kickoff.xml
+++ b/theme_yes/views/snippets/s_kickoff.xml
@@ -2,13 +2,33 @@
 <odoo>
 
 <template id="s_kickoff" inherit_id="website.s_kickoff">
-    <!-- Paragraph -->
-    <xpath expr="//p" position="replace" mode="inner">
-        Your Love Story begins here,
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="data-scroll-background-ratio"/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/11_001",'colors':{'c3':'o-color-3', 'c4':'rgba(0, 0, 0, 0.5)'},"flip":["y"]}</attribute>
+        <attribute name="style" add="background-image:url(/web/image/website.s_kickoff_default_image)" separator=";"/>
+        <attribute name="class" add="pt0 pb0 oe_img_bg o_bg_img_center o_full_screen_height" remove="s_parallax s_parallax_is_fixed pt232 pb88" separator=" "/>
     </xpath>
+        <!-- Remove Parallax + shape -->
+    <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
+    <xpath expr="//div[hasclass('o_we_shape')]" position="replace">
+        <div class="o_we_shape o_web_editor_Origins_11_001" style="background-image: url('/web_editor/shape/web_editor/Origins/11_001.svg?c3=o-color-3&amp;c4=rgba(0, 0, 0, 0.5)&amp;flip=y'); background-position: 50% 100%;"/>
+    </xpath>
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+        <attribute name="class" add="bg-black-25" remove="bg-black-50" separator=" "/>
+    </xpath>
+    <!-- Container -->
+    <xpath expr="//div[hasclass('container')]" position="attributes">
+        <attribute name="style" add="text-align: center;" separator=";"/>
+    </xpath>
+    <!-- Paragraph -->
+    <xpath expr="//p" position="replace"/>
     <!-- Title -->
-    <xpath expr="//h1" position="replace" mode="inner">
-        Let's Start Planning<br/>Your Dream Day!
+    <xpath expr="//h1" position="replace">
+        <h1 class="display-1" style="text-align: center;">Creating the perfect day<br/>just as you imagined</h1>
+    </xpath>
+    <xpath expr="//h1" position="after">
+        <a t-att-href="cta_btn_href" class="btn btn-lg btn-secondary">Get Started</a>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_quotes_carousel.xml b/theme_yes/views/snippets/s_quotes_carousel.xml
index a71bf276b..3f2cdf59c 100644
--- a/theme_yes/views/snippets/s_quotes_carousel.xml
+++ b/theme_yes/views/snippets/s_quotes_carousel.xml
@@ -2,18 +2,20 @@
 <odoo>
 
 <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
-    <xpath expr="//div[hasclass('carousel')]" position="attributes">
-        <attribute name="class" remove="carousel-dark" separator=" "/>
+    <!-- Carousel -->
+    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('carousel-inner')]" position="before">
+        <div class="o_we_shape o_web_editor_Floats_12"/>
     </xpath>
     <!-- Quote 1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="style" remove="background-position: 50% 50%;" add="background-position: 50% 25%;" separator=";"/>
-    </xpath>
-    <xpath expr="//blockquote" position="before">
-        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+        <attribute name="style"/>
     </xpath>
     <xpath expr="(//p[hasclass('s_blockquote_quote')])[1]" position="replace" mode="inner">
-        Thank you so much for being a part of our special day. It was so nice working with you. Without your help the day would not have been as perfect as it was.
+        They turned our dream into reality with ease and professionalism!
     </xpath>
     <xpath expr="(//div[hasclass('s_blockquote_author')])[1]//strong" position="replace" mode="inner">
         Linda and Paul
@@ -23,10 +25,10 @@
     </xpath>
     <!-- Quote 2 -->
     <xpath expr="(//*[hasclass('carousel-item')])[2]" position="attributes">
-        <attribute name="style" add="background-position: 50% 25%;" remove="background-position: 50% 50%;" separator=";"/>
+        <attribute name="style"/>
     </xpath>
-    <xpath expr="(//blockquote)[2]" position="before">
-        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+    <xpath expr="(//p[hasclass('s_blockquote_quote')])[1]" position="replace" mode="inner">
+        They made our big day stree-free and absolutely beautiful!
     </xpath>
     <xpath expr="(//div[hasclass('s_blockquote_author')])[2]//strong" position="replace" mode="inner">
         Jack and Mary
@@ -36,13 +38,10 @@
     </xpath>
     <!-- Quote 3 -->
     <xpath expr="(//*[hasclass('carousel-item')])[3]" position="attributes">
-        <attribute name="style" add="background-position: 50% 20%;" remove="background-position: 50% 50%;" separator=";"/>
-    </xpath>
-    <xpath expr="(//blockquote)[3]" position="before">
-        <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
+        <attribute name="style"/>
     </xpath>
     <xpath expr="(//p[hasclass('s_blockquote_quote')])[3]" position="replace" mode="inner">
-        From the beginning of our planning process, our planner was incredible! She made us feel heard, gave great suggestions and was always just an email or call away when we had any last minute questions. Couldn't have done it without her!
+        Everything was so well-coordinated, we couldn't have asked for more!
     </xpath>
     <xpath expr="(//div[hasclass('s_blockquote_author')])[3]//strong" position="replace" mode="inner">
         Rose and Peter
diff --git a/theme_yes/views/snippets/s_title.xml b/theme_yes/views/snippets/s_title.xml
index 23a0552ab..5f13d12f2 100644
--- a/theme_yes/views/snippets/s_title.xml
+++ b/theme_yes/views/snippets/s_title.xml
@@ -6,9 +6,18 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
     </xpath>
-    <!-- Title -->
-    <xpath expr="//h2" position="replace" mode="inner">
-        Meet our team
+    <xpath expr="//div[hasclass('container')]" position="replace" mode="inner">
+        <div class="row">
+            <div class="col-lg-8 offset-lg-2">
+                <h2>Meet our team</h2>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="configurator_s_title" inherit_id="website.configurator_s_title">
+    <xpath expr="//h2" position="replace">
+        <h2 class="display-3-fs" style="text-align: center">We are two passionate<br/>with years of experience</h2>
     </xpath>
 </template>