diff --git a/theme_anelusia/views/snippets/s_company_team_basic.xml b/theme_anelusia/views/snippets/s_company_team_basic.xml
index 0f0c3b756..7a0ff8777 100644
--- a/theme_anelusia/views/snippets/s_company_team_basic.xml
+++ b/theme_anelusia/views/snippets/s_company_team_basic.xml
@@ -3,11 +3,11 @@
 
 <template id="s_company_team_basic" inherit_id="website.s_company_team_basic">
     <!-- Team #01 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/h4" position="replace" mode="inner">
+    <xpath expr="//h4" position="replace" mode="inner">
         Tony Fred
     </xpath>
     <!-- Team #01 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/p[last()]" position="replace" mode="inner">
+    <xpath expr="//p[hasclass('o_small-fs')]" position="replace" mode="inner">
         Editor-in-chief
     </xpath>
     <!-- Team #01 - Img -->
@@ -21,11 +21,11 @@
     </xpath>
 
     <!-- Team #02 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[2]" position="replace" mode="inner">
         Mich Stark
     </xpath>
     <!-- Team #02 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[2]" position="replace" mode="inner">
         Sports Reporter
     </xpath>
     <!-- Team #02 - Img -->
@@ -39,11 +39,11 @@
     </xpath>
 
     <!-- Team #03 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[3]" position="replace" mode="inner">
         Aline Turner
     </xpath>
     <!-- Team #03 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[3]" position="replace" mode="inner">
         Photograph
     </xpath>
     <!-- Team #03 - Img -->
@@ -57,11 +57,11 @@
     </xpath>
 
     <!-- Team #04 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[4]" position="replace" mode="inner">
         Iris Joe
     </xpath>
     <!-- Team #04 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[4]" position="replace" mode="inner">
         Political Reporter
     </xpath>
     <!-- Team #04 - Img -->
diff --git a/theme_anelusia/views/snippets/s_references_social.xml b/theme_anelusia/views/snippets/s_references_social.xml
index 13b96962f..713c8a36b 100644
--- a/theme_anelusia/views/snippets/s_references_social.xml
+++ b/theme_anelusia/views/snippets/s_references_social.xml
@@ -11,16 +11,16 @@
         Every style for everybody.
     </xpath>
     <!-- Partners -->
-    <xpath expr="//div[hasclass('row')]/div[2]/p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div/p" position="replace" mode="inner">
         Redefining elegance since 2009
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[3]/p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[2]/p" position="replace" mode="inner">
         Disrupting fashion since 2013
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[4]/p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[3]/p" position="replace" mode="inner">
         Shaping your style since 2015
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[5]/p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[4]/p" position="replace" mode="inner">
         Transforming trends since 2018
     </xpath>
 </template>
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index fc8b57ec4..824730118 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -282,40 +282,40 @@
 <!-- ======== TEAM ======== -->
 <template id="s_company_team" inherit_id="website.s_company_team" name="Be Wise s_company_team">
     <!-- Profile #1 -->
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div//h4" position="replace" mode="inner">
         <b>Tony Fred</b>
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div//p" position="replace" mode="inner">
         Faculty Head of IT
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')]//p[2]" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('container')]/div[hasclass('row')]/div//p[2]" position="replace" mode="inner">
         Tony received a degree in Electrical and Mechanical Engineering and a Ph D. degree in 1998 and 2004. After a post-doctoral experience  he joined the school as professor of mechatronics in 2006. In 2010, he became Head of IT.
     </xpath>
     <!-- Profile #2 -->
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[2]//h4" position="replace" mode="inner">
         <b>Mich Stark</b>
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[2]//p" position="replace" mode="inner">
         IT Officer
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p[2]" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[2]//p[2]" position="replace" mode="inner">
         He is professor in the Institute of Mechanics, Materials and Civil Engineering since 2000. He lectures in mechanical drawing and mechanical design for undergraduate and graduate students. He is active in Problem and Project based learning. He is the promoter of 8 doctoral theses.
     </xpath>
     <!-- Profile #3 -->
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[3]//h4" position="replace" mode="inner">
         <b>Aline Turner</b>
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[3]//p" position="replace" mode="inner">
         Law professor
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p[2]" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[3]//p[2]" position="replace" mode="inner">
         She has been practicing law at the French-speaking Brussels Bar since 2006. She has worked in various major law firms based in Brussels, as member and then head of their litigation/arbitration practice groups.
     </xpath>
     <!-- Profile #4 -->
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[4]//h4" position="replace" mode="inner">
         <b>Iris Joe</b>
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[4]//p" position="replace" mode="inner">
         Team leader professor
     </xpath>
 </template>
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 50fb43cbd..88531a8ae 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -165,7 +165,9 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt80 pb80" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <xpath expr="//h2" position="replace"/>
+    <xpath expr="//p" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 </template>
 
 <!-- ==== Three Columns ===== -->
diff --git a/theme_kiddo/views/snippets/s_company_team_shapes.xml b/theme_kiddo/views/snippets/s_company_team_shapes.xml
index cbc0b8084..ac0c977b0 100644
--- a/theme_kiddo/views/snippets/s_company_team_shapes.xml
+++ b/theme_kiddo/views/snippets/s_company_team_shapes.xml
@@ -3,7 +3,7 @@
 
 <template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb104" remove="pb48" separator=" "/>
+        <attribute name="class" add="pb128" remove="pb48" separator=" "/>
         <attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/10','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
diff --git a/theme_loftspace/views/snippets/s_features.xml b/theme_loftspace/views/snippets/s_features.xml
index cd300d550..1e7e58fbe 100644
--- a/theme_loftspace/views/snippets/s_features.xml
+++ b/theme_loftspace/views/snippets/s_features.xml
@@ -6,10 +6,10 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt72 pb128" remove="pt64 pb64" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-12')]/h3" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('container')]/h3" position="replace" mode="inner">
         Customer benefits
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-12')]/p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('container')]/p" position="replace" mode="inner">
         Enjoy these added advantages with every purchase
     </xpath>
     <!-- Column #01 -->
diff --git a/theme_loftspace/views/snippets/s_striped.xml b/theme_loftspace/views/snippets/s_striped.xml
index dd41abba2..23bdac38d 100644
--- a/theme_loftspace/views/snippets/s_striped.xml
+++ b/theme_loftspace/views/snippets/s_striped.xml
@@ -12,7 +12,8 @@
        <attribute name="data-row-count">14</attribute>
     </xpath>
     <!-- Remove the title -->
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <xpath expr="//h2" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 
     <xpath expr="//div[hasclass('row')]/div" position="attributes">
         <attribute name="class" add="o_grid_item o_grid_item_image g-col-lg-8 g-height-12" remove="pt24 pb24" separator=" "/>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
index aca847186..c04b64d78 100644
--- a/theme_monglia/views/customizations.xml
+++ b/theme_monglia/views/customizations.xml
@@ -1039,10 +1039,6 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pt56 pb56" remove="pb80 pt80" separator=" "/>
     </xpath>
-    <!-- Layout -->
-    <xpath expr="//div[hasclass('col-lg-12')]" position="attributes">
-        <attribute name="class" add="pb0" remove="pb24" separator=" "/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
         OUR SPONSORS
@@ -1050,6 +1046,7 @@
     <!-- Remove Subtitle and Link -->
     <xpath expr="//p" position="replace"/>
     <xpath expr="//p" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 </template>
 
 <!-- ======== COMPARISONS HORIZONTAL ======== -->
diff --git a/theme_nano/views/snippets/s_company_team_basic.xml b/theme_nano/views/snippets/s_company_team_basic.xml
index 352d54f15..2f806c308 100644
--- a/theme_nano/views/snippets/s_company_team_basic.xml
+++ b/theme_nano/views/snippets/s_company_team_basic.xml
@@ -6,11 +6,6 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
     </xpath>
-   <!-- Row - remove grid mode -->
-    <xpath expr="//div[hasclass('row')]" position="attributes">
-        <attribute name="class" remove="o_grid_mode" separator=" "/>
-        <attribute name="data-row-count"/>
-    </xpath>
     <xpath expr="//h3" position="replace">
         <h2 style="text-align: center;">Our talented crew</h2>
     </xpath>
@@ -18,16 +13,9 @@
         <p class="lead" style="text-align: center;">Meet the masterminds behind our agency. With them, your project is in good hands for sure.</p>
     </xpath>
 
-    <!-- Title -->
-    <xpath expr="//div[hasclass('col-lg-12')]" position="attributes">
-        <attribute name="class" add="pb40" remove="o_grid_item g-col-lg-12 g-height-2" separator=" "/>
-        <attribute name="style" remove="grid-area: 1 / 1 / 3 / 13; --grid-item-padding-y: 32px; --grid-item-padding-x: 32px; z-index: 1;" separator=";"/>
-    </xpath>
-
     <!-- Profile #1 -->
     <xpath expr="//div[hasclass('col-lg-3')]" position="attributes">
-        <attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
-        <attribute name="style" remove="grid-area: 3 / 1 / 11 / 4; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 2;" separator=";"/>
+        <attribute name="class" add="pt40" remove="pt16" separator=" "/>
     </xpath>
     <xpath expr="(//img)[1]" position="attributes">
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -40,8 +28,7 @@
     </xpath>
     <!-- Profile #2 -->
     <xpath expr="//div[hasclass('col-lg-3')][2]" position="attributes">
-        <attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
-        <attribute name="style" remove="grid-area: 3 / 4 / 11 / 7; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 3;" separator=";"/>
+        <attribute name="class" add="pt40" remove="pt16" separator=" "/>
     </xpath>
     <xpath expr="(//img)[2]" position="attributes">
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -54,8 +41,7 @@
     </xpath>
     <!-- Profile #3 -->
     <xpath expr="//div[hasclass('col-lg-3')][3]" position="attributes">
-        <attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
-        <attribute name="style" remove="grid-area: 3 / 7 / 11 / 10; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 4;" separator=";"/>
+        <attribute name="class" add="pt40" remove="pt16" separator=" "/>
     </xpath>
     <xpath expr="(//img)[3]" position="attributes">
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -68,8 +54,7 @@
     </xpath>
     <!-- Profile #4 -->
     <xpath expr="//div[hasclass('col-lg-3')][4]" position="attributes">
-        <attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
-        <attribute name="style" remove="grid-area: 3 / 10 / 11 / 13; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 5;" separator=";"/>
+        <attribute name="class" add="pt40" remove="pt16" separator=" "/>
     </xpath>
     <xpath expr="(//img)[4]" position="attributes">
         <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
diff --git a/theme_nano/views/snippets/s_references.xml b/theme_nano/views/snippets/s_references.xml
index f64c64a24..2683f998b 100644
--- a/theme_nano/views/snippets/s_references.xml
+++ b/theme_nano/views/snippets/s_references.xml
@@ -6,9 +6,11 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace" mode="inner">
+    <xpath expr="//h2" position="replace">
         <h2 style="text-align: center;">Trusted by industry leaders</h2>
     </xpath>
+    <xpath expr="//p" position="replace"/>
+    <xpath expr="//p" position="replace"/>
     <xpath expr="//div[hasclass('col-lg-2')]" position="attributes">
         <attribute name="class" add="offset-lg-1" separator=" "/>
     </xpath>
diff --git a/theme_nano/views/snippets/s_references_social.xml b/theme_nano/views/snippets/s_references_social.xml
index 0a57cfde6..ee493acab 100644
--- a/theme_nano/views/snippets/s_references_social.xml
+++ b/theme_nano/views/snippets/s_references_social.xml
@@ -6,16 +6,16 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[2]/h3" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div/h3" position="replace" mode="inner">
         Barbershop
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[3]/h3" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[2]/h3" position="replace" mode="inner">
         Oceandor
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[4]/h3" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[3]/h3" position="replace" mode="inner">
         Mountain
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[5]/h3" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('row')]/div[4]/h3" position="replace" mode="inner">
         Hosoren
     </xpath>
     <!-- Column #1 -->
diff --git a/theme_notes/views/snippets/s_company_team_basic.xml b/theme_notes/views/snippets/s_company_team_basic.xml
index 95e5de4c0..b37c19ecd 100644
--- a/theme_notes/views/snippets/s_company_team_basic.xml
+++ b/theme_notes/views/snippets/s_company_team_basic.xml
@@ -6,38 +6,38 @@
         Discover our talented artists
     </xpath>
     <!-- Team #01 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/h4" position="replace" mode="inner">
+    <xpath expr="//h4" position="replace" mode="inner">
         Tony
     </xpath>
     <!-- Team #01 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/p[last()]" position="replace" mode="inner">
+    <xpath expr="//p[hasclass('o_small-fs')]" position="replace" mode="inner">
         Lead Singer
     </xpath>
 
     <!-- Team #02 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[2]" position="replace" mode="inner">
         Mich
     </xpath>
     <!-- Team #02 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[2]" position="replace" mode="inner">
         Singer / Song Writer
     </xpath>
 
     <!-- Team #03 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[3]" position="replace" mode="inner">
         Aline
     </xpath>
     <!-- Team #03 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[3]" position="replace" mode="inner">
         Singer
     </xpath>
 
     <!-- Team #04 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[4]" position="replace" mode="inner">
         Iris
     </xpath>
     <!-- Team #04 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[4]" position="replace" mode="inner">
         Singer
     </xpath>
 </template>
diff --git a/theme_notes/views/snippets/s_company_team_shapes.xml b/theme_notes/views/snippets/s_company_team_shapes.xml
index 9e2b6b3c8..401dee541 100644
--- a/theme_notes/views/snippets/s_company_team_shapes.xml
+++ b/theme_notes/views/snippets/s_company_team_shapes.xml
@@ -3,7 +3,7 @@
 
 <template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1 pt80 pb80" remove="o_cc2 pt48 pb48" separator=" "/>
+        <attribute name="class" add="o_cc1 pt80 pb104" remove="o_cc2 pt48 pb48" separator=" "/>
         <attribute name="data-oe-shape-data">{'shape':'web_editor/Bold/15','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('o_container_small')]" position="before">
diff --git a/theme_odoo_experts/views/snippets/s_references.xml b/theme_odoo_experts/views/snippets/s_references.xml
index af084bc1d..090d5a7db 100644
--- a/theme_odoo_experts/views/snippets/s_references.xml
+++ b/theme_odoo_experts/views/snippets/s_references.xml
@@ -7,7 +7,9 @@
         <attribute name="class" add="pt0 pb56" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Remove title, subtitle and button -->
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <xpath expr="//h2" position="replace"/>
+    <xpath expr="//p" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 
     <xpath expr="//div[hasclass('row')]" position="attributes">
         <attribute name="class" add="o_grid_mode" separator=" "/>
diff --git a/theme_odoo_experts/views/snippets/s_references_social.xml b/theme_odoo_experts/views/snippets/s_references_social.xml
index 89656d63d..dc113e0a3 100644
--- a/theme_odoo_experts/views/snippets/s_references_social.xml
+++ b/theme_odoo_experts/views/snippets/s_references_social.xml
@@ -7,7 +7,8 @@
         <attribute name="class" add="pt0 pb56 o_cc2" remove="pt64 pb64 o_cc1" separator=" "/>
     </xpath>
     <!-- Remove title, subtitle -->
-    <xpath expr="//div[hasclass('row')]/div" position="replace"/>
+    <xpath expr="//h2" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_orchid/views/snippets/s_company_team_basic.xml b/theme_orchid/views/snippets/s_company_team_basic.xml
index 2d9112383..6758a0435 100644
--- a/theme_orchid/views/snippets/s_company_team_basic.xml
+++ b/theme_orchid/views/snippets/s_company_team_basic.xml
@@ -17,24 +17,24 @@
         Tony leads the creative vision for the shop.
     </xpath>
     <!-- Person 2 -->
-    <xpath expr="//div[3]//h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[2]" position="replace" mode="inner">
         Mich Stark, Operations Manager
     </xpath>
-    <xpath expr="//div[3]//p[2]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[2]" position="replace" mode="inner">
         Mich makes sure everything runs smoothly.
     </xpath>
     <!-- Person 3 -->
-    <xpath expr="//div[4]//h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[3]" position="replace" mode="inner">
         Aline Turner, Bouquet Designer
     </xpath>
-    <xpath expr="//div[4]//p[2]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[3]" position="replace" mode="inner">
         Aline is the mastermind behind our bespoke floral arrangements.
     </xpath>
     <!-- Person 4 -->
-    <xpath expr="//div[5]//h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[4]" position="replace" mode="inner">
         Iris Joe, Customer Relations
     </xpath>
-    <xpath expr="//div[5]//p[2]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[4]" position="replace" mode="inner">
         Iris ensures that each customer has a delightful experience.
     </xpath>
 </template>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 33b5032f0..ff6742471 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -186,7 +186,9 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pt80 pb80" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <xpath expr="//h2" position="replace"/>
+    <xpath expr="//p" position="replace"/>
+    <xpath expr="//p" position="replace"/>
 </template>
 
 <!-- ==== Three Columns ===== -->
diff --git a/theme_yes/views/snippets/s_company_team_basic.xml b/theme_yes/views/snippets/s_company_team_basic.xml
index 52ceadddd..cb6a0e688 100644
--- a/theme_yes/views/snippets/s_company_team_basic.xml
+++ b/theme_yes/views/snippets/s_company_team_basic.xml
@@ -5,38 +5,38 @@
         Meet our team
     </xpath>
     <!-- Team #01 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/h4" position="replace" mode="inner">
+    <xpath expr="//h4" position="replace" mode="inner">
         Tony Fred
     </xpath>
     <!-- Team #01 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[2]/p[last()]" position="replace" mode="inner">
+    <xpath expr="//p[hasclass('o_small-fs')]" position="replace" mode="inner">
         Founder &amp; Planner
     </xpath>
 
     <!-- Team #02 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[2]" position="replace" mode="inner">
         Clair Stark
     </xpath>
     <!-- Team #02 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[3]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[2]" position="replace" mode="inner">
         The Designer
     </xpath>
 
     <!-- Team #03 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[3]" position="replace" mode="inner">
         Aline Turner
     </xpath>
     <!-- Team #03 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[4]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[3]" position="replace" mode="inner">
         The Stylist
     </xpath>
 
     <!-- Team #04 - Title -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/h4" position="replace" mode="inner">
+    <xpath expr="(//h4)[4]" position="replace" mode="inner">
         Iris Joe
     </xpath>
     <!-- Team #04 - Work Description -->
-    <xpath expr="//div[hasclass('o_grid_mode')]/div[5]/p[last()]" position="replace" mode="inner">
+    <xpath expr="(//p[hasclass('o_small-fs')])[4]" position="replace" mode="inner">
         Professional Photographer
     </xpath>
 </template>
diff --git a/theme_yes/views/snippets/s_features.xml b/theme_yes/views/snippets/s_features.xml
index 244987ae1..80fd51fb8 100644
--- a/theme_yes/views/snippets/s_features.xml
+++ b/theme_yes/views/snippets/s_features.xml
@@ -7,7 +7,8 @@
         <attribute name="class" add="o_cc o_cc2 pb88" remove="pb64" separator=" "/>
     </xpath>
     <!-- Remove title and subtitle -->
-    <xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
+    <xpath expr="//div[hasclass('container')]/h3" position="replace"/>
+    <xpath expr="//div[hasclass('container')]/p" position="replace"/>
     <!-- Column #01 -->
     <xpath expr="//div[hasclass('row')]/div[1]/div[hasclass('s_hr')]" position="replace"/>
     <xpath expr="//div[hasclass('row')]/div[1]/i" position="replace">
diff --git a/theme_zap/views/snippets/s_references_social.xml b/theme_zap/views/snippets/s_references_social.xml
index b666c0ef3..ae3f991d7 100644
--- a/theme_zap/views/snippets/s_references_social.xml
+++ b/theme_zap/views/snippets/s_references_social.xml
@@ -7,22 +7,22 @@
         <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
     </xpath>
     <!-- Column #01 -->
-    <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
+    <xpath expr="//div[hasclass('row')]/div" position="attributes">
         <attribute name="class" add="o_cc o_cc1" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=";"/>
     </xpath>
     <!-- Column #02 -->
-    <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
+    <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
         <attribute name="class" add="o_cc o_cc1" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=";"/>
     </xpath>
     <!-- Column #03 -->
-    <xpath expr="//div[hasclass('row')]/div[4]" position="attributes">
+    <xpath expr="//div[hasclass('row')]/div[3]" position="attributes">
         <attribute name="class" add="o_cc o_cc1" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=";"/>
     </xpath>
     <!-- Column #04 -->
-    <xpath expr="//div[hasclass('row')]/div[5]" position="attributes">
+    <xpath expr="//div[hasclass('row')]/div[4]" position="attributes">
         <attribute name="class" add="o_cc o_cc1" separator=" "/>
         <attribute name="style" add="box-shadow: rgba(0, 0, 0, 0.15) 0px 2px 4px 0px !important;" separator=";"/>
     </xpath>