diff --git a/shared/templates/styleguide2/form_page.html b/shared/templates/styleguide2/form_page.html
index 3db4bac03db5711495372574359d1f26a226eb27..dad677feeb37665936ebc1e0255ee38b24e45a18 100644
--- a/shared/templates/styleguide2/form_page.html
+++ b/shared/templates/styleguide2/form_page.html
@@ -16,7 +16,19 @@
     {% endfor %}
 
     <form
-      class="flex flex-col gap-8"
+      class="
+        flex flex-col gap-8
+
+        {% if not page.root_page.content_is_full_width %}
+          max-w-[100ch]
+        {% else %}
+          max-w-[100%]
+        {% endif %}
+
+        {% if page.root_page.content_is_centered %}
+          mx-auto
+        {% endif %}
+      "
       action="{% pageurl page %}"
       method="post"
     >
diff --git a/shared/templates/styleguide2/includes/atoms/text/heading.html b/shared/templates/styleguide2/includes/atoms/text/heading.html
index 32c65a9eadd58b01a3cdbb388e3c217eb230b12c..b2a07bb1d2f876236d51d9b6a12055223a1fc93e 100644
--- a/shared/templates/styleguide2/includes/atoms/text/heading.html
+++ b/shared/templates/styleguide2/includes/atoms/text/heading.html
@@ -1,11 +1,25 @@
-<{{ self.tag }}
+<div
   class="
-    {{ responsive_style }}
+   {% if not page.root_page.content_is_full_width %}
+      max-w-[100ch]
+    {% else %}
+      max-w-[100%]
+    {% endif %}
 
-    {% if self.align == "center" %}
-      text-center
+    {% if page.root_page.content_is_centered %}
+      mx-auto
     {% endif %}
   "
 >
-  {{ self.headline }}
-</{{ self.tag }}>
+  <{{ self.tag }}
+    class="
+      {{ responsive_style }}
+
+      {% if self.align == "center" %}
+        text-center
+      {% endif %}
+    "
+  >
+    {{ self.headline }}
+  </{{ self.tag }}>
+</div>