From 1a96421764bf7cafb8c41dc250772183b934ee2e Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Tue, 24 Oct 2023 13:38:32 +0200
Subject: [PATCH] [FIX] theme_*: remove duplicate and conflicting classes from
 new pages

Given that the duplicate and conflicting classes resolved by the
previous commit did still exist at the time new page templates were
introduced in [1], they could not be avoided for new page templates
snippets.

This commit removes those from the new page templates snippets now that
they have been removed from the base snippets.

[1]: https://github.com/odoo/design-themes/commit/80cbee66f6bb4d897dd7e577f1109c75f6f6ad74

task-3562147

X-original-commit: 9984745d3df58db7cf3cff68aee1561ce39aa6c8
Part-of: odoo/design-themes#744
---
 theme_anelusia/views/new_page_template.xml    |  47 +++----
 theme_artists/views/new_page_template.xml     |  78 +++++++++--
 theme_aviato/views/new_page_template.xml      |  30 ++++
 theme_beauty/views/new_page_template.xml      |  29 ++--
 theme_bewise/views/new_page_template.xml      |  21 +++
 theme_bistro/views/new_page_template.xml      | 125 +++++++++++++++--
 theme_bookstore/views/new_page_template.xml   |  58 ++++++--
 theme_buzzy/views/new_page_template.xml       | 113 ++++++++++++++-
 theme_clean/views/new_page_template.xml       |  53 ++++++-
 theme_cobalt/views/new_page_template.xml      |  42 ++++++
 theme_enark/views/new_page_template.xml       |  40 +++++-
 theme_graphene/views/new_page_template.xml    |  33 ++++-
 theme_kea/views/new_page_template.xml         |  30 +++-
 theme_kiddo/views/new_page_template.xml       |  58 ++++++--
 theme_loftspace/views/new_page_template.xml   |  68 +++++++++
 theme_monglia/views/new_page_template.xml     |  95 ++++++++++++-
 theme_nano/views/new_page_template.xml        | 130 +++++++++++++++---
 theme_notes/views/new_page_template.xml       |  40 +++++-
 .../views/new_page_template.xml               |  53 +++++--
 theme_orchid/views/new_page_template.xml      |  50 ++++++-
 theme_paptic/views/new_page_template.xml      |  57 +++++++-
 theme_real_estate/views/new_page_template.xml | 102 ++++++++++++--
 theme_treehouse/views/new_page_template.xml   |  42 ++++++
 theme_vehicle/views/new_page_template.xml     |  65 ++++++++-
 theme_yes/views/new_page_template.xml         |  28 +++-
 theme_zap/views/new_page_template.xml         |  36 +++--
 26 files changed, 1356 insertions(+), 167 deletions(-)

diff --git a/theme_anelusia/views/new_page_template.xml b/theme_anelusia/views/new_page_template.xml
index 28d1e4418..941a9df0f 100644
--- a/theme_anelusia/views/new_page_template.xml
+++ b/theme_anelusia/views/new_page_template.xml
@@ -27,15 +27,9 @@
 
 <!-- Snippet customization About Pages -->
 
-<template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0" remove="pb40" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 pb0 pt40" remove="pb40 pt40" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -51,9 +45,21 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_half_screen_height" separator=" "/>
+        <attribute name="class" remove="o_cc3 o_half_screen_height" separator=" "/>
     </xpath>
 </template>
 
@@ -65,15 +71,22 @@
 
 <!-- Snippet customization Landing Pages -->
 
-<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" remove="pt128 pb128" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
@@ -85,22 +98,10 @@
 
 <!-- Snippet customization Gallery Pages -->
 
-<template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-    </xpath>
-</template>
-
 <!-- Snippet customization Services Pages -->
 
 <!-- Snippet customization Pricing Pages -->
 
-<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_pricing_s_showcase" inherit_id="website.new_page_template_pricing_s_showcase">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
diff --git a/theme_artists/views/new_page_template.xml b/theme_artists/views/new_page_template.xml
index 22ca2f827..40cd52aeb 100644
--- a/theme_artists/views/new_page_template.xml
+++ b/theme_artists/views/new_page_template.xml
@@ -42,6 +42,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
+    <xpath expr="(//div[hasclass('card')])[3]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_s_features_grid" inherit_id="website.new_page_template_s_features_grid">
+    <xpath expr="(//i)[4]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[5]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[6]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_numbers" inherit_id="website.new_page_template_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -76,13 +94,13 @@
 
 <template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height pt40 pb40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 o_cc5" remove="pb40" separator=" "/>
+        <attribute name="class" add="o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -92,9 +110,27 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0 o_cc4" remove="pb40 o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -116,9 +152,15 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
@@ -130,15 +172,21 @@
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
+        <attribute name="class" remove="pb56" separator=" "/>
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" remove="pt200 pb200" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
     </xpath>
 </template>
 
@@ -178,6 +226,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_gallery_s_text_block_2nd" inherit_id="website.new_page_template_gallery_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
        <attribute name="class" add="o_cc5" separator=" "/>
@@ -206,6 +260,7 @@
 <template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
     </xpath>
     <!-- Shape -->
@@ -229,6 +284,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_pricing_s_text_block_h1" inherit_id="website.new_page_template_pricing_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -263,6 +324,7 @@
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
     </xpath>
     <!-- Shape -->
diff --git a/theme_aviato/views/new_page_template.xml b/theme_aviato/views/new_page_template.xml
index e53d99b79..5eceece8c 100644
--- a/theme_aviato/views/new_page_template.xml
+++ b/theme_aviato/views/new_page_template.xml
@@ -28,12 +28,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40 pt40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" separator=" "/>
@@ -42,6 +54,12 @@
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt192 pb192" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">  
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
@@ -90,6 +108,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <!-- Snippet customization Pricing Pages -->
@@ -103,6 +127,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
diff --git a/theme_beauty/views/new_page_template.xml b/theme_beauty/views/new_page_template.xml
index fe34e47e2..00b27fa06 100644
--- a/theme_beauty/views/new_page_template.xml
+++ b/theme_beauty/views/new_page_template.xml
@@ -41,7 +41,7 @@
 
 <template id="new_page_template_s_cover" inherit_id="website.new_page_template_s_cover">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
     </xpath>
 </template>
 
@@ -60,12 +60,6 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
-<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only" primary="True">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc1" separator=" "/>
-    </xpath>
-</template>
-
 <!-- Snippet customization Basic Pages -->
 
 <template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
@@ -76,9 +70,9 @@
 
 <!-- Snippet customization About Pages -->
 
-<template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
@@ -88,9 +82,9 @@
     </xpath>
 </template>
 
-<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
@@ -105,12 +99,6 @@
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_landing_3_s_call_to_action" inherit_id="website.new_page_template_landing_3_s_call_to_action">
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/05_001","flip":[]}</attribute>
@@ -120,6 +108,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- Added on all new page template s_cover by theme and on generic landing 4 -->
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <!-- Snippet customization Services Pages -->
diff --git a/theme_bewise/views/new_page_template.xml b/theme_bewise/views/new_page_template.xml
index e587fd5d0..23db9be89 100644
--- a/theme_bewise/views/new_page_template.xml
+++ b/theme_bewise/views/new_page_template.xml
@@ -51,9 +51,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -62,6 +77,12 @@
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt200 pb200" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
diff --git a/theme_bistro/views/new_page_template.xml b/theme_bistro/views/new_page_template.xml
index e8ee09ecf..045672d2e 100644
--- a/theme_bistro/views/new_page_template.xml
+++ b/theme_bistro/views/new_page_template.xml
@@ -24,6 +24,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_s_text_block_h1" inherit_id="website.new_page_template_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_s_text_block_h2" inherit_id="website.new_page_template_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_text_block_h2_contact" inherit_id="website.new_page_template_s_text_block_h2_contact">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb40 pb80" separator=" "/>
@@ -32,13 +44,18 @@
 
 <!-- Snippet customization Basic Pages -->
 
+<template id="new_page_template_basic_2_s_picture" inherit_id="website.new_page_template_basic_2_s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
     </xpath>
 </template>
 
-
 <!-- Snippet customization About Pages -->
 
 <template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
@@ -66,13 +83,43 @@
 
 <template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_picture" inherit_id="website.new_page_template_about_full_s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40 pb80" remove="pb40" separator=" "/>
+        <attribute name="class" add="pb80" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -90,13 +137,19 @@
 
 <template id="new_page_template_about_map_s_text_block_h1" inherit_id="website.new_page_template_about_map_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb80" separator=" "/>
+        <attribute name="class" add="pb80" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_picture_only" inherit_id="website.new_page_template_about_mini_s_picture_only">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pt80" separator=" "/>
+        <attribute name="class" add="pt40" remove="pt80" separator=" "/>
     </xpath>
 </template>
 
@@ -111,18 +164,24 @@
 
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <attribute name="class" remove="o_cc5 pt0" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
     </xpath>
 </template>
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <!-- Shape option -->
     <xpath expr="section" position="attributes">
@@ -148,7 +207,7 @@
 
 <template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1 bg-200" remove="o_cc2 pb80" separator=" "/>
+        <attribute name="class" add="o_cc1 pb0 bg-200" remove="o_cc2 pb80" separator=" "/>
     </xpath>
 </template>
 
@@ -160,7 +219,7 @@
 
 <template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1 bg-200" remove="o_cc2 pb80" separator=" "/>
+        <attribute name="class" add="o_cc1 pb0 bg-200" remove="o_cc2 pb80" separator=" "/>
     </xpath>
 </template>
 
@@ -183,7 +242,7 @@
 
 <template id="new_page_template_landing_4_s_text_block_h2" inherit_id="website.new_page_template_landing_4_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40" remove="pb40" separator=" "/>
+        <attribute name="class" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -201,17 +260,35 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_gallery_2_s_picture_only" inherit_id="website.new_page_template_gallery_2_s_picture_only">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_text_block_h1" inherit_id="website.new_page_template_services_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_services_s_text_block_h2" inherit_id="website.new_page_template_services_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
     </xpath>
 </template>
 
@@ -235,32 +312,50 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_pricing_s_text_block_h1" inherit_id="website.new_page_template_pricing_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_s_text_block_h2" inherit_id="website.new_page_template_pricing_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb80" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb80" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_5_s_text_block_h1" inherit_id="website.new_page_template_pricing_5_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb80" separator=" "/>
+        <attribute name="class" add="pb80" remove="pb0" separator=" "/>
     </xpath>
 </template>
 
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_picture" inherit_id="website.new_page_template_team_s_picture">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="pb80" separator=" "/>
diff --git a/theme_bookstore/views/new_page_template.xml b/theme_bookstore/views/new_page_template.xml
index c04a5e7a5..6c5504c77 100644
--- a/theme_bookstore/views/new_page_template.xml
+++ b/theme_bookstore/views/new_page_template.xml
@@ -72,23 +72,34 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt48" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc2" remove="o_cc1 o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" separator=" "/>
     </xpath>
 </template>
 
-<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_about_map_s_numbers" inherit_id="website.new_page_template_about_map_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
     </xpath>
 </template>
 
@@ -96,6 +107,7 @@
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc1 pt0" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -110,6 +122,12 @@
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
@@ -138,8 +156,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt48" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_1_s_text_block_h1" inherit_id="website.new_page_template_services_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -155,6 +185,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt48" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_buzzy/views/new_page_template.xml b/theme_buzzy/views/new_page_template.xml
index d35cf1a18..9dbea1f6b 100644
--- a/theme_buzzy/views/new_page_template.xml
+++ b/theme_buzzy/views/new_page_template.xml
@@ -66,6 +66,12 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_s_features" inherit_id="website.new_page_template_s_features">
+    <xpath expr="//div[hasclass('row')]//div[3]//i" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_product_catalog" inherit_id="website.new_page_template_s_product_catalog">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
@@ -86,6 +92,21 @@
     </xpath>
 </template>
 
+<template id="new_page_template_s_timeline" inherit_id="website.new_page_template_s_timeline">
+    <xpath expr="//i" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[2]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[3]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[4]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_three_columns" inherit_id="website.new_page_template_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -105,6 +126,13 @@
 
 <!-- Snippet customization Basic Pages -->
 
+<template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_cc2" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization About Pages -->
 
 <template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
@@ -128,7 +156,7 @@
 <template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pb0" separator=" "/>
+        <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pt40 pb40" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -143,28 +171,52 @@
     </xpath>
 </template>
 
-<template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt40" remove="o_cc2 pb0 pb40 pb40 pt40" separator=" "/>
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40 pb40 pt40" separator=" "/>
+        <attribute name="class" remove="pb0 pb40 pt40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_map_s_text_block_h1" inherit_id="website.new_page_template_about_map_s_text_block_h1">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2 pb0" remove="o_cc4 pb80 pt80" separator=" "/>
+        <attribute name="class" add="o_cc2 pt40" remove="o_cc4 pb80 pt80" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_mini_s_text_block_h2" inherit_id="website.new_page_template_about_mini_s_text_block_h2">
     <xpath expr="//*[hasclass('container')]" position="attributes">
         <attribute name="class" add="o_container_small" remove="container" separator=" "/>
@@ -174,6 +226,7 @@
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3 pt0" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -182,7 +235,8 @@
 
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <!-- o_cc defined in both theme and new page template -->
+        <attribute name="class" add="o_cc o_cc4" remove="o_cc o_cc2 o_cc3" separator=" "/>
     </xpath>
 </template>
 
@@ -197,6 +251,12 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <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_cc2" separator=" "/>
@@ -217,6 +277,7 @@
 <template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt112 pb112" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -230,6 +291,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_cc2" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_cc2" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
@@ -262,7 +337,7 @@
 <template id="new_page_template_gallery_s_text_block_h2" inherit_id="website.new_page_template_gallery_s_text_block_h2">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pb0" separator=" "/>
+        <attribute name="class" add="o_cc4 pt80 pb80" remove="o_cc2 pt40 pb0" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/13_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -271,6 +346,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+       <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_text_cover" inherit_id="website.new_page_template_services_s_text_cover">
@@ -279,6 +360,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -288,8 +375,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_0_s_text_block_h1" inherit_id="website.new_page_template_team_0_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="pb40" separator=" "/>
diff --git a/theme_clean/views/new_page_template.xml b/theme_clean/views/new_page_template.xml
index c12b1a512..569a43ce2 100644
--- a/theme_clean/views/new_page_template.xml
+++ b/theme_clean/views/new_page_template.xml
@@ -55,7 +55,8 @@
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40 pb40" remove="pb40" separator=" "/>
+        <!-- Defined in both theme and new page template -->
+        <attribute name="class" add="pb40" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -65,17 +66,41 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" remove="o_cc4 pt0" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -114,8 +139,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_1_s_text_block_h1" inherit_id="website.new_page_template_services_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -136,6 +173,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_cobalt/views/new_page_template.xml b/theme_cobalt/views/new_page_template.xml
index 088e5b41a..081c348a9 100644
--- a/theme_cobalt/views/new_page_template.xml
+++ b/theme_cobalt/views/new_page_template.xml
@@ -68,14 +68,32 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/11_001","flip":["y"]}</attribute>
@@ -99,8 +117,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_1_s_text_block_h1" inherit_id="website.new_page_template_services_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -115,8 +145,20 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
diff --git a/theme_enark/views/new_page_template.xml b/theme_enark/views/new_page_template.xml
index a46cc13ea..36043fbbe 100644
--- a/theme_enark/views/new_page_template.xml
+++ b/theme_enark/views/new_page_template.xml
@@ -51,16 +51,48 @@
 
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc1 o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- pt0 is defined by both theme and new page template -->
+        <attribute name="class" add="pt0" remove="o_cc1 pt0" separator=" "/>
     </xpath>
 </template>
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
+    <xpath expr="//section" position="attributes">
+        <!-- Defined by both theme and new page template -->
+        <attribute name="class" add="o_full_screen_height" remove="o_full_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_1_s_text_block_h1" inherit_id="website.new_page_template_services_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -71,6 +103,12 @@
 
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="pb40" separator=" "/>
diff --git a/theme_graphene/views/new_page_template.xml b/theme_graphene/views/new_page_template.xml
index f0debbd74..08f57fe3f 100644
--- a/theme_graphene/views/new_page_template.xml
+++ b/theme_graphene/views/new_page_template.xml
@@ -60,6 +60,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt0 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
@@ -72,6 +78,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
@@ -86,7 +98,7 @@
 
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="o_cc3 parallax" separator=" "/>
+        <attribute name="class" add="o_cc5" remove="o_cc3 parallax pt0" separator=" "/>
         <attribute name="style" remove="background-image: none;" separator=" "/>
     </xpath>
     <xpath expr="//div" position="attributes">
@@ -104,6 +116,7 @@
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt0 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["x","y"]}</attribute>
     </xpath>
     <xpath expr="//section/div[hasclass('container')]" position="before">
@@ -111,6 +124,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt160 pb240" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":[]}</attribute>
@@ -133,6 +152,12 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt0 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -182,6 +207,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt0 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="o_cc2 pb40" separator=" "/>
diff --git a/theme_kea/views/new_page_template.xml b/theme_kea/views/new_page_template.xml
index fa83dda22..ac3a41ece 100644
--- a/theme_kea/views/new_page_template.xml
+++ b/theme_kea/views/new_page_template.xml
@@ -56,7 +56,7 @@
 
 <template id="new_page_template_basic_s_features" inherit_id="website.new_page_template_basic_s_features">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
     </xpath>
 </template>
 
@@ -132,7 +132,13 @@
 
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2 pt24" remove="o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56" separator=" "/>
     </xpath>
 </template>
 
@@ -153,11 +159,19 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="pt0" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/22","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -194,6 +208,12 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -225,4 +245,10 @@
 
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_kiddo/views/new_page_template.xml b/theme_kiddo/views/new_page_template.xml
index b059ceecd..5c94a99dc 100644
--- a/theme_kiddo/views/new_page_template.xml
+++ b/theme_kiddo/views/new_page_template.xml
@@ -14,6 +14,8 @@
 <template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -36,6 +38,8 @@
 <template id="new_page_template_basic_s_picture" inherit_id="website.new_page_template_basic_s_picture">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -81,6 +85,8 @@
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -106,12 +112,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_map_s_text_block_h1" inherit_id="website.new_page_template_about_map_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" separator=" "/>
@@ -135,6 +153,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -153,12 +177,6 @@
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -190,6 +208,13 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
+    <xpath expr="//section" position="attributes">
+        <!-- Added both by theme and new page template -->
+        <attribute name="class" add="o_full_screen_height" remove="o_full_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
@@ -222,6 +247,7 @@
 <template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -239,6 +265,12 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -260,6 +292,7 @@
 <template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -277,9 +310,16 @@
 
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_picture" inherit_id="website.new_page_template_team_s_picture">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_s_image_text" inherit_id="website.new_page_template_team_s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt32" remove="pt232" separator=" "/>
+        <attribute name="class" remove="pt232" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -288,7 +328,7 @@
 
 <template id="new_page_template_team_s_image_text_2nd" inherit_id="website.new_page_template_team_s_image_text_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt32" remove="pt232" separator=" "/>
+        <attribute name="class" remove="pt32" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -303,7 +343,7 @@
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb32" remove="pb232" separator=" "/>
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
diff --git a/theme_loftspace/views/new_page_template.xml b/theme_loftspace/views/new_page_template.xml
index b232eba31..547bb1727 100644
--- a/theme_loftspace/views/new_page_template.xml
+++ b/theme_loftspace/views/new_page_template.xml
@@ -55,6 +55,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_s_features_grid" inherit_id="website.new_page_template_s_features_grid">
+    <xpath expr="(//i)[5]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_product_catalog" inherit_id="website.new_page_template_s_product_catalog">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
@@ -104,6 +110,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
@@ -119,6 +143,18 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
@@ -127,6 +163,18 @@
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt232" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -177,6 +225,7 @@
 <template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -194,6 +243,18 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_image_text" inherit_id="website.new_page_template_services_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -215,6 +276,7 @@
 <template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -238,6 +300,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="o_cc2 pb40" separator=" "/>
diff --git a/theme_monglia/views/new_page_template.xml b/theme_monglia/views/new_page_template.xml
index d34c8cd9b..7ef7ab1e8 100644
--- a/theme_monglia/views/new_page_template.xml
+++ b/theme_monglia/views/new_page_template.xml
@@ -30,7 +30,8 @@
 
 <template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
+        <!-- o_cc2 is added by both theme and new page template -->
+        <attribute name="class" add="o_cc2" remove="o_cc2 o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -57,13 +58,13 @@
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc2" separator=" "/>
+        <attribute name="class" add="pt40" remove="o_cc2 pt0" separator=" "/>
     </xpath>
 </template>
 
-<template id="new_page_template_about_full_1_s_text_block_h2" inherit_id="website.new_page_template_about_full_1_s_text_block_h2">
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
     </xpath>
 </template>
 
@@ -73,8 +74,16 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
     <xpath expr="//section" position="attributes">
+        <!-- pt56 added by both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -95,6 +104,9 @@
 </template>
 
 <template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="attributes">
         <attribute name="style" remove="font-size:36px;" separator=" "/>
     </xpath>
@@ -102,7 +114,8 @@
 
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <!-- o_cc3 is added by both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3 o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -110,6 +123,8 @@
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
+        <!-- pt56 is added by both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -124,6 +139,31 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_4_s_text_block_h2" inherit_id="website.new_page_template_landing_4_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
+    <xpath expr="//section" position="attributes">
+        <!-- Added both by theme and new page template -->
+        <attribute name="class" add="o_full_screen_height" remove="o_full_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
@@ -139,10 +179,23 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_gallery_2_s_text_block_2nd" inherit_id="website.new_page_template_gallery_2_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -150,6 +203,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_0_s_text_block_2nd" inherit_id="website.new_page_template_services_0_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_2_s_text_image" inherit_id="website.new_page_template_services_2_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt56 pb56" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_3_s_text_block_h1" inherit_id="website.new_page_template_services_3_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="pb40" separator=" "/>
@@ -165,11 +230,25 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_pricing_0_s_text_block_2nd" inherit_id="website.new_page_template_pricing_0_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -190,4 +269,10 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_1_s_text_image" inherit_id="website.new_page_template_team_1_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt56 pb56" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>
diff --git a/theme_nano/views/new_page_template.xml b/theme_nano/views/new_page_template.xml
index b25993d10..438c3dd34 100644
--- a/theme_nano/views/new_page_template.xml
+++ b/theme_nano/views/new_page_template.xml
@@ -54,6 +54,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_s_text_block_h1" inherit_id="website.new_page_template_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc1 pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_s_text_block_h2" inherit_id="website.new_page_template_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc5" remove="o_cc1 pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_text_block_h2_contact" inherit_id="website.new_page_template_s_text_block_h2_contact">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="pb40 pb96" separator=" "/>
@@ -67,13 +79,13 @@
 
 <template id="new_page_template_basic_s_text_block_h1" inherit_id="website.new_page_template_basic_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5 pb40" remove="pb96 o_cc1" separator=" "/>
+        <attribute name="class" add="pb40" remove="pb96" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc1 pb96" remove="pb40 o_cc5" separator=" "/>
+        <attribute name="class" add="pb96" remove="pb0 pb40 o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -98,7 +110,7 @@
 
 <template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="pb96" separator=" "/>
+        <attribute name="class" remove="pb96" separator=" "/>
     </xpath>
 </template>
 
@@ -110,19 +122,32 @@
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5 pb0" remove="o_cc5 pb40 pt40" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb40 pt40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_1_s_text_block_h2" inherit_id="website.new_page_template_about_full_1_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb96" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc5 pb96" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <!-- pt48 added by both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt48 pb48" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt40" remove="pb0" separator=" "/>
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb48" separator=" "/>
     </xpath>
 </template>
 
@@ -139,18 +164,33 @@
 </template>
 
 <template id="new_page_template_about_map_s_text_block_h1" inherit_id="website.new_page_template_about_map_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pb0" separator=" "/>
+    </xpath>
     <xpath expr="//h1" position="replace" mode="inner">About Us</xpath>
 </template>
 
 <template id="new_page_template_about_map_s_text_block_h2" inherit_id="website.new_page_template_about_map_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40" remove="pb96" separator=" "/>
+        <attribute name="class" add="o_cc1 pb40" remove="o_cc5 pb96" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_mini_s_text_block_h2" inherit_id="website.new_page_template_about_mini_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0" remove="pb96" separator=" "/>
+        <attribute name="class" add="o_cc1 pb0" remove="o_cc5 pb96" separator=" "/>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="attributes">
         <attribute name="class" add="o_container_small" remove="container" separator=" "/>
@@ -165,13 +205,14 @@
 
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2 pb40 pt40" remove="o_cc3 pb96 pt96" separator=" "/>
+        <!-- o_cc is defined in both theme and new page template -->
+        <attribute name="class" add="o_cc o_cc2 pb40 pt40" remove="o_cc o_cc3 o_cc5 pb0 pb96 pt96" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_timeline_s_text_block_h2" inherit_id="website.new_page_template_about_timeline_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5 pb40" remove="pb96" separator=" "/>
+        <attribute name="class" add="pb40" remove="pb96" separator=" "/>
     </xpath>
 </template>
 
@@ -186,9 +227,16 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt200 pb200" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Bold/12_001","flip":["x"]}</attribute>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="before">
@@ -209,13 +257,13 @@
 
 <template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="pb96 o_cc2" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb96 o_cc2" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="pb96 o_cc2" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb96 o_cc2" separator=" "/>
     </xpath>
 </template>
 
@@ -231,7 +279,7 @@
 
 <template id="new_page_template_landing_4_s_text_block_h2" inherit_id="website.new_page_template_landing_4_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5 pb40" remove="pb40 pb96" separator=" "/>
+        <attribute name="class" add="pb40" remove="pb40 pb96" separator=" "/>
     </xpath>
 </template>
 
@@ -248,6 +296,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- pt48 is defined by both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt40 pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_gallery_s_media_list" inherit_id="website.new_page_template_gallery_s_media_list">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
@@ -256,7 +311,7 @@
 
 <template id="new_page_template_gallery_s_text_block_h2" inherit_id="website.new_page_template_gallery_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="pb96" separator=" "/>
+        <attribute name="class" add="pb0" remove="pb96" separator=" "/>
     </xpath>
 </template>
 
@@ -264,13 +319,13 @@
 
 <template id="new_page_template_services_s_text_block_h1" inherit_id="website.new_page_template_services_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb96" separator=" "/>
+        <attribute name="class" add="o_cc1 pb0" remove="o_cc5 pb96" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_services_s_text_block_h2" inherit_id="website.new_page_template_services_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb96" separator=" "/>
+        <attribute name="class" add="o_cc1 pb0" remove="o_cc5 pb96" separator=" "/>
     </xpath>
 </template>
 
@@ -280,6 +335,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_3_s_parallax" inherit_id="website.new_page_template_services_3_s_parallax">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_3_s_text_block_h1" inherit_id="website.new_page_template_services_3_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb96" remove="pb40" separator=" "/>
@@ -299,21 +366,34 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- Defined by both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_pricing_s_text_block_h1" inherit_id="website.new_page_template_pricing_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb96" separator=" "/>
+        <attribute name="class" add="pb0 o_cc1" remove="o_cc5 pb96" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_s_text_block_h2" inherit_id="website.new_page_template_pricing_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="pb96" separator=" "/>
+        <attribute name="class" add="pb0 o_cc1" remove="o_cc5 pb96" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_pricing_4_s_image_text_2nd" inherit_id="website.new_page_template_pricing_4_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb48" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_pricing_5_s_text_block_h1" inherit_id="website.new_page_template_pricing_5_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb96" separator=" "/>
+        <attribute name="class" add="pb96" remove="pb0" separator=" "/>
     </xpath>
 </template>
 
@@ -321,7 +401,13 @@
 
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc5" remove="pb96" separator=" "/>
+        <attribute name="class" remove="pb96" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb48" separator=" "/>
     </xpath>
 </template>
 
@@ -339,13 +425,13 @@
 
 <template id="new_page_template_team_2_s_text_block_h1" inherit_id="website.new_page_template_team_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc5 pb0" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc5 pb0" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_team_3_s_text_block_h1" inherit_id="website.new_page_template_team_3_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc5 pb40" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc5 pb40" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/new_page_template.xml b/theme_notes/views/new_page_template.xml
index efe27a7b9..9e3848d9f 100644
--- a/theme_notes/views/new_page_template.xml
+++ b/theme_notes/views/new_page_template.xml
@@ -72,6 +72,13 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_s_quotes_carousel" inherit_id="website.new_page_template_s_quotes_carousel">
+    <xpath expr="//section" position="attributes">
+        <!-- o_cc is added by both theme and new page template -->
+        <attribute name="class" add="o_cc" remove="o_cc o_cc1" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Basic Pages -->
 
 <!-- Needed because it is removed for basic -->
@@ -119,21 +126,28 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pt24 pb24" remove="o_cc3 pt0 pb0" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb40 pb40 pt40" remove="o_cc2 pb0" separator=" "/>
+        <attribute name="class" add="pb40" remove="o_cc2 pb0" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
@@ -144,6 +158,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- pt0 is defined by both theme and new page template -->
+        <attribute name="class" add="o_cc pt0" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="replace"/>
 </template>
@@ -153,6 +174,7 @@
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
@@ -212,11 +234,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
@@ -241,11 +270,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
     </xpath>
 </template>
diff --git a/theme_odoo_experts/views/new_page_template.xml b/theme_odoo_experts/views/new_page_template.xml
index 77a826062..3f22534ee 100644
--- a/theme_odoo_experts/views/new_page_template.xml
+++ b/theme_odoo_experts/views/new_page_template.xml
@@ -33,19 +33,6 @@
     </xpath>
 </template>
 
-<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only" primary="True">
-    <xpath expr="//a" position="replace"/>
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Wavy_08" style="background-image: url('/web_editor/shape/web_editor/Wavy/08.svg?c2=o-color-3&amp;flip=y'); background-position: 50% 100%;"/>
-    </xpath>
-</template>
-
 <template id="new_page_template_s_product_catalog" inherit_id="website.new_page_template_s_product_catalog">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
@@ -90,7 +77,7 @@
     <xpath expr="//a" position="replace"/>
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -117,7 +104,7 @@
     <xpath expr="//a" position="replace"/>
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/08","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -132,6 +119,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc3" separator=" "/>
@@ -140,6 +145,12 @@
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
@@ -156,6 +167,12 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -172,6 +189,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="o_cc2 pb40" separator=" "/>
diff --git a/theme_orchid/views/new_page_template.xml b/theme_orchid/views/new_page_template.xml
index 102488695..32f10cd1e 100644
--- a/theme_orchid/views/new_page_template.xml
+++ b/theme_orchid/views/new_page_template.xml
@@ -107,6 +107,7 @@
 <template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -115,9 +116,22 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- Defined in both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2 pb40 pb40 pt40" remove="pb0" separator=" "/>
+        <attribute name="class" add="o_cc2 pb40" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
     </xpath>
 </template>
 
@@ -139,6 +153,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <!-- Defined in both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
 <template id="new_page_template_landing_s_showcase" inherit_id="website.new_page_template_landing_s_showcase">
@@ -150,6 +171,7 @@
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -201,6 +223,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- o_half_screen_height is defined by both theme and new page template -->
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
@@ -225,6 +254,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_image_text" inherit_id="website.new_page_template_services_s_image_text">
@@ -238,6 +273,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -262,11 +303,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
diff --git a/theme_paptic/views/new_page_template.xml b/theme_paptic/views/new_page_template.xml
index 357d31ef8..1568898b1 100644
--- a/theme_paptic/views/new_page_template.xml
+++ b/theme_paptic/views/new_page_template.xml
@@ -118,6 +118,7 @@
 
 <template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb16" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/02_001","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//section/div" position="before">
@@ -125,11 +126,41 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb0" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc3" separator=" "/>
+        <attribute name="class" remove="o_cc3 pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt192 pb0" separator=" "/>
     </xpath>
 </template>
 
@@ -175,6 +206,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb16" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_gallery_s_media_list" inherit_id="website.new_page_template_gallery_s_media_list">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc3" separator=" "/>
@@ -192,6 +229,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -213,6 +256,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb16" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_image_text" inherit_id="website.new_page_template_team_s_image_text">
@@ -227,6 +276,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc3 pb0" remove="pb40" separator=" "/>
diff --git a/theme_real_estate/views/new_page_template.xml b/theme_real_estate/views/new_page_template.xml
index afa8bdb30..a550fa7b1 100644
--- a/theme_real_estate/views/new_page_template.xml
+++ b/theme_real_estate/views/new_page_template.xml
@@ -20,9 +20,21 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_s_text_block_h1" inherit_id="website.new_page_template_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_s_text_block_h2" inherit_id="website.new_page_template_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_s_text_block_h2_contact" inherit_id="website.new_page_template_s_text_block_h2_contact">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc4" separator=" "/>
+        <attribute name="class" remove="o_cc4 pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -61,13 +73,20 @@
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc4 pb40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_about_full_1_s_text_block_h2" inherit_id="website.new_page_template_about_full_1_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc4" separator=" "/>
+        <attribute name="class" remove="o_cc4 pb40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <!-- pt48 is defined by both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt48 pb48" separator=" "/>
     </xpath>
 </template>
 
@@ -77,14 +96,39 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_mini_s_text_block_h2_contact" inherit_id="website.new_page_template_about_mini_s_text_block_h2_contact">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc1 o_cc3 pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <!-- o_cc is defined by theme and new page template -->
+        <attribute name="class" add="o_cc" remove="o_cc o_cc3" separator=" "/>
     </xpath>
 </template>
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -98,13 +142,19 @@
 
 <template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc2 o_cc4 pb40" separator=" "/>
     </xpath>
 </template>
 
 <template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc2 o_cc4" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_4_s_text_block_h2" inherit_id="website.new_page_template_landing_4_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
     </xpath>
 </template>
 
@@ -121,6 +171,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- pt48 is defined by both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_gallery_s_text_block_h2" inherit_id="website.new_page_template_gallery_s_text_block_h2">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc4" separator=" "/>
@@ -129,25 +186,50 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_block_h1" inherit_id="website.new_page_template_services_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb0" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_0_s_three_columns" inherit_id="website.new_page_template_services_0_s_three_columns">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_services_3_s_text_block_h1" inherit_id="website.new_page_template_services_3_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- pt48 is defined in both theme and new page template -->
+        <attribute name="class" add="pt48" remove="pt48 pb48" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" add="o_cc3" remove="o_cc4 pb40" separator=" "/>
     </xpath>
 </template>
 
-<template id="new_page_template_team_0_s_text_block_h1" inherit_id="website.new_page_template_team_0_s_text_block_h1">
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb0" remove="pb40" separator=" "/>
+        <attribute name="class" remove="pt48 pb0" separator=" "/>
     </xpath>
 </template>
 
@@ -165,7 +247,7 @@
 
 <template id="new_page_template_team_2_s_text_block_h1" inherit_id="website.new_page_template_team_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc4 pb40" remove="o_cc3 pb0" separator=" "/>
+        <attribute name="class" add="o_cc4" remove="o_cc3 pb0" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_treehouse/views/new_page_template.xml b/theme_treehouse/views/new_page_template.xml
index 26121687c..7859861b7 100644
--- a/theme_treehouse/views/new_page_template.xml
+++ b/theme_treehouse/views/new_page_template.xml
@@ -33,6 +33,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
@@ -40,15 +46,33 @@
 </template>
 
 <template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="replace"/>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt40 pb40" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Landing Pages -->
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="replace"/>
 </template>
 
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt160 pb160" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
@@ -84,6 +108,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <template id="new_page_template_services_s_text_block_h2" inherit_id="website.new_page_template_services_s_text_block_h2">
@@ -93,6 +123,9 @@
 </template>
 
 <template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="replace"/>
 </template>
 
@@ -104,6 +137,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_pricing_s_text_block_h1" inherit_id="website.new_page_template_pricing_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
@@ -125,6 +164,9 @@
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="replace"/>
 </template>
 
diff --git a/theme_vehicle/views/new_page_template.xml b/theme_vehicle/views/new_page_template.xml
index 85822508c..74d6088cd 100644
--- a/theme_vehicle/views/new_page_template.xml
+++ b/theme_vehicle/views/new_page_template.xml
@@ -57,9 +57,17 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <!-- pb56 is defined by both theme and new page template -->
+        <attribute name="class" add="pb56" remove="pt24 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc3" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -68,6 +76,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <!-- pb56 is defined by both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb24" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_map_s_numbers" inherit_id="website.new_page_template_about_map_s_numbers">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -79,14 +94,34 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt0 pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc4" separator=" "/>
+        <attribute name="class" remove="o_cc4 pt0" separator=" "/>
     </xpath>
 </template>
 
 <!-- Snippet customization Landing Pages -->
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <!-- pt56 is defined in both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb24" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- pb256 is defined in both theme and new page template -->
+        <attribute name="class" add="pb256" remove="pt0 pb256" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
@@ -131,8 +166,22 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- pb56 is defined in both theme and new page template -->
+        <attribute name="class" add="pb56" remove="pt24 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <!-- pt56 is defined in both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb24" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -141,6 +190,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- pb56 is defined in both theme and new page template -->
+        <attribute name="class" add="pb56" remove="pt24 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
@@ -149,6 +205,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <!-- pt56 is defined in both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb24" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_1_s_text_block_h1" inherit_id="website.new_page_template_team_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="o_cc3 pb40" separator=" "/>
diff --git a/theme_yes/views/new_page_template.xml b/theme_yes/views/new_page_template.xml
index 4495c6d97..27ef1c9ad 100644
--- a/theme_yes/views/new_page_template.xml
+++ b/theme_yes/views/new_page_template.xml
@@ -118,6 +118,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- Defined in both theme and new page template -->
+        <attribute name="class" add="o_half_screen_height" remove="pt40 pb40 o_half_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" separator=" "/>
@@ -144,6 +151,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
+    <xpath expr="//section" position="attributes">
+        <!-- pb256 is defined by both theme and new page template -->
+        <attribute name="class" add="pb256" remove="pt208 pb256" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -158,7 +172,7 @@
 <template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
     </xpath>
     <!-- Shape -->
@@ -182,7 +196,7 @@
 <template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
     </xpath>
     <!-- Shape -->
@@ -207,7 +221,7 @@
 <template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
     </xpath>
     <!-- Shape -->
@@ -229,7 +243,7 @@
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
+        <attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/14_001"}</attribute>
     </xpath>
     <!-- Shape -->
@@ -238,6 +252,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_3_s_carousel" inherit_id="website.new_page_template_pricing_3_s_carousel">
+    <xpath expr="//*[hasclass('carousel-item')][3]" position="attributes">
+        <attribute name="class" add="pt128 pb128" remove="pt152 pb152" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_company_team" inherit_id="website.new_page_template_team_s_company_team">
diff --git a/theme_zap/views/new_page_template.xml b/theme_zap/views/new_page_template.xml
index 594699312..79481a894 100644
--- a/theme_zap/views/new_page_template.xml
+++ b/theme_zap/views/new_page_template.xml
@@ -37,6 +37,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <!-- o_colored_level is defined by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
@@ -51,7 +58,8 @@
 
 <template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc3" separator=" "/>
+        <!-- o_colored_level is defined by both theme and new page template -->
+        <attribute name="class" add="o_cc2 o_colored_level" remove="o_cc3 o_colored_level pt0" separator=" "/>
     </xpath>
 </template>
 
@@ -79,18 +87,6 @@
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
-    </xpath>
-</template>
-
-<template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
-    </xpath>
-</template>
-
 <!-- Snippet customization Gallery Pages -->
 
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
@@ -109,6 +105,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- o_colored_level is defined by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Services Pages -->
 
 <!-- Snippet customization Pricing Pages -->
@@ -119,6 +122,13 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <!-- o_colored_level is defined by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">