diff --git a/wp-content/themes/ccat/acf-json/group_section_container.json b/wp-content/themes/ccat/acf-json/group_section_container.json
index f1ad8a2..289dafa 100644
--- a/wp-content/themes/ccat/acf-json/group_section_container.json
+++ b/wp-content/themes/ccat/acf-json/group_section_container.json
@@ -38,7 +38,7 @@
             "show_in_graphql": 1,
             "graphql_description": "",
             "graphql_field_name": "contentWidth",
-            "graphql_non_null": 1,
+            "graphql_non_null": 0,
             "ajax": 0,
             "placeholder": "",
             "create_options": 0,
@@ -75,5 +75,5 @@
     "graphql_types": "",
     "acfe_meta": "",
     "acfe_note": "",
-    "modified": 1758564033
+    "modified": 1758742387
 }
diff --git a/wp-content/themes/ccat/acf-json/group_section_theme.json b/wp-content/themes/ccat/acf-json/group_section_theme.json
index 09857fb..ec48e45 100644
--- a/wp-content/themes/ccat/acf-json/group_section_theme.json
+++ b/wp-content/themes/ccat/acf-json/group_section_theme.json
@@ -26,21 +26,22 @@
             "return_format": "value",
             "multiple": 0,
             "max": "",
-            "allow_custom": 0,
-            "placeholder": "",
-            "search_placeholder": "",
             "prepend": "",
             "append": "",
+            "required_message": "",
             "allow_null": 0,
             "allow_in_bindings": 0,
             "ui": 0,
             "show_in_graphql": 1,
             "graphql_description": "",
             "graphql_field_name": "bgColor",
-            "graphql_non_null": 1,
+            "graphql_non_null": 0,
             "ajax": 0,
+            "placeholder": "",
             "create_options": 0,
             "save_options": 0,
+            "allow_custom": 0,
+            "search_placeholder": "",
             "min": ""
         }
     ],
@@ -71,5 +72,5 @@
     "graphql_types": "",
     "acfe_meta": "",
     "acfe_note": "",
-    "modified": 1758564696
+    "modified": 1758742399
 }
diff --git a/wp-content/themes/ccat/app/components/sections/SectionTextBlock.fragment.gql b/wp-content/themes/ccat/app/components/sections/SectionTextBlock.fragment.gql
index 6fd5c07..de160b2 100644
--- a/wp-content/themes/ccat/app/components/sections/SectionTextBlock.fragment.gql
+++ b/wp-content/themes/ccat/app/components/sections/SectionTextBlock.fragment.gql
@@ -1,8 +1,6 @@
 fragment SectionTextBlock on GroupAbstractBuilderSectionsTextBlockLayout {
   content
   layoutSettings {
-    __typename
-    contentWidth
-    bgColor
+    ...SectionWrapper
   }
 }
diff --git a/wp-content/themes/ccat/app/components/sections/SectionWrapper.fragment.gql b/wp-content/themes/ccat/app/components/sections/SectionWrapper.fragment.gql
new file mode 100644
index 0000000..ef2b26c
--- /dev/null
+++ b/wp-content/themes/ccat/app/components/sections/SectionWrapper.fragment.gql
@@ -0,0 +1,4 @@
+fragment SectionWrapper on GroupAbstractBuilderSectionsLayoutSettings {
+  bgColor
+  contentWidth
+}
\ No newline at end of file
diff --git a/wp-content/themes/ccat/app/components/sections/SectionWrapper.vue b/wp-content/themes/ccat/app/components/sections/SectionWrapper.vue
new file mode 100644
index 0000000..55b952f
--- /dev/null
+++ b/wp-content/themes/ccat/app/components/sections/SectionWrapper.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import type { SectionWrapperFragment } from "#graphql-operations";
+
+defineProps<SectionWrapperFragment>();
+</script>
+
+<template>
+  <section :class="bgColor">
+    <div :class="contentWidth">
+      <slot />
+    </div>
+  </section>
+</template>
diff --git a/wp-content/themes/ccat/app/components/sections/TheSections.vue b/wp-content/themes/ccat/app/components/sections/TheSections.vue
index f5f44eb..14cfc9d 100644
--- a/wp-content/themes/ccat/app/components/sections/TheSections.vue
+++ b/wp-content/themes/ccat/app/components/sections/TheSections.vue
@@ -6,5 +6,7 @@ const sections = props.sections.filter(Boolean).map((section) => useSection(sect
 </script>
 
 <template>
-  <component :is="component" v-for="({ component, attrs }, i) in sections" :key="i" v-bind="attrs" />
+  <SectionWrapper v-for="({ component, attrs }, i) in sections" :key="i" v-bind="attrs.layoutSettings || {}">
+    <component :is="component" v-bind="attrs" />
+  </SectionWrapper>
 </template>
diff --git a/wp-content/themes/ccat/server/schema.graphql b/wp-content/themes/ccat/server/schema.graphql
index 773be18..9d801d7 100644
--- a/wp-content/themes/ccat/server/schema.graphql
+++ b/wp-content/themes/ccat/server/schema.graphql
@@ -6669,12 +6669,12 @@ type GroupAbstractBuilderSectionsLayoutSettings implements AcfFieldGroup & AcfFi
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionTheme&quot; Field Group
   """
-  bgColor: [String]!
+  bgColor: [String]
 
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionContainer&quot; Field Group
   """
-  contentWidth: [String]!
+  contentWidth: [String]
 
   """The name of the field group"""
   fieldGroupName: String @deprecated(reason: "Use __typename instead")
@@ -21726,7 +21726,7 @@ type SectionContainer implements AcfFieldGroup & AcfFieldGroupFields & SectionCo
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionContainer&quot; Field Group
   """
-  contentWidth: [String]!
+  contentWidth: [String]
 
   """The name of the field group"""
   fieldGroupName: String @deprecated(reason: "Use __typename instead")
@@ -21739,7 +21739,7 @@ interface SectionContainer_Fields implements AcfFieldGroup & AcfFieldGroupFields
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionContainer&quot; Field Group
   """
-  contentWidth: [String]!
+  contentWidth: [String]
 
   """The name of the field group"""
   fieldGroupName: String @deprecated(reason: "Use __typename instead")
@@ -21752,7 +21752,7 @@ type SectionTheme implements AcfFieldGroup & AcfFieldGroupFields & SectionTheme_
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionTheme&quot; Field Group
   """
-  bgColor: [String]!
+  bgColor: [String]
 
   """The name of the field group"""
   fieldGroupName: String @deprecated(reason: "Use __typename instead")
@@ -21765,7 +21765,7 @@ interface SectionTheme_Fields implements AcfFieldGroup & AcfFieldGroupFields {
   """
   Field of the &quot;select&quot; Field Type added to the schema as part of the &quot;SectionTheme&quot; Field Group
   """
-  bgColor: [String]!
+  bgColor: [String]
 
   """The name of the field group"""
   fieldGroupName: String @deprecated(reason: "Use __typename instead")