diff --git a/theme_anelusia/views/snippets/s_cover.xml b/theme_anelusia/views/snippets/s_cover.xml
index 19ddb433c..df005ff49 100644
--- a/theme_anelusia/views/snippets/s_cover.xml
+++ b/theme_anelusia/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height pt128 pb128" remove="pt96 pb96" separator=" "/>
+        <attribute name="class" add="o_half_screen_height pt128 pb128" remove="pt232 pb232" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
@@ -16,10 +16,6 @@
         <br/>
         <br/>
     </xpath>
-    <!-- Button -->
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
     <xpath expr="//a[hasclass('btn')]/t" position="replace" mode="inner">
         Discover
     </xpath>
diff --git a/theme_artists/views/snippets/s_cover.xml b/theme_artists/views/snippets/s_cover.xml
index 99012d720..fcb752c03 100644
--- a/theme_artists/views/snippets/s_cover.xml
+++ b/theme_artists/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt200 pb200 o_cc o_cc4" remove="pb96 pt96 s_parallax_bg parallax s_parallax_is_fixed bg-black-50" separator=" "/>
+        <attribute name="class" add="pt200 pb200" remove="pt232 pb232 s_parallax_bg parallax s_parallax_is_fixed bg-black-50" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/02","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 4f26ecbab..19f48dd80 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -23,9 +23,6 @@
         We create architecture, landscapes, interiors, product design and graphic design.<br/>
         Our methods allow us to explore a future that is equitable, data-driven, and green.
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
 </template>
 
 <!-- ======== PICTURE ======== -->
diff --git a/theme_avantgarde/views/new_page_template.xml b/theme_avantgarde/views/new_page_template.xml
index 4cb81f3bd..103081ae0 100644
--- a/theme_avantgarde/views/new_page_template.xml
+++ b/theme_avantgarde/views/new_page_template.xml
@@ -36,7 +36,7 @@
 
 <template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height o_cc4" separator=" "/>
     </xpath>
 </template>
 
@@ -44,19 +44,19 @@
 
 <template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="o_cc4" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height o_cc4" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="o_cc4" separator=" "/>
     </xpath>
 </template>
 
@@ -64,7 +64,7 @@
 
 <template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height o_cc4" separator=" "/>
     </xpath>
 </template>
 
@@ -80,7 +80,7 @@
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height o_cc4" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_aviato/views/snippets/s_cover.xml b/theme_aviato/views/snippets/s_cover.xml
index 9ee1d5bd6..1f543f4c1 100644
--- a/theme_aviato/views/snippets/s_cover.xml
+++ b/theme_aviato/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt192 pb192" remove="pt96 pb96 s_parallax_is_fixed" separator=" "/>
+        <attribute name="class" add="pt192 pb192" remove="pt232 pb232 s_parallax_is_fixed" separator=" "/>
     </xpath>
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;"/>
diff --git a/theme_beauty/views/snippets/s_cover.xml b/theme_beauty/views/snippets/s_cover.xml
index eff10a679..7f2a85975 100644
--- a/theme_beauty/views/snippets/s_cover.xml
+++ b/theme_beauty/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_full_screen_height bg-black-15 o_cc o_cc5" remove="bg-black-50" separator=" "/>
+        <attribute name="class" add="o_full_screen_height bg-black-15 o_cc5" remove="bg-black-50 o_cc4" separator=" "/>
     </xpath>
     <!-- Change position of background image -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 7c5e8dc34..3039c802b 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -4,7 +4,7 @@
 <!-- ======== COVER ======== -->
 <template id="s_cover" inherit_id="website.s_cover" name="Be Wise s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt200 pb200 o_cc o_cc5 oe_img_bg o_bg_img_center" remove="bg-black-50 s_parallax_is_fixed parallax pt96 pb96" separator=" "/>
+        <attribute name="class" add="pt200 pb200 o_cc5 oe_img_bg o_bg_img_center" remove="bg-black-50 s_parallax_is_fixed parallax pt232 pb232 o_cc4" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;</attribute>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">0</attribute>
@@ -15,10 +15,6 @@
     </xpath>
     <!-- Remove the background image for parallax -->
     <xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
-    <!-- Button -->
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg btn-secondary" remove="btn-primary" separator=" "/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Always at the top
diff --git a/theme_buzzy/views/snippets/s_cover.xml b/theme_buzzy/views/snippets/s_cover.xml
index 75f4636f4..53e4361b2 100644
--- a/theme_buzzy/views/snippets/s_cover.xml
+++ b/theme_buzzy/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt96 pb96 bg-black-50" separator=" "/>
+        <attribute name="class" add="o_cc5 pt112 pb112" remove="pt232 pb232 bg-black-50 o_cc4" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
     </xpath>
     <!-- Filter -->
diff --git a/theme_clean/views/snippets/s_cover.xml b/theme_clean/views/snippets/s_cover.xml
index 5b910ec48..274dd49e9 100644
--- a/theme_clean/views/snippets/s_cover.xml
+++ b/theme_clean/views/snippets/s_cover.xml
@@ -12,7 +12,7 @@
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h1" position="replace" mode="inner">
-        <b>Sell from your couch</b>
+        Sell from your couch
     </xpath>
     <xpath expr="//p[hasclass('lead')]" position="replace" mode="inner">
         Make your finances reach a new level with our online management system. <br/>Track every penny, directly from the comfort of your home.
diff --git a/theme_enark/views/snippets/s_cover.xml b/theme_enark/views/snippets/s_cover.xml
index be124bb92..fe1702bf5 100644
--- a/theme_enark/views/snippets/s_cover.xml
+++ b/theme_enark/views/snippets/s_cover.xml
@@ -2,9 +2,7 @@
 <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>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][2]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 0dc658e9f..3ac17b5f9 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -4,7 +4,7 @@
 <!-- ======== COVER ======== -->
 <template id="s_cover" inherit_id="website.s_cover" name="Graphene s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt160 pb240 s_parallax_no_overflow_hidden" remove="pt96 pb96 s_parallax_is_fixed s_parallax" separator=" "/>
+        <attribute name="class" add="pt160 pb240 s_parallax_no_overflow_hidden o_cc3" remove="pt232 pb232 s_parallax_is_fixed s_parallax o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//h1" position="replace"/>
     <xpath expr="//p" position="replace"/>
@@ -13,7 +13,7 @@
         <div class="row">
             <div class="col col-lg-11">
                 <h1 style="text-align: right;">
-                    <b>Making the difference.</b>
+                    Making the difference.
                 </h1>
                 <p class="lead o_default_snippet_text" style="text-align: right">
                     Our mission is to give customers the best experience.<br/>Extensive documentation &amp; guides, an active community,<br/>24/7 support make it a pleasure to work with us.
diff --git a/theme_kea/views/snippets/s_cover.xml b/theme_kea/views/snippets/s_cover.xml
index 7c72e733d..f99ade976 100644
--- a/theme_kea/views/snippets/s_cover.xml
+++ b/theme_kea/views/snippets/s_cover.xml
@@ -25,7 +25,7 @@
     </xpath>
     <!-- Button -->
     <xpath expr="//a[hasclass('btn')]" position="replace">
-        <a href="#0" class="btn btn-lg btn-primary">Discover more</a>
+        <a href="#0" class="btn btn-primary">Discover more</a>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/views/snippets/s_cover.xml b/theme_kiddo/views/snippets/s_cover.xml
index 8ff4d1fba..aca5725d3 100644
--- a/theme_kiddo/views/snippets/s_cover.xml
+++ b/theme_kiddo/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_full_screen_height o_cc o_cc1" remove="bg-black-50" separator=" "/>
+        <attribute name="class" add="o_full_screen_height o_cc1" remove="bg-black-50 o_cc4" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/14"}</attribute>
     </xpath>
 
@@ -44,9 +44,10 @@
     </xpath>
 
     <!-- Button -->
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][1]" position="attributes">
+        <attribute name="class" add="btn-primary" remove="btn-secondary" separator=" "/>
     </xpath>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][2]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_loftspace/views/snippets/s_cover.xml b/theme_loftspace/views/snippets/s_cover.xml
index b80016b49..e167b78c6 100644
--- a/theme_loftspace/views/snippets/s_cover.xml
+++ b/theme_loftspace/views/snippets/s_cover.xml
@@ -4,11 +4,11 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_full_screen_height pt232" remove="pt96" separator=" "/>
+        <attribute name="class" add="o_full_screen_height o_cc3" remove="o_cc4" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
-        <b>Bringing life to your interior</b>
+        Bringing life to your interior
     </xpath>
     <!-- Paragraphs -->
     <xpath expr="//p[hasclass('lead')]" position="replace" mode="inner">
@@ -21,9 +21,10 @@
     <xpath expr="//a[hasclass('btn')]/t" position="replace" mode="inner">
         Discover More
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][1]" position="attributes">
+        <attribute name="class" add="btn-primary" remove="btn-secondary" separator=" "/>
     </xpath>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][2]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 155a61db3..31f27ba03 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -33,7 +33,7 @@
  <template id="s_cover" inherit_id="website.s_cover" name="Monglia s_cover">
     <!-- Customize elements -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_full_screen_height o_cc o_cc5" separator=" "/>
+        <attribute name="class" add="o_full_screen_height o_cc5" remove="o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-25"/>
@@ -48,9 +48,6 @@
     <xpath expr="//p[3]" position="attributes">
         <attribute name="style" add="text-align: left;" remove="text-align: center;" separator=";"/>
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
     <!-- Create column -->
     <xpath expr="//div[hasclass('container')]" position="inside">
         <div class="row">
@@ -65,6 +62,11 @@
         <h2>21/22 December</h2><br/>
         <xpath expr="//div[hasclass('container')]/p"  position="move"/>
     </xpath>
+    <!-- Button -->
+    <xpath expr="//a[@t-att-href='cta_btn_href'][1]" position="attributes">
+        <attribute name="class" add="btn-primary" remove="btn-secondary" separator=" "/>
+    </xpath>
+    <xpath expr="//a[@t-att-href='cta_btn_href'][2]" position="replace"/>
 </template>
 
 <!-- ======== MEDIA LIST ======== -->
diff --git a/theme_nano/views/snippets/s_cover.xml b/theme_nano/views/snippets/s_cover.xml
index 3c9cad6dc..843680f8b 100644
--- a/theme_nano/views/snippets/s_cover.xml
+++ b/theme_nano/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt200 pb200" remove="parallax s_parallax_is_fixed bg-black-50 pt96 pb96" separator=" "/>
+        <attribute name="class" add="o_cc5 pt200 pb200" remove="parallax s_parallax_is_fixed bg-black-50 pt232 pb232 o_cc4" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
         <attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 0;</attribute>
     </xpath>
diff --git a/theme_notes/views/snippets/s_cover.xml b/theme_notes/views/snippets/s_cover.xml
index 2f0cd1315..3f2fb82b9 100644
--- a/theme_notes/views/snippets/s_cover.xml
+++ b/theme_notes/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
-        <b>Discover <br/>the Miraillet Festival</b>
+        Discover <br/>the Miraillet Festival
     </xpath>
 </template>
 
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 865acfe9f..2377c2726 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -15,7 +15,7 @@
 <!-- ==== Cover ===== -->
 <template id="s_cover" inherit_id="website.s_cover" name="Paptic s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 pt192 o_cc o_cc5" remove="pt96 pb96 bg-black-50 s_parallax_is_fixed s_parallax" separator=" "/>
+        <attribute name="class" add="pb0 pt192 o_cc5" remove="pt232 pb232 bg-black-50 s_parallax_is_fixed s_parallax o_cc4" separator=" "/>
         <attribute name="data-scroll-background-ratio">0</attribute>
     </xpath>
 
diff --git a/theme_treehouse/views/snippets/s_cover.xml b/theme_treehouse/views/snippets/s_cover.xml
index 22a1dad91..ab42ff4e3 100644
--- a/theme_treehouse/views/snippets/s_cover.xml
+++ b/theme_treehouse/views/snippets/s_cover.xml
@@ -4,14 +4,14 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="section" position="attributes">
-        <attribute name="class" add="pt160 pb160" remove="pt96 pb96" separator=" "/>
+        <attribute name="class" add="pt160 pb160" remove="pt232 pb232" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="before">
         <i class="fa fa-2x fa-bug d-block my-3 mx-auto rounded-circle bg-o-color-4 text-o-color-1"/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
-        <font style="font-size: 62px;"><b>— Life on Earth —</b></font>
+        <font style="font-size: 62px;">— Life on Earth —</font>
     </xpath>
     <!-- Paragraphs -->
     <xpath expr="//p" position="replace" mode="inner">
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index ccedf220f..85e9436c0 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -4,7 +4,7 @@
 <!-- ======== COVER ======== -->
 <template id="s_cover" inherit_id="website.s_cover" name="Vehicle s_cover">
     <xpath expr="section" position="attributes">
-        <attribute name="class" remove="pt96 pb96" add="o_full_screen_height pt0 pb256" separator=" "/>
+        <attribute name="class" remove="pt232 pb232" add="o_full_screen_height pt0 pb256" separator=" "/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         The New KORAN X
diff --git a/theme_yes/views/snippets/s_cover.xml b/theme_yes/views/snippets/s_cover.xml
index 177fb277f..3a58e835a 100644
--- a/theme_yes/views/snippets/s_cover.xml
+++ b/theme_yes/views/snippets/s_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_cover" inherit_id="website.s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height pt208 pb256" remove="pt96 pb96" separator=" "/>
+        <attribute name="class" add="o_half_screen_height pt208 pb256" remove="pt232 pb232" separator=" "/>
     </xpath>
     <!-- Filter -->
     <xpath expr="//*[hasclass('container')]" position="before">