diff --git a/assets/base.css b/assets/base.css
index 2af5d1ab175..3b86e2cae29 100644
--- a/assets/base.css
+++ b/assets/base.css
@@ -2175,10 +2175,6 @@ input[type='checkbox'] {
 }
 
 /* section-announcement-bar */
-#shopify-section-announcement-bar {
-  z-index: 4;
-}
-
 .announcement-bar {
   border-bottom: 0.1rem solid rgba(var(--color-foreground), 0.08);
   color: rgb(var(--color-foreground));
@@ -2215,7 +2211,7 @@ input[type='checkbox'] {
 }
 
 /* section-header */
-#shopify-section-header {
+.section-header.shopify-section-group-header-group {
   z-index: 3;
 }
 
@@ -2232,10 +2228,18 @@ input[type='checkbox'] {
   transform: translateY(0);
 }
 
-#shopify-section-header.animate {
+.section-header.animate {
   transition: transform 0.15s ease-out;
 }
 
+.shopify-section-group-header-group {
+  z-index: 4;
+}
+
+.section-header ~ .shopify-section-group-header-group {
+  z-index: initial;
+}
+
 /* Main Header Layout */
 .header-wrapper {
   display: block;
diff --git a/assets/global.js b/assets/global.js
index 11ee05acb67..b2bc15e12ab 100644
--- a/assets/global.js
+++ b/assets/global.js
@@ -420,7 +420,7 @@ class HeaderDrawer extends MenuDrawer {
   }
 
   openMenuDrawer(summaryElement) {
-    this.header = this.header || document.getElementById('shopify-section-header');
+    this.header = this.header || document.querySelector('.section-header');
     this.borderOffset = this.borderOffset || this.closest('.header-wrapper').classList.contains('header-wrapper--border-bottom') ? 1 : 0;
     document.documentElement.style.setProperty('--header-bottom-position', `${parseInt(this.header.getBoundingClientRect().bottom - this.borderOffset)}px`);
     this.header.classList.add('menu-open');
diff --git a/assets/predictive-search.js b/assets/predictive-search.js
index b6908a82a0f..25593da3c4b 100644
--- a/assets/predictive-search.js
+++ b/assets/predictive-search.js
@@ -205,7 +205,7 @@ class PredictiveSearch extends SearchForm {
   }
 
   getResultsMaxHeight() {
-    this.resultsMaxHeight = window.innerHeight - document.getElementById('shopify-section-header').getBoundingClientRect().bottom;
+    this.resultsMaxHeight = window.innerHeight - document.querySelector('.section-header').getBoundingClientRect().bottom;
     return this.resultsMaxHeight;
   }
 
diff --git a/config/settings_data.json b/config/settings_data.json
index 9f6271a6607..fd540847415 100644
--- a/config/settings_data.json
+++ b/config/settings_data.json
@@ -121,77 +121,6 @@
       "predictive_search_show_price": false,
       "currency_code_enabled": true,
       "sections": {
-        "announcement-bar": {
-          "type": "announcement-bar",
-          "blocks": {
-            "announcement-bar-0": {
-              "type": "announcement",
-              "settings": {
-                "text": "Welcome to our store",
-                "color_scheme": "background-1",
-                "link": ""
-              }
-            }
-          },
-          "block_order": [
-            "announcement-bar-0"
-          ]
-        },
-        "header": {
-          "type": "header",
-          "settings": {
-            "color_scheme": "background-1",
-            "logo_width": 90,
-            "logo_position": "middle-left",
-            "menu": "main-menu",
-            "show_line_separator": true,
-            "enable_sticky_header": true,
-            "margin_bottom": 0
-          }
-        },
-        "footer": {
-          "type": "footer",
-          "blocks": {
-            "footer-0": {
-              "type": "link_list",
-              "settings": {
-                "heading": "Quick links",
-                "menu": "footer"
-              }
-            },
-            "footer-1": {
-              "type": "link_list",
-              "settings": {
-                "heading": "Info",
-                "menu": "footer"
-              }
-            },
-            "footer-2": {
-              "type": "text",
-              "settings": {
-                "heading": "Our mission",
-                "subtext": "<p>Share contact information, store details, and brand content with your customers.<\/p>"
-              }
-            }
-          },
-          "block_order": [
-            "footer-0",
-            "footer-1",
-            "footer-2"
-          ],
-          "settings": {
-            "color_scheme": "background-1",
-            "newsletter_enable": true,
-            "newsletter_heading": "Subscribe to our emails",
-            "show_social": true,
-            "enable_country_selector": true,
-            "enable_language_selector": true,
-            "payment_enable": true,
-            "margin_top": 48,
-            "padding_top": 36,
-            "padding_bottom": 36
-          }
-        },
         "main-password-header": {
           "type": "main-password-header",
           "settings": {
diff --git a/layout/theme.liquid b/layout/theme.liquid
index a3829a73e86..f99323db09c 100644
--- a/layout/theme.liquid
+++ b/layout/theme.liquid
@@ -245,13 +245,13 @@
       {%- render 'cart-drawer' -%}
     {%- endif -%}
 
-    {% section 'announcement-bar' %}
-    {% section 'header' %}
+    {% sections 'header-group' %}
+
     <main id="MainContent" class="content-for-layout focus-none" role="main" tabindex="-1">
       {{ content_for_layout }}
     </main>
 
-    {% section 'footer' %}
+    {% sections 'footer-group' %}
 
     <ul hidden>
       <li id="a11y-refresh-page-message">{{ 'accessibility.refresh_page' | t }}</li>
diff --git a/sections/announcement-bar.liquid b/sections/announcement-bar.liquid
index 7322de5bd4e..6330eff6165 100644
--- a/sections/announcement-bar.liquid
+++ b/sections/announcement-bar.liquid
@@ -26,6 +26,7 @@
 {
   "name": "t:sections.announcement-bar.name",
   "max_blocks": 12,
+  "class": "announcement-bar-section",
   "blocks": [
     {
       "type": "announcement",
diff --git a/sections/collage.liquid b/sections/collage.liquid
index a98ddaea25a..3ba716e0f76 100644
--- a/sections/collage.liquid
+++ b/sections/collage.liquid
@@ -203,6 +203,9 @@
   "name": "t:sections.collage.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid
index e3f7d9ba1b3..2832b3630e1 100644
--- a/sections/collapsible-content.liquid
+++ b/sections/collapsible-content.liquid
@@ -95,6 +95,9 @@
   "name": "t:sections.collapsible_content.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid
index de62f8ae53e..70b991fea45 100644
--- a/sections/collection-list.liquid
+++ b/sections/collection-list.liquid
@@ -122,6 +122,9 @@
   "tag": "section",
   "class": "section section-collection-list",
   "max_blocks": 15,
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/contact-form.liquid b/sections/contact-form.liquid
index fa9bed44079..372fee6df29 100644
--- a/sections/contact-form.liquid
+++ b/sections/contact-form.liquid
@@ -132,6 +132,9 @@
   "name": "t:sections.contact-form.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/featured-blog.liquid b/sections/featured-blog.liquid
index 07a514c5e50..58e32932261 100644
--- a/sections/featured-blog.liquid
+++ b/sections/featured-blog.liquid
@@ -137,7 +137,9 @@
 {
   "name": "t:sections.featured-blog.name",
   "tag": "section",
-  "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid
index 97d9394c3d6..4982e75cc20 100644
--- a/sections/featured-collection.liquid
+++ b/sections/featured-collection.liquid
@@ -144,6 +144,9 @@
   "name": "t:sections.featured-collection.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index d7c34c5564b..8c2d2375a56 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -443,6 +443,9 @@
   "name": "t:sections.featured-product.name",
   "tag": "section",
   "class": "section section-featured-product",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "blocks": [
     {
       "type": "@app"
diff --git a/sections/footer-group.json b/sections/footer-group.json
new file mode 100644
index 00000000000..598e04a1c96
--- /dev/null
+++ b/sections/footer-group.json
@@ -0,0 +1,52 @@
+{
+  "name": "t:sections.footer.name",
+  "type": "footer",
+  "sections": {
+    "footer": {
+      "type": "footer",
+      "blocks": {
+        "footer-0": {
+          "type": "link_list",
+          "settings": {
+            "heading": "Quick links",
+            "menu": "footer"
+          }
+        },
+        "footer-1": {
+          "type": "link_list",
+          "settings": {
+            "heading": "Info",
+            "menu": "footer"
+          }
+        },
+        "footer-2": {
+          "type": "text",
+          "settings": {
+            "heading": "Our mission",
+            "subtext": "<p>Share contact information, store details, and brand content with your customers.<\/p>"
+          }
+        }
+      },
+      "block_order": [
+        "footer-0",
+        "footer-1",
+        "footer-2"
+      ],
+      "settings": {
+        "color_scheme": "background-1",
+        "newsletter_enable": true,
+        "newsletter_heading": "Subscribe to our emails",
+        "show_social": true,
+        "enable_country_selector": false,
+        "enable_language_selector": false,
+        "payment_enable": true,
+        "margin_top": 48,
+        "padding_top": 36,
+        "padding_bottom": 36
+      }
+    }
+  },
+  "order": [
+    "footer"
+  ]
+}
diff --git a/sections/footer.liquid b/sections/footer.liquid
index b1c0ccf70c6..23fa6a8ab5d 100644
--- a/sections/footer.liquid
+++ b/sections/footer.liquid
@@ -57,6 +57,8 @@
               {%- endif -%}
 
               {%- case block.type -%}
+                {%- when '@app' -%}
+                  {% render block %}
                 {%- when 'text' -%}
                   <div class="footer-block__details-content rte">
                     {{ block.settings.subtext }}
@@ -405,6 +407,9 @@
 {
   "name": "t:sections.footer.name",
   "blocks": [
+    {
+      "type": "@app"
+    },
     {
       "type": "link_list",
       "name": "t:sections.footer.blocks.link_list.name",
diff --git a/sections/header-group.json b/sections/header-group.json
new file mode 100644
index 00000000000..21df2d3d1a5
--- /dev/null
+++ b/sections/header-group.json
@@ -0,0 +1,44 @@
+{
+  "name": "t:sections.header.name",
+  "type": "header",
+  "sections": {
+    "announcement-bar": {
+      "type": "announcement-bar",
+      "blocks": {
+        "announcement-bar-0": {
+          "type": "announcement",
+          "settings": {
+            "text": "Welcome to our store",
+            "text_alignment": "center",
+            "color_scheme": "background-1",
+            "link": ""
+          }
+        }
+      },
+      "block_order": [
+        "announcement-bar-0"
+      ]
+    },
+    "header": {
+      "type": "header",
+      "settings": {
+        "color_scheme": "background-1",
+        "logo": "{{ shop.brand.logo }}",
+        "logo_width": 90,
+        "logo_position": "middle-left",
+        "menu": "main-menu",
+        "menu_type_desktop": "dropdown",
+        "show_line_separator": true,
+        "enable_sticky_header": true,
+        "mobile_logo_position": "center",
+        "margin_bottom": 0,
+        "padding_top": 20,
+        "padding_bottom": 20
+      }
+    }
+  },
+  "order": [
+    "announcement-bar",
+    "header"
+  ]
+}
diff --git a/sections/header.liquid b/sections/header.liquid
index fa15de74dca..78c24bf1e92 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -670,7 +670,7 @@
     }
 
     connectedCallback() {
-      this.header = document.getElementById('shopify-section-header');
+      this.header = document.querySelector('.section-header');
       this.headerIsAlwaysSticky = this.getAttribute('data-sticky-type') === 'always' || this.getAttribute('data-sticky-type') === 'reduce-logo-size';
       this.headerBounds = {};
 
diff --git a/sections/image-banner.liquid b/sections/image-banner.liquid
index d1d93d81c93..05f6c75dcfb 100644
--- a/sections/image-banner.liquid
+++ b/sections/image-banner.liquid
@@ -146,6 +146,9 @@
   "name": "t:sections.image-banner.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "image_picker",
diff --git a/sections/image-with-text.liquid b/sections/image-with-text.liquid
index 93fed47604b..88e297fe9da 100644
--- a/sections/image-with-text.liquid
+++ b/sections/image-with-text.liquid
@@ -85,6 +85,9 @@
 {
   "name": "t:sections.image-with-text.name",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "image_picker",
diff --git a/sections/multicolumn.liquid b/sections/multicolumn.liquid
index 07ff7ea218b..fd3f2bad622 100644
--- a/sections/multicolumn.liquid
+++ b/sections/multicolumn.liquid
@@ -170,6 +170,9 @@
   "name": "t:sections.multicolumn.name",
   "class": "section",
   "tag": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",
diff --git a/sections/newsletter.liquid b/sections/newsletter.liquid
index d93a65160a3..610865db68a 100644
--- a/sections/newsletter.liquid
+++ b/sections/newsletter.liquid
@@ -97,6 +97,9 @@
   "name": "t:sections.newsletter.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header"]
+  },
   "settings": [
     {
       "type": "select",
diff --git a/sections/page.liquid b/sections/page.liquid
index 473289da675..39723559546 100644
--- a/sections/page.liquid
+++ b/sections/page.liquid
@@ -44,6 +44,9 @@
   "name": "t:sections.page.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "page",
diff --git a/sections/rich-text.liquid b/sections/rich-text.liquid
index dd01cb4d0e8..2dad1ed6fa5 100644
--- a/sections/rich-text.liquid
+++ b/sections/rich-text.liquid
@@ -81,6 +81,9 @@
   "name": "t:sections.rich-text.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "select",
diff --git a/sections/slideshow.liquid b/sections/slideshow.liquid
index df33a369ce1..9712d2fcb6f 100644
--- a/sections/slideshow.liquid
+++ b/sections/slideshow.liquid
@@ -174,6 +174,9 @@
   "name": "t:sections.slideshow.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "select",
diff --git a/sections/video.liquid b/sections/video.liquid
index 721cd51aac6..c7de7b3fae0 100644
--- a/sections/video.liquid
+++ b/sections/video.liquid
@@ -127,6 +127,9 @@
   "name": "t:sections.video.name",
   "tag": "section",
   "class": "section",
+  "disabled_on": {
+    "groups": ["header", "footer"]
+  },
   "settings": [
     {
       "type": "text",