diff --git a/site/themes/default/fieldsets/about.yaml b/site/themes/default/fieldsets/about.yaml
index d6f23fd7..eaca1a4b 100644
--- a/site/themes/default/fieldsets/about.yaml
+++ b/site/themes/default/fieldsets/about.yaml
@@ -1,15 +1,18 @@
 title: About
 default_field: title
-fields:
-  title:
-    title: admin_title
-    type: text
-    size: col-12
-  content:
-    title: admin_content
-    type: html
-    size: col-12
-  image:
-    title: admin_media
-    type: media_select
-    size: col-3
+sections:
+  main:
+    title: 'Main'
+    fields:
+      title:
+        title: admin_title
+        type: text
+        size: col-12
+      content:
+        title: admin_content
+        type: html
+        size: col-12
+      image:
+        title: admin_media
+        type: media_select
+        size: col-3
diff --git a/site/themes/default/fieldsets/blog-post.yaml b/site/themes/default/fieldsets/blog-post.yaml
index 9d8641c3..748ac619 100644
--- a/site/themes/default/fieldsets/blog-post.yaml
+++ b/site/themes/default/fieldsets/blog-post.yaml
@@ -1,15 +1,18 @@
 title: 'Blog Post'
 default_field: title
-fields:
-  title:
-    title: admin_title
-    type: text
-    size: col-12
-  summary:
-    title: admin_summary
-    type: html
-    size: col-12
-  content:
-    title: admin_content
-    type: html
-    size: col-12
+sections:
+  main:
+    title: 'Main'
+    fields:
+      title:
+        title: admin_title
+        type: text
+        size: col-12
+      summary:
+        title: admin_summary
+        type: html
+        size: col-12
+      content:
+        title: admin_content
+        type: html
+        size: col-12
diff --git a/site/themes/default/fieldsets/blog.yaml b/site/themes/default/fieldsets/blog.yaml
index 75aa6d9d..e27b506f 100644
--- a/site/themes/default/fieldsets/blog.yaml
+++ b/site/themes/default/fieldsets/blog.yaml
@@ -1,7 +1,10 @@
 title: Blog
 default_field: title
-fields:
-  title:
-    title: admin_title
-    type: text
-    size: col-12
+sections:
+  main:
+    title: 'Main'
+    fields:
+      title:
+        title: admin_title
+        type: text
+        size: col-12