From 76e9cbcdb672f54f8fef24af2ee3d96cb2955bf5 Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Mon, 23 Oct 2023 14:43:38 +0200
Subject: [PATCH] [FIX] theme_*: remove duplicate and conflicting classes

When default snippets have been updated to rely on color presets ([1]),
some themes were not adapted accordingly.
This also happened whenever paddings of base blocks were modified.
Because of this there are elements in themes for which some classes are
applied several times, and some where classes are not removed before
adding a contradicting one.

This commit adjusts the classes so that themes neither:
- produce snippets with duplicated classes
- produce snippets with contradicting classes (e.g. two different
bottom paddings on the same element)

This commit also fixes a typo from [2] which was the source of
duplicate classes.

[1]: https://github.com/odoo/odoo/commit/5953c4df6b9c08519f64a65c1cf5d5558d59f7d4
[2]: https://github.com/odoo/design-themes/commit/299d504df31bf179775eec1d37e71605c3637460#diff-86c142838104de06e89f629c51cf791464538dc8899e6a3f00c24f69638db409R34

task-3562147

X-original-commit: f3da06dc68b23816a4a884f39d0198727771cc5b
Part-of: odoo/design-themes#744
---
 theme_anelusia/views/snippets/s_call_to_action.xml |  3 ---
 theme_anelusia/views/snippets/s_company_team.xml   |  2 +-
 theme_artists/views/snippets/s_carousel.xml        |  2 +-
 theme_artists/views/snippets/s_comparisons.xml     |  2 +-
 theme_artists/views/snippets/s_features.xml        |  4 ++--
 theme_artists/views/snippets/s_features_grid.xml   |  6 +++---
 theme_artists/views/snippets/s_process_steps.xml   |  4 ++--
 theme_artists/views/snippets/s_three_columns.xml   |  2 +-
 theme_avantgarde/views/customizations.xml          |  5 +----
 theme_beauty/views/snippets/s_company_team.xml     |  2 +-
 theme_bewise/views/customizations.xml              | 14 +++++---------
 theme_bistro/views/snippets/s_numbers.xml          |  2 +-
 theme_bistro/views/snippets/s_product_catalog.xml  |  2 +-
 theme_bistro/views/snippets/s_quotes_carousel.xml  |  3 ---
 theme_bookstore/views/snippets/s_masonry_block.xml |  3 +--
 theme_buzzy/views/snippets/s_comparisons.xml       |  2 +-
 theme_buzzy/views/snippets/s_features.xml          |  2 +-
 theme_buzzy/views/snippets/s_media_list.xml        |  4 ----
 theme_buzzy/views/snippets/s_process_steps.xml     |  2 +-
 theme_buzzy/views/snippets/s_three_columns.xml     |  5 -----
 theme_buzzy/views/snippets/s_timeline.xml          |  8 ++++----
 theme_clean/views/snippets/s_features.xml          |  4 ++--
 theme_clean/views/snippets/s_quotes_carousel.xml   |  1 -
 theme_graphene/views/customizations.xml            |  4 ++--
 theme_kea/views/snippets/s_features.xml            |  6 +++---
 theme_kea/views/snippets/s_media_list.xml          |  2 +-
 theme_kea/views/snippets/s_numbers.xml             |  2 +-
 theme_loftspace/views/snippets/s_comparisons.xml   |  2 +-
 theme_loftspace/views/snippets/s_features.xml      |  4 ++--
 theme_loftspace/views/snippets/s_features_grid.xml |  4 ++--
 theme_loftspace/views/snippets/s_media_list.xml    |  4 ----
 theme_loftspace/views/snippets/s_three_columns.xml |  2 +-
 theme_monglia/views/customizations.xml             |  4 ++--
 .../views/snippets/s_comparisons.xml               |  4 ++--
 theme_odoo_experts/views/snippets/s_media_list.xml |  2 +-
 .../views/snippets/s_three_columns.xml             |  2 +-
 theme_paptic/views/customizations.xml              | 10 +++++-----
 theme_real_estate/views/snippets/s_image_text.xml  |  2 +-
 theme_real_estate/views/snippets/s_text_block.xml  |  2 +-
 theme_vehicle/views/customizations.xml             | 12 ++++++------
 theme_yes/views/snippets/s_carousel.xml            |  2 +-
 theme_yes/views/snippets/s_quotes_carousel.xml     |  1 -
 theme_zap/views/snippets/s_numbers.xml             |  2 +-
 theme_zap/views/snippets/s_references.xml          | 12 ++++++------
 44 files changed, 70 insertions(+), 99 deletions(-)

diff --git a/theme_anelusia/views/snippets/s_call_to_action.xml b/theme_anelusia/views/snippets/s_call_to_action.xml
index 7bccfd974..216c0cd21 100644
--- a/theme_anelusia/views/snippets/s_call_to_action.xml
+++ b/theme_anelusia/views/snippets/s_call_to_action.xml
@@ -34,9 +34,6 @@
     <xpath expr="(//p)[2]" position="attributes">
         <attribute name="style">text-align: center;</attribute>
     </xpath>
-    <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 it
     </xpath>
diff --git a/theme_anelusia/views/snippets/s_company_team.xml b/theme_anelusia/views/snippets/s_company_team.xml
index 6a457b4f9..a28f4af55 100644
--- a/theme_anelusia/views/snippets/s_company_team.xml
+++ b/theme_anelusia/views/snippets/s_company_team.xml
@@ -4,7 +4,7 @@
 <template id="s_company_team" inherit_id="website.s_company_team">
     <!-- Section -->
     <xpath expr="section" position="attributes">
-        <attribute name="class" add="pt64 pb64" remove="pt48 pb24" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt48 pb48" separator=" "/>
     </xpath>
 
     <!-- Team #01 -->
diff --git a/theme_artists/views/snippets/s_carousel.xml b/theme_artists/views/snippets/s_carousel.xml
index c4c8d13bf..f43871e1a 100644
--- a/theme_artists/views/snippets/s_carousel.xml
+++ b/theme_artists/views/snippets/s_carousel.xml
@@ -42,7 +42,7 @@
 
     <!-- Carousel-item #03 -->
     <xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pb112 pt112" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt152 pb152" remove="pb128 pt128" separator=" "/>
     </xpath>
     <!-- Shape & filter -->
     <xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
diff --git a/theme_artists/views/snippets/s_comparisons.xml b/theme_artists/views/snippets/s_comparisons.xml
index 2beb4cce4..80524fb7d 100644
--- a/theme_artists/views/snippets/s_comparisons.xml
+++ b/theme_artists/views/snippets/s_comparisons.xml
@@ -28,7 +28,7 @@
     </xpath>
     <!-- Card #3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Card #3 - Button -->
     <xpath expr="(//a[hasclass('btn')])[3]" position="attributes">
diff --git a/theme_artists/views/snippets/s_features.xml b/theme_artists/views/snippets/s_features.xml
index ec27677cb..68705c594 100644
--- a/theme_artists/views/snippets/s_features.xml
+++ b/theme_artists/views/snippets/s_features.xml
@@ -13,11 +13,11 @@
     </xpath>
     <!-- Feature #01 - Icon -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Feature #03 - Icon -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_features_grid.xml b/theme_artists/views/snippets/s_features_grid.xml
index f0b35893e..2f51ee09f 100644
--- a/theme_artists/views/snippets/s_features_grid.xml
+++ b/theme_artists/views/snippets/s_features_grid.xml
@@ -17,13 +17,13 @@
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_process_steps.xml b/theme_artists/views/snippets/s_process_steps.xml
index 2c421c581..7baca6f51 100644
--- a/theme_artists/views/snippets/s_process_steps.xml
+++ b/theme_artists/views/snippets/s_process_steps.xml
@@ -8,10 +8,10 @@
     </xpath>
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-5" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
         <attribute name="class" add="bg-o-color-5" remove="bg-o-color-3" separator=" "/>
diff --git a/theme_artists/views/snippets/s_three_columns.xml b/theme_artists/views/snippets/s_three_columns.xml
index 18e3b54cb..5bc8bf24b 100644
--- a/theme_artists/views/snippets/s_three_columns.xml
+++ b/theme_artists/views/snippets/s_three_columns.xml
@@ -4,7 +4,7 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4 o_colored_level" remove="o_cc2" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index 4b8374540..66f7d0520 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -164,7 +164,7 @@
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Avantgarde s_call_to_action">
 
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc3 o_half_screen_height pt0" remove="pt48" separator=" "/>
+        <attribute name="class" add="o_half_screen_height pt0" remove="pt48" separator=" "/>
     </xpath>
     <xpath expr="//h3" position="replace">
         <h3 style="text-align: right;"><b>Since 1992</b> creating around the world.</h3>
@@ -184,9 +184,6 @@
     <xpath expr="//div[hasclass('col-lg-4')]/p" position="attributes">
         <attribute name="style" add="text-align: left;" remove="text-align: right;" separator=";"/>
     </xpath>
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
 </template>
 
 <template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Avantgarde s_call_to_action">
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index 6e7117086..fa6f44615 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -4,7 +4,7 @@
 <template id="s_company_team" inherit_id="website.s_company_team">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4 pt80 pb80" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4 pt80 pb80" remove="pb48 pt48" separator=" "/>
     </xpath>
     <!-- Titles -->
     <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace" mode="inner">
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 3349b366d..80f590cc2 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -213,10 +213,6 @@
     <xpath expr="//div[hasclass('col-lg-9')]/p" position="replace" mode="inner">
         Join them and increase your chances to get hired.
     </xpath>
-    <!-- Button -->
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg" separator=" "/>
-    </xpath>
 </template>
 
 <!-- ======== TEAM ======== -->
@@ -329,13 +325,13 @@
 <template id="s_features" inherit_id="website.s_features" name="Be Wise s_features">
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-4" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-4" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[2]" position="attributes">
         <attribute name="class" add="bg-o-color-4" remove="bg-o-color-5" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-4" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-4" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
@@ -417,13 +413,13 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid" name="Be Wise s_features_grid">
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
         <attribute name="class" add="rounded-circle" remove="fa-2x rounded" separator=" "/>
diff --git a/theme_bistro/views/snippets/s_numbers.xml b/theme_bistro/views/snippets/s_numbers.xml
index a243be880..78438d49a 100644
--- a/theme_bistro/views/snippets/s_numbers.xml
+++ b/theme_bistro/views/snippets/s_numbers.xml
@@ -4,7 +4,7 @@
 <template id="s_numbers" inherit_id="website.s_numbers">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5 pt80 pb80" remove="o_cc2 pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc5 pt80 pb80" remove="o_cc2 pt24 pb24" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index 717b8082d..ff954de81 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -5,7 +5,7 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="style"/>
-        <attribute name="class" add="s_parallax parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt48 pb32" separator=" "/>
+        <attribute name="class" add="parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt48 pb32" separator=" "/>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
diff --git a/theme_bistro/views/snippets/s_quotes_carousel.xml b/theme_bistro/views/snippets/s_quotes_carousel.xml
index be477a14f..c38651d5f 100644
--- a/theme_bistro/views/snippets/s_quotes_carousel.xml
+++ b/theme_bistro/views/snippets/s_quotes_carousel.xml
@@ -12,9 +12,6 @@
         <attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
         <attribute name="style">background-image: none;</attribute>
     </xpath>
-    <xpath expr="//blockquote[1]" position="attributes">
-        <attribute name="class" add="mx-auto" remove="me-auto" separator=" "/>
-    </xpath>
     <xpath expr="//p[1]" position="replace" mode="inner">
         Cosy and friendly, good atmosphere and super food. Especially the spiced fruit crumble.
     </xpath>
diff --git a/theme_bookstore/views/snippets/s_masonry_block.xml b/theme_bookstore/views/snippets/s_masonry_block.xml
index 807d695ad..a1062b99a 100644
--- a/theme_bookstore/views/snippets/s_masonry_block.xml
+++ b/theme_bookstore/views/snippets/s_masonry_block.xml
@@ -22,7 +22,6 @@
     <!-- Little block #2 -->
     <!-- Main div -->
     <xpath expr="//div[hasclass('col-lg-3')][2]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1" remove="bg-200" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/02","flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-3')][2]/h3" position="before">
@@ -40,7 +39,7 @@
     <!-- Little block #3 -->
     <!-- Main div -->
     <xpath expr="//div[hasclass('col-lg-3')][3]" position="attributes">
-        <attribute name="class" add="o_cc o_cc5" remove="bg-200" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="bg-200 o_cc4" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/04","flip":[]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-3')][3]/h3" position="before">
diff --git a/theme_buzzy/views/snippets/s_comparisons.xml b/theme_buzzy/views/snippets/s_comparisons.xml
index 5943a4a31..9a22c9250 100644
--- a/theme_buzzy/views/snippets/s_comparisons.xml
+++ b/theme_buzzy/views/snippets/s_comparisons.xml
@@ -22,7 +22,7 @@
         <attribute name="class" add="pt88" remove="pt32" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('row')]//div[3]/div" position="attributes">
-        <attribute name="class" add="shadow bg-o-color-5" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="shadow bg-o-color-5" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_features.xml b/theme_buzzy/views/snippets/s_features.xml
index c386afadd..f0eee6531 100644
--- a/theme_buzzy/views/snippets/s_features.xml
+++ b/theme_buzzy/views/snippets/s_features.xml
@@ -17,7 +17,7 @@
     </xpath>
     <!-- Feature #3 - Icon -->
     <xpath expr="//div[hasclass('row')]//div[3]//i" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_media_list.xml b/theme_buzzy/views/snippets/s_media_list.xml
index f7872a6bf..095e12a47 100644
--- a/theme_buzzy/views/snippets/s_media_list.xml
+++ b/theme_buzzy/views/snippets/s_media_list.xml
@@ -2,10 +2,6 @@
 <odoo>
 
 <template id="s_media_list" inherit_id="website.s_media_list">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_colored_level" separator=" "/>
-    </xpath>
     <!-- Media item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]/div" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
diff --git a/theme_buzzy/views/snippets/s_process_steps.xml b/theme_buzzy/views/snippets/s_process_steps.xml
index 7b8484ce6..9178d7426 100644
--- a/theme_buzzy/views/snippets/s_process_steps.xml
+++ b/theme_buzzy/views/snippets/s_process_steps.xml
@@ -17,7 +17,7 @@
     </xpath>
     <!-- Icon #3 -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #4 -->
     <xpath expr="(//i)[4]" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_three_columns.xml b/theme_buzzy/views/snippets/s_three_columns.xml
index f37bfe8fe..d2d8b3835 100644
--- a/theme_buzzy/views/snippets/s_three_columns.xml
+++ b/theme_buzzy/views/snippets/s_three_columns.xml
@@ -2,11 +2,6 @@
 <odoo>
 
 <template id="s_three_columns" inherit_id="website.s_three_columns">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_colored_level" separator=" "/>
-    </xpath>
-
     <!-- Column #1 -->
     <!-- Img -->
     <xpath expr="//div[hasclass('card')]//img" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_timeline.xml b/theme_buzzy/views/snippets/s_timeline.xml
index 25fe9efc8..2d52150f5 100644
--- a/theme_buzzy/views/snippets/s_timeline.xml
+++ b/theme_buzzy/views/snippets/s_timeline.xml
@@ -8,19 +8,19 @@
     </xpath>
     <!-- Icon #1 -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #2 -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #3 -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #4 -->
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_features.xml b/theme_clean/views/snippets/s_features.xml
index b65909acf..60bcfafda 100644
--- a/theme_clean/views/snippets/s_features.xml
+++ b/theme_clean/views/snippets/s_features.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- First column : icon -->
     <xpath expr="//div[hasclass('row')]//div//i" position="attributes">
-        <attribute name="class" add="bg-o-color-4 fa-shield" remove="bg-primary fa-gear" separator=" "/>
+        <attribute name="class" add="bg-o-color-4 fa-shield" remove="bg-o-color-1 fa-gear" separator=" "/>
     </xpath>
     <!-- First column : title -->
     <xpath expr="//div[hasclass('row')]//div//h3" position="replace" mode="inner">
@@ -24,7 +24,7 @@
     </xpath>
     <!-- Third column : icon -->
     <xpath expr="//div[hasclass('row')]//div[3]//i" position="attributes">
-        <attribute name="class" add="fa-star bg-o-color-2" remove="fa-leaf" separator=" "/>
+        <attribute name="class" add="fa-star" remove="fa-leaf" separator=" "/>
     </xpath>
     <!-- Third column : title -->
     <xpath expr="//div[hasclass('row')]//div[3]//h3" position="replace" mode="inner">
diff --git a/theme_clean/views/snippets/s_quotes_carousel.xml b/theme_clean/views/snippets/s_quotes_carousel.xml
index 18791a1a9..aedc8b851 100644
--- a/theme_clean/views/snippets/s_quotes_carousel.xml
+++ b/theme_clean/views/snippets/s_quotes_carousel.xml
@@ -4,7 +4,6 @@
 <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
     <!-- Section -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="class" add="oe_img_bg o_bg_img_center" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_quotes_carousel_demo_image_3'); background-position: 50% 50%;</attribute>
     </xpath>
 </template>
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 83535d3b2..60bf17883 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -62,7 +62,7 @@
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
     <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-lg btn-secondary" remove="btn-primary" separator=" "/>
+        <attribute name="class" add="btn-lg" remove="btn-primary" separator=" "/>
     </xpath>
 </template>
 
@@ -291,7 +291,7 @@
         Put your people at the heart of your marketing with tools that help you get to know your audience <br/>and see who you should be talking to.
     </xpath>
     <xpath expr="//img" position="attributes">
-        <attribute name="class" add="p-0 border-0" separator=" " />
+        <attribute name="class" add="p-0 border-0" remove="padding-large" separator=" " />
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_features.xml b/theme_kea/views/snippets/s_features.xml
index 604a5794f..8432edfdb 100644
--- a/theme_kea/views/snippets/s_features.xml
+++ b/theme_kea/views/snippets/s_features.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//div[hasclass('row')]/div[1]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 pt48 pb48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 pt48 pb48" remove="pt32 pb32" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div[1]/i" position="replace">
         <i class="fa fa-2x fa-image bg-o-color-1 m-3 rounded-circle"/>
@@ -21,7 +21,7 @@
     </xpath>
     <!-- Column #02 -->
     <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 pt48 pb48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 pt48 pb48" remove="pt32 pb32" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div[2]/i" position="replace">
         <i class="fa fa-2x fa-eye bg-o-color-5 m-3 rounded-circle"/>
@@ -34,7 +34,7 @@
     </xpath>
     <!-- Column #03 -->
     <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 pt48 pb48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 pt48 pb48" remove="pt32 pb32" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('row')]/div[3]/i" position="attributes">
         <attribute name="class" add="fa-2x fa-microphone rounded-circle" remove="fa-3x fa-leaf rounded" separator=" "/>
diff --git a/theme_kea/views/snippets/s_media_list.xml b/theme_kea/views/snippets/s_media_list.xml
index 439a2544b..d4e6c607f 100644
--- a/theme_kea/views/snippets/s_media_list.xml
+++ b/theme_kea/views/snippets/s_media_list.xml
@@ -4,7 +4,7 @@
 <template id="s_media_list" inherit_id="website.s_media_list">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2 pt64 pb64" remove="o_cc1 pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/01","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_kea/views/snippets/s_numbers.xml b/theme_kea/views/snippets/s_numbers.xml
index b40f846da..24e32eda7 100644
--- a/theme_kea/views/snippets/s_numbers.xml
+++ b/theme_kea/views/snippets/s_numbers.xml
@@ -4,7 +4,7 @@
 <template id="s_numbers" inherit_id="website.s_numbers">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pt0 pb48" remove="pt24 pb24" separator=" "/>
+        <attribute name="class" add="pt0 pb48" remove="pt24 pb24" separator=" "/>
     </xpath>
     <!-- Replace h6 by paragraphs -->
     <xpath expr="//h6" position="replace" mode="inner">
diff --git a/theme_loftspace/views/snippets/s_comparisons.xml b/theme_loftspace/views/snippets/s_comparisons.xml
index a64e4da0f..a9d65f9f1 100644
--- a/theme_loftspace/views/snippets/s_comparisons.xml
+++ b/theme_loftspace/views/snippets/s_comparisons.xml
@@ -16,7 +16,7 @@
     </xpath>
     <!-- Card #3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_features.xml b/theme_loftspace/views/snippets/s_features.xml
index 4865b0bf2..985152461 100644
--- a/theme_loftspace/views/snippets/s_features.xml
+++ b/theme_loftspace/views/snippets/s_features.xml
@@ -4,7 +4,7 @@
 <template id="s_features" inherit_id="website.s_features">
     <!-- First column : icon -->
     <xpath expr="//div[hasclass('row')]//div//i" position="attributes">
-        <attribute name="class" add="bg-o-color-3" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-3" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Second column : icon -->
     <xpath expr="//div[hasclass('row')]//div[2]//i" position="attributes">
@@ -12,7 +12,7 @@
     </xpath>
     <!-- Third column : icon -->
     <xpath expr="//div[hasclass('row')]//div[3]//i" position="attributes">
-        <attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_features_grid.xml b/theme_loftspace/views/snippets/s_features_grid.xml
index f22590aa4..059feb8ff 100644
--- a/theme_loftspace/views/snippets/s_features_grid.xml
+++ b/theme_loftspace/views/snippets/s_features_grid.xml
@@ -4,7 +4,7 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid">
     <!-- Item #2 -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
@@ -12,7 +12,7 @@
     </xpath>
     <!-- Item #5 -->
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-1" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-circle bg-o-color-1" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Item #6 -->
     <xpath expr="(//i)[6]" position="attributes">
diff --git a/theme_loftspace/views/snippets/s_media_list.xml b/theme_loftspace/views/snippets/s_media_list.xml
index 52ce95580..bf14eeab8 100644
--- a/theme_loftspace/views/snippets/s_media_list.xml
+++ b/theme_loftspace/views/snippets/s_media_list.xml
@@ -2,10 +2,6 @@
 <odoo>
 
 <template id="s_media_list" inherit_id="website.s_media_list">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_colored_level" separator=" "/>
-    </xpath>
     <!-- Media List Item #1 -->
     <xpath expr="//div[hasclass('s_media_list_item')]//div[hasclass('row')]" position="attributes">
         <attribute name="style">border-radius: 3px !important; box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.05) !important;</attribute>
diff --git a/theme_loftspace/views/snippets/s_three_columns.xml b/theme_loftspace/views/snippets/s_three_columns.xml
index 7437fc577..c246fbb83 100644
--- a/theme_loftspace/views/snippets/s_three_columns.xml
+++ b/theme_loftspace/views/snippets/s_three_columns.xml
@@ -4,7 +4,7 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt96 pb96 o_colored_level" remove="pt32 pb32 bg-200" separator=" "/>
+        <attribute name="class" add="pt96 pb96" remove="pt32 pb32 bg-200" separator=" "/>
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index 9e8a3605b..37bcbb885 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -179,7 +179,7 @@
 <!-- ======== CALL TO ACTION ======== -->
 <template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Monglia s_call_to_action">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
     </xpath>
     <xpath expr="//h3" position="replace">
         <h3 style="text-align: left;"><b>APPLY FOR OUR V.I.P. CARD</b></h3>
@@ -195,7 +195,7 @@
 <!-- ======== 3-COLUMNS ======== -->
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 o_cc o_cc5" remove="pb32" separator=" "/>
+        <attribute name="class" add="pb0 o_cc5" remove="pb32 o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//h3" position="replace" mode="inner">
         Wilson Holt
diff --git a/theme_odoo_experts/views/snippets/s_comparisons.xml b/theme_odoo_experts/views/snippets/s_comparisons.xml
index c59841139..d3f0ffafe 100644
--- a/theme_odoo_experts/views/snippets/s_comparisons.xml
+++ b/theme_odoo_experts/views/snippets/s_comparisons.xml
@@ -14,14 +14,14 @@
         <attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('card')])[2]//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" add="btn-secondary" remove="bg-primary" separator=" "/>
+        <attribute name="class" add="btn-secondary" remove="btn-primary" separator=" "/>
     </xpath>
     <!-- Box #03 -->
     <xpath expr="//div[hasclass('row')]//div[3]" position="attributes">
         <attribute name="class" add="pt80" remove="pt32" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_media_list.xml b/theme_odoo_experts/views/snippets/s_media_list.xml
index bb1c5b10e..eb5740bf8 100644
--- a/theme_odoo_experts/views/snippets/s_media_list.xml
+++ b/theme_odoo_experts/views/snippets/s_media_list.xml
@@ -4,7 +4,7 @@
 <template id="s_media_list" inherit_id="website.s_media_list">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt120 pb120 o_cc4 o_colored_level" remove="pt32 pb32 o_cc2" separator=" "/>
+        <attribute name="class" add="pt120 pb120 o_cc4" remove="pt32 pb32 o_cc2" separator=" "/>
     </xpath>
 
     <!-- Row #1 -->
diff --git a/theme_odoo_experts/views/snippets/s_three_columns.xml b/theme_odoo_experts/views/snippets/s_three_columns.xml
index 4a673c237..8968cb5fc 100644
--- a/theme_odoo_experts/views/snippets/s_three_columns.xml
+++ b/theme_odoo_experts/views/snippets/s_three_columns.xml
@@ -4,7 +4,7 @@
 <template id="s_three_columns" inherit_id="website.s_three_columns">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt72 pb72 o_colored_level" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt72 pb72" remove="pt32 pb32" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/04","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 6470e5bbf..f1120869b 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -218,7 +218,7 @@
 <!-- ==== Three Columns ===== -->
 <template id="s_three_columns" inherit_id="website.s_three_columns" name="Paptic s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pt32 pb32 o_cc2" add="pt120 pb120 o_cc3 o_colored_level" separator=" "/>
+        <attribute name="class" remove="pt32 pb32 o_cc2" add="pt120 pb120 o_cc3" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('row')]" position="before">
         <h3 style="text-align: center;"><font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">SUCCESS STORIES</font></h3>
@@ -391,7 +391,7 @@
         <attribute name="class" add="o_cc o_cc2" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('col-lg-4')][3]/i" position="attributes">
-        <attribute name="class" add="bg-o-color-3" remove="bg-secondary" separator=" "/>
+        <attribute name="class" add="bg-o-color-3" remove="bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
@@ -433,15 +433,15 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid" name="Paptic s_features_grid">
     <!-- Icon #4 -->
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #5 -->
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Icon #6 -->
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_real_estate/views/snippets/s_image_text.xml b/theme_real_estate/views/snippets/s_image_text.xml
index 44cb7e014..3dc0412f3 100644
--- a/theme_real_estate/views/snippets/s_image_text.xml
+++ b/theme_real_estate/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb32 pt32" separator=" "/>
     </xpath>
 
     <!-- Title -->
diff --git a/theme_real_estate/views/snippets/s_text_block.xml b/theme_real_estate/views/snippets/s_text_block.xml
index 0009f57da..95f6bd1ef 100644
--- a/theme_real_estate/views/snippets/s_text_block.xml
+++ b/theme_real_estate/views/snippets/s_text_block.xml
@@ -4,7 +4,7 @@
 <template id="s_text_block" inherit_id="website.s_text_block">
     <!-- Section/span -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4 pb56 pt56" remove="pt96 pb96" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4 pb56 pt56" remove="pt40 pb40" separator=" "/>
     </xpath>
     <xpath expr="//p" position="replace" mode="inner">
         We are <b>Odoo Travel Agency</b>, dedicated to making your vacation dreams come true! Overwhelmed with too many choices on the internet? We offer you answers, support, advice, and itineraries that will amaze you with their <b>thoroughness and thoughtfulness</b>.
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index c64ecee47..5c38442ce 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -300,27 +300,27 @@
     </xpath>
     <!-- Item #1 -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-primary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #2 -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-primary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
     </xpath>
         <!-- Item #3 -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-primary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Item #5 -->
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
     <!-- Item #6 -->
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-secondary" separator=" "/>
+        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_carousel.xml b/theme_yes/views/snippets/s_carousel.xml
index 5bbfea342..e6d10225b 100644
--- a/theme_yes/views/snippets/s_carousel.xml
+++ b/theme_yes/views/snippets/s_carousel.xml
@@ -31,7 +31,7 @@
     <xpath expr="(//*[hasclass('container')])[3]" position="before">
         <div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>
     </xpath>
-    <xpath expr="//*[hasclass('carousel-item')][2]" position="attributes">
+    <xpath expr="//*[hasclass('carousel-item')][3]" position="attributes">
         <attribute name="class" add="pt152 pb152" remove="pt128 pb128" separator=" "/>
     </xpath>
     <xpath expr="(//*[hasclass('carousel-content')])[3]" position="replace">
diff --git a/theme_yes/views/snippets/s_quotes_carousel.xml b/theme_yes/views/snippets/s_quotes_carousel.xml
index c55fbeb35..4d256684c 100644
--- a/theme_yes/views/snippets/s_quotes_carousel.xml
+++ b/theme_yes/views/snippets/s_quotes_carousel.xml
@@ -4,7 +4,6 @@
 <template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
     <!-- Quote 1 -->
     <xpath expr="//div[hasclass('carousel-item')]" position="attributes">
-        <attribute name="class" add="oe_img_bg o_bg_img_center" separator=" "/>
         <attribute name="style" add="background-image: url('/web/image/website.s_quotes_carousel_demo_image_0'); background-position: 50% 25%;" separator="; "/>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
diff --git a/theme_zap/views/snippets/s_numbers.xml b/theme_zap/views/snippets/s_numbers.xml
index ae846a109..5cc88e8c0 100644
--- a/theme_zap/views/snippets/s_numbers.xml
+++ b/theme_zap/views/snippets/s_numbers.xml
@@ -4,7 +4,7 @@
 <template id="s_numbers" inherit_id="website.s_numbers">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80" remove="pt48 pb24" separator=" "/>
+        <attribute name="class" add="pt80 pb80" remove="pt24 pb24" separator=" "/>
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
diff --git a/theme_zap/views/snippets/s_references.xml b/theme_zap/views/snippets/s_references.xml
index c38df9b72..64a6da185 100644
--- a/theme_zap/views/snippets/s_references.xml
+++ b/theme_zap/views/snippets/s_references.xml
@@ -16,32 +16,32 @@
     </xpath>
     <!-- Column #01 -->
     <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
     <!-- Column #02 -->
     <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
     <!-- Column #03 -->
     <xpath expr="//*[hasclass('row')]/*[3]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
     <!-- Column #04 -->
     <xpath expr="//*[hasclass('row')]/*[4]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
     <!-- Column #05 -->
     <xpath expr="//*[hasclass('row')]/*[5]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
     <!-- Column #06 -->
     <xpath expr="//*[hasclass('row')]/*[6]" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 rounded pt48 pb48" remove="pt16 pb16" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=" "/>
     </xpath>
 </template>