diff --git a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php b/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php
index 503f249b..c25b50da 100644
--- a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php
+++ b/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php
@@ -51,6 +51,7 @@ class ContainerViewHelper extends AbstractViewHelper
 
         $this->registerArgument('content', 'string', 'The content');
         $this->registerArgument('cssClasses', 'string', 'Additional css classes');
+        $this->registerArgument('rteContent', 'boolean', 'Is rte content', false, false);
         $this->registerArgument('data', 'Array', 'The data', true);
     }
 
@@ -81,8 +82,8 @@ class ContainerViewHelper extends AbstractViewHelper
         if ($arguments['cssClasses'] !== null) {
             $classes[] = $arguments['cssClasses'];
         }
-        if (count($classes) > 0) {
-            return '<div class="' . implode(' ', $classes) . '">' . $content . '</div>';
+        if (true === $arguments['rteContent'] || count($classes) > 0) {
+            return sprintf('<div class="%s"%s>%s</div>', implode(' ', $classes), $arguments['rteContent'] ? ' data-rte-content' : '', $content);
         }
 
         return $content;
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss
new file mode 100644
index 00000000..27fc1235
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss
@@ -0,0 +1,3 @@
+ul {
+    @apply list-disc;
+}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
index 3a529638..529a2f3d 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss
@@ -67,6 +67,10 @@
     @import "subpage";
     @import "searchpage";
     @import "employee";
+
+    [data-rte-content] {
+        @import "rte-content";
+    }
 }
 
 @layer components {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
index 953db093..67030d53 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
@@ -7,7 +7,7 @@
         <div class="container-fluid ep-disturber ep-expert">
             <div>
                 <div>
-                    <div class="container">
+                    <div class="container" data-rte-content>
                         <div class="col-md-6">
                             <f:if condition="{image}">
                                 <f:then>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html
index 71580b1c..56054258 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html
@@ -4,7 +4,7 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
 	<f:section name="Disturber">
-		<div class="container-fluid ep-disturber-last-chance">
+		<div class="container-fluid ep-disturber-last-chance" data-rte-content>
 			<div>{data.headline}</div>
 			<div>{data.text -> f:format.html()}</div>
 			<div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html
index 06666ad5..a3317087 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html
@@ -5,7 +5,7 @@
 
 	<f:section name="Disturber">
 		{data.flexForm.buttons -> v:iterator.first() -> v:variable.set(name: 'button')}
-		<div class="container-fluid ep-disturber-reminder">
+		<div class="container-fluid ep-disturber-reminder" data-rte-content>
 			<div>{data.headline}</div>
             <div class="col-md-6">
                 <a href="{f:uri.typolink(parameter: button.container.link)}" title="{button.container.label -> f:format.raw()}">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
index a42320c6..0968db46 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
@@ -7,7 +7,7 @@
         <div class="container-fluid ep-disturber ep-expert-small">
             <div>
                 <div>
-                    <div class="container">
+                    <div class="container" data-rte-content>
                         <div class="col-sm-2">
                             <f:if condition="{image}">
                                 <f:then>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
index 7eb232d8..34983db5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
@@ -7,7 +7,7 @@
         <div class="container-fluid ep-disturber ep-expert">
             <div>
                 <div>
-                    <div class="container">
+                    <div class="container" data-rte-content>
                         <div class="col-md-6">
                             <f:if condition="{teaserImage}">
                                 <f:then>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
index b7a770ea..c3d270aa 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
@@ -4,7 +4,7 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
 	<f:section name="Disturber">
-		<div class="container-fluid ep-disturber-last-chance">
+		<div class="container-fluid ep-disturber-last-chance" data-rte-content>
 			<div>{data.header}</div>
 			<div>{data.bodytext -> f:format.html()}</div>
 			<div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
index 01165b24..aad072a2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html
@@ -5,7 +5,7 @@
 
 	<f:section name="Disturber">
 		{data.flexForm.buttons -> v:iterator.first() -> v:variable.set(name: 'button')}
-		<div class="container-fluid ep-disturber-reminder">
+		<div class="container-fluid ep-disturber-reminder" data-rte-content>
 			<div>{data.header}</div>
             <div class="col-md-6">
                 <a href="{f:uri.typolink(parameter: button.container.link)}" title="{button.container.label -> f:format.raw()}">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
index e8bfc78e..9c5e637f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
@@ -4,7 +4,7 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Disturber">
-        <div class="container-fluid ep-disturber ep-expert-small">
+        <div class="container-fluid ep-disturber ep-expert-small" data-rte-content>
             <div>
                 <div>
                     <div class="container">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
index 6440ee3b..857209f5 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
@@ -29,7 +29,7 @@
             </f:if>
             <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
         </div>
-        <div class="teaserbox__main">
+        <div class="teaserbox__main" data-rte-content>
             <span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span>
             <hr>
             {data.bodytext -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
index 2f31e4c1..551ac8f4 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
@@ -26,7 +26,7 @@
         <div class="teasebox__image">
             <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
         </div>
-        <div class="teaserbox__main">
+        <div class="teaserbox__main" data-rte-content>
             <span class="headline headline--3 headline--teaser">{data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}</span>
             <hr>
             {data.bodytext -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html
index e8e297e7..f6cd6630 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html
@@ -21,7 +21,7 @@
                                 <div class="back">
                                     <div>
                                         <div class="teaser-title">Angebot</div>
-                                        <div class="content">
+                                        <div class="content" data-rte-content>
                                             <span class="headline headline--4">{data.header}</span>
                                             <hr>
                                             {data.bodytext -> f:format.nl2br()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html
index 4455af5a..bd2b1b85 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html
@@ -20,7 +20,7 @@
                 <f:render partial="Textmedia/Partnerlogos" section="Content" arguments="{_all}"/>
             </f:case>
             <f:defaultCase>
-                <ep:container data="{data}">
+                <ep:container rteContent="true" data="{data}">
                     <f:render partial="Textmedia/Default" section="Content" arguments="{_all}"/>
                 </ep:container>
             </f:defaultCase>