diff --git a/NodeTypes/Document/Book/Book.fusion b/NodeTypes/Document/Book/Book.fusion
index 489e2e1e..d2d170dc 100644
--- a/NodeTypes/Document/Book/Book.fusion
+++ b/NodeTypes/Document/Book/Book.fusion
@@ -7,27 +7,22 @@ prototype(Neos.Demo:Document.Book) < prototype(Neos.Demo:Document.LandingPage) {
         renderDummyImage = ${node.context.inBackend}
         content = Neos.Neos:ContentCollection {
             nodePath = 'main'
-            attributes.class = 'prose'
         }
         chapters = Neos.Fusion:Map {
             items = ${q(documentNode).children('[instanceof Neos.Demo:Document.Chapter]').get()}
             itemName = 'chapter'
-            itemRenderer = Neos.Fusion:Component {
+            itemRenderer = Neos.Fusion:DataStructure {
                 href = Neos.Neos:NodeUri {
                     node = ${chapter}
                 }
                 title = ${q(chapter).property('title')}
-                chapterImage  = ${q(chapter).property('chapterImage')}
-                imageAlt = ${q(chapter).property('chapterImageAlt')}
                 description =  ${q(chapter).property('chapterDescription')}
-                renderer = Neos.Fusion:DataStructure {
-                    @apply.props = ${props}
-                    imageSrc = Neos.Neos:ImageUri {
-                        @if.hasImage = ${props.chapterImage}
-                        asset = ${props.chapterImage}
-                        maximumWidth = 144
-                    }
+                imageSrc = Neos.Neos:ImageUri {
+                    @if.hasImage = ${q(chapter).property('chapterImage')}
+                    asset = ${q(chapter).property('chapterImage')}
+                    maximumWidth = 144
                 }
+                imageAlt = ${q(chapter).property('chapterImageAlt')}
             }
         }
 
diff --git a/NodeTypes/Document/Chapter/Chapter.fusion b/NodeTypes/Document/Chapter/Chapter.fusion
index 17bfec1a..fae601bf 100644
--- a/NodeTypes/Document/Chapter/Chapter.fusion
+++ b/NodeTypes/Document/Chapter/Chapter.fusion
@@ -2,10 +2,7 @@
  * Render for the chapter site
  */
 prototype(Neos.Demo:Document.Chapter) < prototype(Neos.Fusion:Component) {
-    bodyClass = null
-    breadcrumb = Neos.Demo:Integration.Breadcrumb {
-        class = 'not-prose mb-4'
-    }
+    breadcrumb = Neos.Demo:Integration.Breadcrumb
     footer  = Neos.Fusion:Renderer {
         renderPath = '/footer'
     }
@@ -25,7 +22,6 @@ prototype(Neos.Demo:Document.Chapter) < prototype(Neos.Fusion:Component) {
         }
     }
     renderer = Neos.Demo:Document {
-        class = ${props.bodyClass}
         content = Neos.Demo:Presentation.Layout.Chapter {
             @apply.props = ${props}
             chapterImageSrc = Neos.Neos:ImageUri {
diff --git a/Resources/Private/Fusion/Presentation/Layout/Chapter.fusion b/Resources/Private/Fusion/Presentation/Layout/Chapter.fusion
index 998da18d..eee73643 100644
--- a/Resources/Private/Fusion/Presentation/Layout/Chapter.fusion
+++ b/Resources/Private/Fusion/Presentation/Layout/Chapter.fusion
@@ -24,7 +24,7 @@ prototype(Neos.Demo:Presentation.Layout.Chapter) < prototype(Neos.Fusion:Compone
     renderer = afx`
         <div class="max-w-screen-sm px-4 pt-4 text-justify mx-auto prose prose-lg [&_p:first-of-type:first-letter]:dropcap [&_p:first-of-type:first-letter]:text-light">
             {props.breadcrumb}
-            <header class="mb-4 not-prose">
+            <header class="mb-4">
                 <h1 class="text-6xl">{props.title}</h1>
             </header>
             <Neos.Demo:Presentation.Image