diff --git a/theme_anelusia/views/snippets/s_numbers_boxed.xml b/theme_anelusia/views/snippets/s_numbers_boxed.xml
index 6c9f73097..07b2b0521 100644
--- a/theme_anelusia/views/snippets/s_numbers_boxed.xml
+++ b/theme_anelusia/views/snippets/s_numbers_boxed.xml
@@ -12,21 +12,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_anelusia/views/snippets/s_text_cover.xml b/theme_anelusia/views/snippets/s_text_cover.xml
index b911b3e60..ffc79dcc6 100644
--- a/theme_anelusia/views/snippets/s_text_cover.xml
+++ b/theme_anelusia/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
     </xpath>
     <!-- Container -->
     <xpath expr="//div[hasclass('row')]" position="attributes">
diff --git a/theme_artists/__manifest__.py b/theme_artists/__manifest__.py
index 73e22966c..d2e82f9d3 100644
--- a/theme_artists/__manifest__.py
+++ b/theme_artists/__manifest__.py
@@ -113,6 +113,7 @@
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_form_aside.xml',
         'views/snippets/s_numbers_framed.xml',
+        'views/snippets/s_company_team_card.xml',
         'views/new_page_template.xml',
     ],
     'images': [
diff --git a/theme_aviato/views/snippets/s_company_team_card.xml b/theme_artists/views/snippets/s_company_team_card.xml
similarity index 56%
rename from theme_aviato/views/snippets/s_company_team_card.xml
rename to theme_artists/views/snippets/s_company_team_card.xml
index ca9ec1d4b..d65c4f01f 100644
--- a/theme_aviato/views/snippets/s_company_team_card.xml
+++ b/theme_artists/views/snippets/s_company_team_card.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Aviato s_company_team_card">
+<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Artists's s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_numbers_charts.xml b/theme_artists/views/snippets/s_numbers_charts.xml
index d2ea98efc..e20eca465 100644
--- a/theme_artists/views/snippets/s_numbers_charts.xml
+++ b/theme_artists/views/snippets/s_numbers_charts.xml
@@ -6,19 +6,19 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
-    <!-- Chart card -->
-    <xpath expr="//div[hasclass('o_grid_item')]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
-    </xpath>
     <!-- Progress bars -->
     <xpath expr="//div[hasclass('progress-bar')]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('progress-bar')])[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-5" separator=" "/>
+    </xpath>
+    <!-- Chart card -->
+    <xpath expr="//div[hasclass('o_grid_item')][4]" position="attributes">
+        <attribute name="class" add="border" remove="o_cc o_cc2" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('s_chart')])" position="attributes">
-        <attribute name="data-data">{"labels":["First","Second"],"datasets":[{"label":"One","data":["25","75"],"backgroundColor":["o-color-1","o-color-2"],"borderColor":["",""]}]}</attribute>
+        <attribute name="data-data">{"labels":["First","Second"],"datasets":[{"label":"One","data":["25","75"],"backgroundColor":["o-color-2","o-color-1"],"borderColor":["",""]}]}</attribute>
     </xpath>
 </template>
 
diff --git a/theme_artists/views/snippets/s_text_cover.xml b/theme_artists/views/snippets/s_text_cover.xml
index b221c4f25..6d0685929 100644
--- a/theme_artists/views/snippets/s_text_cover.xml
+++ b/theme_artists/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         Share Art.<br/>Effortlessly.
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index a27f33f75..0f2337b81 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -881,21 +881,21 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
@@ -903,26 +903,6 @@
 
 </template>
 
-<!-- ======== COMPANY TEAM GRID ======== -->
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Avantgarde s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
 <!-- ======== SPLIT INTRO ======== -->
 <template id="s_split_intro" inherit_id="website.s_split_intro">
     <!-- Title -->
diff --git a/theme_aviato/__manifest__.py b/theme_aviato/__manifest__.py
index 36ffe84c0..7ced152cd 100644
--- a/theme_aviato/__manifest__.py
+++ b/theme_aviato/__manifest__.py
@@ -41,7 +41,6 @@
         'views/snippets/s_striped_center_top.xml',
         'views/snippets/s_showcase.xml',
         'views/snippets/s_quadrant.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_unveil.xml',
         'views/snippets/s_accordion_image.xml',
         'views/snippets/s_key_benefits.xml',
diff --git a/theme_aviato/views/snippets/s_numbers_boxed.xml b/theme_aviato/views/snippets/s_numbers_boxed.xml
index 385e8b592..917bc70f3 100644
--- a/theme_aviato/views/snippets/s_numbers_boxed.xml
+++ b/theme_aviato/views/snippets/s_numbers_boxed.xml
@@ -12,21 +12,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_beauty/views/snippets/s_numbers_boxed.xml b/theme_beauty/views/snippets/s_numbers_boxed.xml
index 460cdb949..96514720c 100644
--- a/theme_beauty/views/snippets/s_numbers_boxed.xml
+++ b/theme_beauty/views/snippets/s_numbers_boxed.xml
@@ -12,21 +12,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_beauty/views/snippets/s_text_cover.xml b/theme_beauty/views/snippets/s_text_cover.xml
index d9af1beb7..52e98fb0a 100644
--- a/theme_beauty/views/snippets/s_text_cover.xml
+++ b/theme_beauty/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index ca18d9788..5f3c7b1cf 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -1093,7 +1093,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace">
@@ -1157,23 +1157,14 @@
         <div class="o_we_shape o_html_builder_Blobs_17" style="background-image: url('/html_editor/shape/html_builder/Blobs/17.svg?c5=rgba(0,0,0,0.25)');"/>
     </xpath>
     <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
-    </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
-    </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
-    </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
     </xpath>
@@ -1181,21 +1172,25 @@
 
 <!-- ======== COMPANY TEAM CARD ======== -->
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Be Wise s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_company_team_card.xml b/theme_bistro/views/snippets/s_company_team_card.xml
index 0ef346a59..92ba5d605 100644
--- a/theme_bistro/views/snippets/s_company_team_card.xml
+++ b/theme_bistro/views/snippets/s_company_team_card.xml
@@ -2,21 +2,25 @@
 <odoo>
 
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Bistro's s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bistro/views/snippets/s_numbers_boxed.xml b/theme_bistro/views/snippets/s_numbers_boxed.xml
index 8bc6c836c..7d9f9dcf3 100644
--- a/theme_bistro/views/snippets/s_numbers_boxed.xml
+++ b/theme_bistro/views/snippets/s_numbers_boxed.xml
@@ -4,21 +4,21 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_bookstore/__manifest__.py b/theme_bookstore/__manifest__.py
index 6e47108a9..21e77667b 100644
--- a/theme_bookstore/__manifest__.py
+++ b/theme_bookstore/__manifest__.py
@@ -62,7 +62,6 @@
         'views/snippets/s_accordion.xml',
         'views/snippets/s_accordion_image.xml',
         'views/snippets/s_numbers_boxed.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_numbers_framed.xml',
         'views/new_page_template.xml',
diff --git a/theme_bookstore/views/snippets/s_company_team_card.xml b/theme_bookstore/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 1bfa796aa..000000000
--- a/theme_bookstore/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Bookstore's s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_bookstore/views/snippets/s_numbers_boxed.xml b/theme_bookstore/views/snippets/s_numbers_boxed.xml
index 4799cd0a7..4cc5f9f09 100644
--- a/theme_bookstore/views/snippets/s_numbers_boxed.xml
+++ b/theme_bookstore/views/snippets/s_numbers_boxed.xml
@@ -12,21 +12,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_buzzy/__manifest__.py b/theme_buzzy/__manifest__.py
index ff89db4f4..3321a6b77 100644
--- a/theme_buzzy/__manifest__.py
+++ b/theme_buzzy/__manifest__.py
@@ -58,7 +58,6 @@
         'views/snippets/s_image_hexagonal.xml',
         'views/snippets/s_image_punchy.xml',
         'views/snippets/s_striped_center_top.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_image_title.xml',
         'views/snippets/s_key_images.xml',
         'views/snippets/s_big_number.xml',
diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml
index 905510506..f7f026fcd 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -132,7 +132,7 @@
 
 <template id="new_page_template_about_s_text_cover" inherit_id="website.new_page_template_about_s_text_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -224,7 +224,7 @@
 
 <template id="new_page_template_landing_s_text_cover" inherit_id="website.new_page_template_landing_s_text_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -321,7 +321,7 @@
 
 <template id="new_page_template_services_s_text_cover" inherit_id="website.new_page_template_services_s_text_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_buzzy/views/snippets/s_company_team_card.xml b/theme_buzzy/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 356a34735..000000000
--- a/theme_buzzy/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Buzzy's s_company_team_card">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_buzzy/views/snippets/s_numbers_boxed.xml b/theme_buzzy/views/snippets/s_numbers_boxed.xml
index 529bbee6b..5fa3c584d 100644
--- a/theme_buzzy/views/snippets/s_numbers_boxed.xml
+++ b/theme_buzzy/views/snippets/s_numbers_boxed.xml
@@ -8,21 +8,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_clean/views/snippets/s_company_team_card.xml b/theme_clean/views/snippets/s_company_team_card.xml
index b76f39d27..8dd710fb8 100644
--- a/theme_clean/views/snippets/s_company_team_card.xml
+++ b/theme_clean/views/snippets/s_company_team_card.xml
@@ -4,23 +4,23 @@
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Clean's s_company_team_card">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
     </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_clean/views/snippets/s_numbers_boxed.xml b/theme_clean/views/snippets/s_numbers_boxed.xml
index 7350b0bc5..594b05196 100644
--- a/theme_clean/views/snippets/s_numbers_boxed.xml
+++ b/theme_clean/views/snippets/s_numbers_boxed.xml
@@ -8,21 +8,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 629adeef2..2ea04a885 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -716,43 +716,27 @@
     </xpath>
 </template>
 
-<!-- ======== NUMBERS BOXED ======== -->
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
 <!-- ======== COMPANY TEAM CARD ======== -->
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Cobalt's s_company_team_card">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_enark/__manifest__.py b/theme_enark/__manifest__.py
index 9b044df90..7503b1fde 100644
--- a/theme_enark/__manifest__.py
+++ b/theme_enark/__manifest__.py
@@ -52,8 +52,6 @@
         'views/snippets/s_images_constellation.xml',
         'views/snippets/s_text_cover.xml',
         'views/snippets/s_empowerment.xml',
-        'views/snippets/s_numbers_boxed.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_numbers_framed.xml',
         'views/new_page_template.xml',
diff --git a/theme_enark/views/snippets/s_company_team_card.xml b/theme_enark/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 86057f511..000000000
--- a/theme_enark/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Enark's s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_enark/views/snippets/s_numbers_boxed.xml b/theme_enark/views/snippets/s_numbers_boxed.xml
deleted file mode 100644
index 8363dc62e..000000000
--- a/theme_enark/views/snippets/s_numbers_boxed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_enark/views/snippets/s_text_cover.xml b/theme_enark/views/snippets/s_text_cover.xml
index f194909ac..a7f536a8e 100644
--- a/theme_enark/views/snippets/s_text_cover.xml
+++ b/theme_enark/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
diff --git a/theme_kea/views/snippets/s_company_team_card.xml b/theme_kea/views/snippets/s_company_team_card.xml
index 4fd24ce28..4ce30f7dd 100644
--- a/theme_kea/views/snippets/s_company_team_card.xml
+++ b/theme_kea/views/snippets/s_company_team_card.xml
@@ -4,23 +4,23 @@
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Kea's s_company_team_card">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_numbers_boxed.xml b/theme_kea/views/snippets/s_numbers_boxed.xml
index bef564e26..b7f5e2dca 100644
--- a/theme_kea/views/snippets/s_numbers_boxed.xml
+++ b/theme_kea/views/snippets/s_numbers_boxed.xml
@@ -12,21 +12,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_kea/views/snippets/s_text_cover.xml b/theme_kea/views/snippets/s_text_cover.xml
index 9aa7575c3..2d492295c 100644
--- a/theme_kea/views/snippets/s_text_cover.xml
+++ b/theme_kea/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_kiddo/__manifest__.py b/theme_kiddo/__manifest__.py
index 963551dbe..16c27ba36 100644
--- a/theme_kiddo/__manifest__.py
+++ b/theme_kiddo/__manifest__.py
@@ -44,7 +44,6 @@
         'views/snippets/s_pricelist_boxed.xml',
         'views/snippets/s_image_hexagonal.xml',
         'views/snippets/s_striped_center_top.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_image_title.xml',
         'views/snippets/s_key_images.xml',
         'views/snippets/s_intro_pill.xml',
diff --git a/theme_kiddo/views/snippets/s_company_team_card.xml b/theme_kiddo/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 0fc44131f..000000000
--- a/theme_kiddo/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Kiddo's s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_kiddo/views/snippets/s_numbers_boxed.xml b/theme_kiddo/views/snippets/s_numbers_boxed.xml
index 04a58028f..96d0072de 100644
--- a/theme_kiddo/views/snippets/s_numbers_boxed.xml
+++ b/theme_kiddo/views/snippets/s_numbers_boxed.xml
@@ -8,21 +8,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc1" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_loftspace/__manifest__.py b/theme_loftspace/__manifest__.py
index 7449499ae..a0b859741 100644
--- a/theme_loftspace/__manifest__.py
+++ b/theme_loftspace/__manifest__.py
@@ -57,8 +57,6 @@
         'views/snippets/s_wavy_grid.xml',
         'views/snippets/s_text_cover.xml',
         'views/snippets/s_empowerment.xml',
-        'views/snippets/s_numbers_boxed.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_numbers_framed.xml',
         'views/new_page_template.xml',
diff --git a/theme_loftspace/views/snippets/s_company_team_card.xml b/theme_loftspace/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 0fc44131f..000000000
--- a/theme_loftspace/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Kiddo's s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_loftspace/views/snippets/s_numbers_boxed.xml b/theme_loftspace/views/snippets/s_numbers_boxed.xml
deleted file mode 100644
index 8363dc62e..000000000
--- a/theme_loftspace/views/snippets/s_numbers_boxed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_loftspace/views/snippets/s_text_cover.xml b/theme_loftspace/views/snippets/s_text_cover.xml
index 929fccef0..cea3a816a 100644
--- a/theme_loftspace/views/snippets/s_text_cover.xml
+++ b/theme_loftspace/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         The next<br/> summer<br/> collection
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index a81107893..95ddc494b 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -894,7 +894,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
     <xpath expr="//h1" position="replace" mode="inner">
         Plan Events. <br/>Effortlessly.
@@ -1065,39 +1065,23 @@
     </xpath>
 </template>
 
-<!-- ======== NUMBERS BOXED ======== -->
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
 <!-- ======== COMPANY TEAM CARD ======== -->
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Monglia's s_company_team_card">
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_nano/__manifest__.py b/theme_nano/__manifest__.py
index 1112c8d28..e94008099 100644
--- a/theme_nano/__manifest__.py
+++ b/theme_nano/__manifest__.py
@@ -56,7 +56,6 @@
         'views/snippets/s_cta_mobile.xml',
         'views/snippets/s_company_team_spotlight.xml',
         'views/snippets/s_website_form_cover.xml',
-        'views/snippets/s_numbers_boxed.xml',
         'views/snippets/s_company_team_card.xml',
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_form_aside.xml',
diff --git a/theme_nano/views/snippets/s_company_team_card.xml b/theme_nano/views/snippets/s_company_team_card.xml
index 9bfc13506..31f3638e3 100644
--- a/theme_nano/views/snippets/s_company_team_card.xml
+++ b/theme_nano/views/snippets/s_company_team_card.xml
@@ -2,21 +2,25 @@
 <odoo>
 
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Nano s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_nano/views/snippets/s_numbers_boxed.xml b/theme_nano/views/snippets/s_numbers_boxed.xml
deleted file mode 100644
index 8363dc62e..000000000
--- a/theme_nano/views/snippets/s_numbers_boxed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_nano/views/snippets/s_text_cover.xml b/theme_nano/views/snippets/s_text_cover.xml
index 7c6dea098..62a3b0d34 100644
--- a/theme_nano/views/snippets/s_text_cover.xml
+++ b/theme_nano/views/snippets/s_text_cover.xml
@@ -4,7 +4,7 @@
 <template id="s_text_cover" inherit_id="website.s_text_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_company_team_card.xml b/theme_notes/views/snippets/s_company_team_card.xml
index b4a049e5a..ba42d4e95 100644
--- a/theme_notes/views/snippets/s_company_team_card.xml
+++ b/theme_notes/views/snippets/s_company_team_card.xml
@@ -2,21 +2,25 @@
 <odoo>
 
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Notes s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_numbers_boxed.xml b/theme_notes/views/snippets/s_numbers_boxed.xml
index 7350b0bc5..594b05196 100644
--- a/theme_notes/views/snippets/s_numbers_boxed.xml
+++ b/theme_notes/views/snippets/s_numbers_boxed.xml
@@ -8,21 +8,21 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_odoo_experts/views/snippets/s_company_team_card.xml b/theme_odoo_experts/views/snippets/s_company_team_card.xml
index 04925c979..5863265c0 100644
--- a/theme_odoo_experts/views/snippets/s_company_team_card.xml
+++ b/theme_odoo_experts/views/snippets/s_company_team_card.xml
@@ -4,19 +4,19 @@
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Odoo Expert's s_company_team_card">
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_numbers_boxed.xml b/theme_odoo_experts/views/snippets/s_numbers_boxed.xml
index 8bc6c836c..7d9f9dcf3 100644
--- a/theme_odoo_experts/views/snippets/s_numbers_boxed.xml
+++ b/theme_odoo_experts/views/snippets/s_numbers_boxed.xml
@@ -4,21 +4,21 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_orchid/__manifest__.py b/theme_orchid/__manifest__.py
index e572cfbde..fcb87cddd 100644
--- a/theme_orchid/__manifest__.py
+++ b/theme_orchid/__manifest__.py
@@ -49,7 +49,6 @@
         'views/snippets/s_key_benefits.xml',
         'views/snippets/s_image_hexagonal.xml',
         'views/snippets/s_striped_center_top.xml',
-        'views/snippets/s_company_team_card.xml',
         'views/snippets/s_key_images.xml',
         'views/snippets/s_kickoff.xml',
         'views/snippets/s_intro_pill.xml',
diff --git a/theme_orchid/views/snippets/s_company_team_card.xml b/theme_orchid/views/snippets/s_company_team_card.xml
deleted file mode 100644
index 1ca678f3d..000000000
--- a/theme_orchid/views/snippets/s_company_team_card.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Orchid's s_company_team_card">
-    <!-- Team Member 1 -->
-    <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 2 -->
-    <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 3 -->
-    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Team Member 4 -->
-    <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_orchid/views/snippets/s_numbers_boxed.xml b/theme_orchid/views/snippets/s_numbers_boxed.xml
index 8bc6c836c..7d9f9dcf3 100644
--- a/theme_orchid/views/snippets/s_numbers_boxed.xml
+++ b/theme_orchid/views/snippets/s_numbers_boxed.xml
@@ -4,21 +4,21 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
         30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
         45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
     </xpath>
     <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
         8+
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 6d47d00d5..7d9fdd183 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -791,23 +791,24 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
+        30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
+        45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
     </xpath>
-</template>
-
-<!-- ==== COMPANY TEAM CARD ===== -->
-<template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Paptic s_company_team_card">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
+    <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
+        8+
     </xpath>
 </template>
 
diff --git a/theme_real_estate/views/snippets/s_numbers_boxed.xml b/theme_real_estate/views/snippets/s_numbers_boxed.xml
index 580ddbc9a..96d0072de 100644
--- a/theme_real_estate/views/snippets/s_numbers_boxed.xml
+++ b/theme_real_estate/views/snippets/s_numbers_boxed.xml
@@ -8,15 +8,24 @@
     </xpath>
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
+        30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
+        45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
+        8+
     </xpath>
 </template>
 
diff --git a/theme_treehouse/__manifest__.py b/theme_treehouse/__manifest__.py
index 882cabecf..a3d8de47a 100644
--- a/theme_treehouse/__manifest__.py
+++ b/theme_treehouse/__manifest__.py
@@ -55,7 +55,6 @@
         'views/snippets/s_wavy_grid.xml',
         'views/snippets/s_text_cover.xml',
         'views/snippets/s_empowerment.xml',
-        'views/snippets/s_numbers_boxed.xml',
         'views/snippets/s_split_intro.xml',
         'views/snippets/s_numbers_framed.xml',
         'views/new_page_template.xml',
diff --git a/theme_treehouse/views/snippets/s_numbers_boxed.xml b/theme_treehouse/views/snippets/s_numbers_boxed.xml
deleted file mode 100644
index 63468431c..000000000
--- a/theme_treehouse/views/snippets/s_numbers_boxed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
-    </xpath>
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index 3772c8073..5789c58a7 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -937,21 +937,6 @@
     </xpath>
 </template>
 
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
 <!-- ======== SPLIT INTRO ======== -->
 <template id="s_split_intro" inherit_id="website.s_split_intro">
     <!-- Section -->
diff --git a/theme_yes/views/snippets/s_company_team_card.xml b/theme_yes/views/snippets/s_company_team_card.xml
index 4ea26add4..27aa6c997 100644
--- a/theme_yes/views/snippets/s_company_team_card.xml
+++ b/theme_yes/views/snippets/s_company_team_card.xml
@@ -2,21 +2,25 @@
 <odoo>
 
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Yes's s_company_team_card">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc2" separator=" "/>
+    </xpath>
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_yes/views/snippets/s_numbers_boxed.xml b/theme_yes/views/snippets/s_numbers_boxed.xml
index 12d6edcc6..7d9f9dcf3 100644
--- a/theme_yes/views/snippets/s_numbers_boxed.xml
+++ b/theme_yes/views/snippets/s_numbers_boxed.xml
@@ -4,15 +4,24 @@
 <template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
     <!-- Grid Item -->
     <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
+    </xpath>
+    <xpath expr="//div[hasclass('o_grid_item')][2]//h3" position="replace" mode="inner">
+        30+
     </xpath>
     <!-- Grid Item 2 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('o_grid_item')])[3]//h3" position="replace" mode="inner">
+        45%
     </xpath>
     <!-- Grid Item 3 -->
     <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4" separator=" "/>
+    </xpath>
+    <xpath expr="(//div[hasclass('o_grid_item')])[4]//h3" position="replace" mode="inner">
+        8+
     </xpath>
 </template>
 
diff --git a/theme_zap/__manifest__.py b/theme_zap/__manifest__.py
index 9ec42b94a..8706228f0 100644
--- a/theme_zap/__manifest__.py
+++ b/theme_zap/__manifest__.py
@@ -52,7 +52,6 @@
         'views/snippets/s_big_number.xml',
         'views/snippets/s_images_constellation.xml',
         'views/snippets/s_empowerment.xml',
-        'views/snippets/s_numbers_boxed.xml',
         'views/snippets/s_numbers_framed.xml',
         'views/new_page_template.xml',
     ],
diff --git a/theme_zap/views/snippets/s_company_team_card.xml b/theme_zap/views/snippets/s_company_team_card.xml
index ce0e47e70..cd54b00a4 100644
--- a/theme_zap/views/snippets/s_company_team_card.xml
+++ b/theme_zap/views/snippets/s_company_team_card.xml
@@ -4,19 +4,19 @@
 <template id="s_company_team_card" inherit_id="website.s_company_team_card" name="Zap's s_company_team_card">
     <!-- Team Member 1 -->
     <xpath expr="//div[hasclass('card')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 2 -->
     <xpath expr="(//div[hasclass('card')])[2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 3 -->
     <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Team Member 4 -->
     <xpath expr="(//div[hasclass('card')])[4]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_zap/views/snippets/s_numbers_boxed.xml b/theme_zap/views/snippets/s_numbers_boxed.xml
deleted file mode 100644
index b841281b9..000000000
--- a/theme_zap/views/snippets/s_numbers_boxed.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-<template id="s_numbers_boxed" inherit_id="website.s_numbers_boxed">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
-    </xpath>
-    <!-- Grid Item -->
-    <xpath expr="//div[hasclass('o_grid_item')][2]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 2 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[3]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-    <!-- Grid Item 3 -->
-    <xpath expr="(//div[hasclass('o_grid_item')])[4]" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
-</odoo>
diff --git a/theme_zap/views/snippets/s_numbers_charts.xml b/theme_zap/views/snippets/s_numbers_charts.xml
index 8e02707ce..a85f301a0 100644
--- a/theme_zap/views/snippets/s_numbers_charts.xml
+++ b/theme_zap/views/snippets/s_numbers_charts.xml
@@ -12,11 +12,11 @@
     </xpath>
     <!-- Progress 1 -->
     <xpath expr="(//div[hasclass('progress-bar')])[1]" position="attributes">
-        <attribute name="class" remove="bg-o-color-2" add="bg-o-color-1" separator=" "/>
+        <attribute name="class" remove="bg-o-color-5" add="bg-o-color-1" separator=" "/>
     </xpath>
     <!-- Progress 2 -->
     <xpath expr="(//div[hasclass('progress-bar')])[2]" position="attributes">
-        <attribute name="class" remove="bg-o-color-2" add="bg-o-color-1" separator=" "/>
+        <attribute name="class" remove="bg-o-color-5" add="bg-o-color-1" separator=" "/>
     </xpath>
 </template>