diff --git a/application/libraries/Ilch/Comments.php b/application/libraries/Ilch/Comments.php
index 4a78bd865..64ec2656b 100644
--- a/application/libraries/Ilch/Comments.php
+++ b/application/libraries/Ilch/Comments.php
@@ -85,9 +85,11 @@ private function rec(int $id, int $commentId, int $uid, int $req, Base $obj): st
                                 <div class="fload-end text-muted small">
                                     <i class="fa-solid fa-reply fa-flip-vertical"></i> ' . $user_rep->getName() . '
                                 </div>
-                            </div>'
+                            </div>
+                            <div class="ck-content">'
                             . nl2br($obj->alwaysPurify($fk_comment->getText())) .
-                            '<div>';
+                            '</div>
+                            <div>';
             if ($obj->getUser() && !in_array($obj->getUser()->getId(), $voted)) {
                 $commentsHtml .= '
                                 <div class="btn-group">
@@ -293,9 +295,11 @@ public function getComments(string $key, $object, Base $layout): string
                                     <p class="text-muted small">
                                         <i class="fa-regular fa-clock" title="' . $layout->getTrans('commentDateTime') . '"></i> ' . $commentDate->format('d.m.Y - H:i', true) . '
                                     </p>
-                                </div>'
+                                </div>
+                                <div class="ck-content">'
                                 . nl2br($layout->alwaysPurify($comment->getText())) .
-                                '<div>';
+                                '</div>
+                                <div>';
 
             if ($layout->getUser() && !in_array($layout->getUser()->getId(), $voted)) {
                 $commentsHtml .= '
diff --git a/application/modules/admin/layouts/maintenance.php b/application/modules/admin/layouts/maintenance.php
index 77e734a8e..63bea56ce 100644
--- a/application/modules/admin/layouts/maintenance.php
+++ b/application/modules/admin/layouts/maintenance.php
@@ -25,6 +25,7 @@
         <link href="<?=$this->getStaticUrl('css/ilch.css') ?>" rel="stylesheet">
         <link href="<?=$this->getBaseUrl('application/modules/admin/static/css/maintenance.css') ?>" rel="stylesheet">
         <link href="<?=$this->getVendorUrl('npm-asset/jquery-ui/dist/themes/ui-lightness/jquery-ui.min.css') ?>" rel="stylesheet">
+        <link href="<?=$this->getStaticUrl('js/ckeditor5/build/ckeditor.css') ?>" rel="stylesheet" type="text/css">
 
         <!-- SCRIPTS -->
         <script src="<?=$this->getVendorUrl('npm-asset/jquery/dist/jquery.min.js') ?>"></script>
@@ -96,7 +97,7 @@
                         style="width: <?=$config->get('maintenance_status') ?>%;">
                     </div>
                 </div>
-                <div class="install_content">
+                <div class="install_content ck-content">
                     <?=$config->get('maintenance_text') ?>
                 </div>
 
diff --git a/application/modules/article/views/index/index.php b/application/modules/article/views/index/index.php
index 8ced4c821..33d217ddb 100755
--- a/application/modules/article/views/index/index.php
+++ b/application/modules/article/views/index/index.php
@@ -36,11 +36,11 @@
 
         <?php if (strpos($content, '[PREVIEWSTOP]') !== false): ?>
             <?php $contentParts = explode('[PREVIEWSTOP]', $content); ?>
-            <?=$this->purify(reset($contentParts)) ?>
+            <div class="ck-content"><?=$this->purify(reset($contentParts)) ?></div>
             <br />
             <a href="<?=$this->getUrl(['action' => 'show', 'id' => $article->getId()]) ?>" class="float-end"><?=$this->getTrans('readMore') ?></a>
         <?php else: ?>
-            <?=$this->purify($content) ?>
+            <div class="ck-content"><?=$this->purify($content) ?></div>
         <?php endif; ?>
         <hr />
         <div>
diff --git a/application/modules/article/views/index/show.php b/application/modules/article/views/index/show.php
index 752c800d1..9a7fac0a2 100755
--- a/application/modules/article/views/index/show.php
+++ b/application/modules/article/views/index/show.php
@@ -33,7 +33,7 @@
             <?php endif; ?>
         </figure>
     <?php endif; ?>
-    <?=$this->purify($content) ?>
+    <div class="ck-content"><?=$this->purify($content) ?></div>
     <hr />
     <div>
         <?php
diff --git a/application/modules/calendar/views/events/show.php b/application/modules/calendar/views/events/show.php
index b92811a68..be7933f33 100644
--- a/application/modules/calendar/views/events/show.php
+++ b/application/modules/calendar/views/events/show.php
@@ -78,7 +78,7 @@
     <div class="col-xl-2"><?=$this->getTrans('description') ?></div>
     <div class="col-xl-12">
         <?php if ($calendar->getText()) : ?>
-            <?=$this->purify($calendar->getText()) ?>
+            <div class="ck-content"><?=$this->purify($calendar->getText()) ?></div>
         <?php else : ?>
             <?=$this->getTrans('noDescription') ?>
         <?php endif; ?>
diff --git a/application/modules/checkoutbasic/config/config.php b/application/modules/checkoutbasic/config/config.php
index 4c97d6bca..9791894ba 100644
--- a/application/modules/checkoutbasic/config/config.php
+++ b/application/modules/checkoutbasic/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'checkoutbasic',
-        'version' => '1.6.0',
+        'version' => '1.6.1',
         'icon_small' => 'fa-regular fa-credit-card',
         'author' => 'Stantin, Thomas',
         'link' => 'https://ilch.de',
diff --git a/application/modules/checkoutbasic/views/index/index.php b/application/modules/checkoutbasic/views/index/index.php
index adc878d1d..b7e2291f8 100644
--- a/application/modules/checkoutbasic/views/index/index.php
+++ b/application/modules/checkoutbasic/views/index/index.php
@@ -9,7 +9,7 @@
 ?>
 
 <h1><?=$this->getTrans('accountdata') ?></h1>
-<?=($this->get('checkout_contact') != '') ? $this->purify($this->get('checkout_contact')) : '' ?>
+<?=($this->get('checkout_contact') != '') ? '<div class="ck-content">' . $this->purify($this->get('checkout_contact')) . '</div>' : '' ?>
 <br>
 <br>
 <h1><?=$this->getTrans('bankbalance') ?></h1>
diff --git a/application/modules/contact/views/admin/settings/index.php b/application/modules/contact/views/admin/settings/index.php
index f59fd0d4b..fa0f167aa 100644
--- a/application/modules/contact/views/admin/settings/index.php
+++ b/application/modules/contact/views/admin/settings/index.php
@@ -9,8 +9,7 @@
             <textarea class="form-control ckeditor"
                       id="ck_1"
                       name="welcomeMessage"
-                      toolbar="ilch_html"
-                      required><?=($this->escape($this->get('welcomeMessage')) != '') ? $this->escape($this->get('welcomeMessage')) : $this->escape($this->originalInput('welcomeMessage')) ?></textarea>
+                      toolbar="ilch_html"><?=($this->escape($this->get('welcomeMessage')) != '') ? $this->escape($this->get('welcomeMessage')) : $this->escape($this->originalInput('welcomeMessage')) ?></textarea>
         </div>
     </div>
     <?=$this->getSaveBar() ?>
diff --git a/application/modules/contact/views/index/index.php b/application/modules/contact/views/index/index.php
index ce4276170..88967e02a 100644
--- a/application/modules/contact/views/index/index.php
+++ b/application/modules/contact/views/index/index.php
@@ -1,7 +1,7 @@
 <h1><?=$this->getTrans('menuContact') ?></h1>
 <?php if (!empty($this->get('welcomeMessage'))) : ?>
 <div class="card card-default">
-    <div class="card-body welcomeMessage"><?=$this->alwaysPurify($this->get('welcomeMessage')) ?></div>
+    <div class="card-body welcomeMessage ck-content"><?=$this->alwaysPurify($this->get('welcomeMessage')) ?></div>
 </div>
 <?php endif; ?>
 <?php if ($this->get('receivers') != ''): ?>
diff --git a/application/modules/events/views/show/event.php b/application/modules/events/views/show/event.php
index 6bee9fe95..6a33c5664 100644
--- a/application/modules/events/views/show/event.php
+++ b/application/modules/events/views/show/event.php
@@ -227,7 +227,7 @@
             <div class="eventBoxHead">
                 <strong><?=$this->getTrans('description') ?></strong>
             </div>
-            <div class="eventBoxContent">
+            <div class="eventBoxContent ck-content">
                 <?=$this->alwaysPurify($event->getText()) ?>
             </div>
         </div>
diff --git a/application/modules/faq/config/config.php b/application/modules/faq/config/config.php
index e54d19857..125e99aa3 100644
--- a/application/modules/faq/config/config.php
+++ b/application/modules/faq/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'faq',
-        'version' => '1.10.1',
+        'version' => '1.10.2',
         'icon_small' => 'fa-regular fa-circle-question',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/faq/views/index/show.php b/application/modules/faq/views/index/show.php
index 6aeb7e4ab..177a4bb0b 100644
--- a/application/modules/faq/views/index/show.php
+++ b/application/modules/faq/views/index/show.php
@@ -7,4 +7,4 @@
 ?>
 
 <h1><?=$this->escape($faq->getQuestion()) ?></h1>
-<?=$faq->getAnswer() ?>
+<div class="ck-content"><?=$faq->getAnswer() ?></div>
diff --git a/application/modules/forum/config/config.php b/application/modules/forum/config/config.php
index 92b8b188f..eee4902d1 100644
--- a/application/modules/forum/config/config.php
+++ b/application/modules/forum/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'forum',
-        'version' => '1.35.3',
+        'version' => '1.35.4',
         'icon_small' => 'fa-solid fa-list',
         'author' => 'Stantin Thomas',
         'link' => 'https://ilch.de',
diff --git a/application/modules/forum/views/showposts/index.php b/application/modules/forum/views/showposts/index.php
index c1c5abce9..39accbc39 100644
--- a/application/modules/forum/views/showposts/index.php
+++ b/application/modules/forum/views/showposts/index.php
@@ -142,13 +142,13 @@
                 </div>
                 <div class="postbody">
                     <hr class="hr-top" />
-                    <div class="content">
+                    <div class="content ck-content">
                         <?=$this->alwaysPurify($post->getText()) ?>
                     </div>
 
                     <?php if ($post->getAutor()->getSignature()) : ?>
                         <hr />
-                        <?=$this->alwaysPurify($post->getAutor()->getSignature()) ?>
+                        <div class="ck-content"><?=$this->alwaysPurify($post->getAutor()->getSignature()) ?></div>
                     <?php endif; ?>
                 </div>
                 <dl class="postprofile">
diff --git a/application/modules/guestbook/config/config.php b/application/modules/guestbook/config/config.php
index b0c285d1b..ef0292ce9 100644
--- a/application/modules/guestbook/config/config.php
+++ b/application/modules/guestbook/config/config.php
@@ -13,7 +13,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'guestbook',
-        'version' => '1.14.1',
+        'version' => '1.14.2',
         'icon_small' => 'fa-solid fa-book',
         'author' => 'Stantin, Thomas',
         'link' => 'https://ilch.de',
diff --git a/application/modules/guestbook/views/index/index.php b/application/modules/guestbook/views/index/index.php
index 0bb5d5c74..6ebe8eee9 100644
--- a/application/modules/guestbook/views/index/index.php
+++ b/application/modules/guestbook/views/index/index.php
@@ -43,7 +43,7 @@
                 </div>
             </div>
         </div>
-        <div class="card-body">
+        <div class="card-body ck-content">
             <?=$this->alwaysPurify($entry->getText()) ?>
         </div>
     </div>
diff --git a/application/modules/history/config/config.php b/application/modules/history/config/config.php
index ddba07e06..922e563a0 100644
--- a/application/modules/history/config/config.php
+++ b/application/modules/history/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'history',
-        'version' => '1.10.0',
+        'version' => '1.10.1',
         'icon_small' => 'fa-solid fa-clock-rotate-left',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/history/views/admin/index/index.php b/application/modules/history/views/admin/index/index.php
index a5fcba067..c943d2c5c 100644
--- a/application/modules/history/views/admin/index/index.php
+++ b/application/modules/history/views/admin/index/index.php
@@ -38,7 +38,7 @@
                             <td><?=$this->getDeleteIcon(['action' => 'del', 'id' => $entry->getId()]) ?></td>
                             <td><?=$getDate->format('d.m.Y', true) ?></td>
                             <td><?=$this->escape($entry->getTitle()) ?></td>
-                            <td><?=$this->purify($entry->getText()) ?></td>
+                            <td class="ck-content"><?=$this->purify($entry->getText()) ?></td>
                         </tr>
                     <?php endforeach; ?>
                 </tbody>
diff --git a/application/modules/history/views/index/index.php b/application/modules/history/views/index/index.php
index 3c2bae614..b1cd0e69c 100644
--- a/application/modules/history/views/index/index.php
+++ b/application/modules/history/views/index/index.php
@@ -18,7 +18,7 @@
 
                 <div class="cd-timeline-content">
                     <h3 id="history-<?=$history->getId() ?>"><a href="<?=$this->getUrl(['action' => 'index']) ?>#history-<?=$history->getId() ?>"><?=$this->escape($history->getTitle()) ?></a></h3>
-                    <?=$this->purify($history->getText()) ?>
+                    <div class="ck-content"><?=$this->purify($history->getText()) ?></div>
                     <?php $getDate = new \Ilch\Date($history->getDate()); ?>
                     <span class="cd-date"><?=$getDate->format('d. ', true) . $this->getTrans($getDate->format('F', true)) . $getDate->format(' Y', true) ?></span>
                 </div>
diff --git a/application/modules/imprint/views/index/index.php b/application/modules/imprint/views/index/index.php
index 8cb1c394f..c915a6e59 100644
--- a/application/modules/imprint/views/index/index.php
+++ b/application/modules/imprint/views/index/index.php
@@ -6,4 +6,4 @@
 $imprint = $this->get('imprint');
 ?>
 <h1><?=$this->getTrans('menuImprint') ?></h1>
-<?=$this->purify($imprint->getImprint()) ?>
+<div class="ck-content"><?=$this->purify($imprint->getImprint()) ?></div>
diff --git a/application/modules/jobs/config/config.php b/application/modules/jobs/config/config.php
index c2813ad1b..ce2afa608 100644
--- a/application/modules/jobs/config/config.php
+++ b/application/modules/jobs/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'jobs',
-        'version' => '1.7.0',
+        'version' => '1.7.1',
         'icon_small' => 'fa-solid fa-briefcase',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/jobs/views/index/index.php b/application/modules/jobs/views/index/index.php
index b4312ee0f..8aab6a46b 100644
--- a/application/modules/jobs/views/index/index.php
+++ b/application/modules/jobs/views/index/index.php
@@ -16,16 +16,18 @@
 <?php if ($jobs) : ?>
     <div class="row">
         <?php foreach ($jobs as $job) : ?>
-            <div class="col-xl-2">
+            <div class="col-xl-1">
                 <i class="fa-solid fa-briefcase fa-4x briefcase"></i>
             </div>
-            <div class="col-xl-10" style="margin-bottom: 35px;">
+            <div class="col-xl-11" style="margin-bottom: 35px;">
                 <h1>
                     <a href="<?=$this->getUrl('jobs/index/show/id/' . $job->getId()) ?>">
                         <?=$this->escape($job->getTitle()) ?>
                     </a>
                 </h1>
-                <?=$this->purify($job->getText()) ?>
+                <div class="ck-content">
+                    <?=$this->purify($job->getText()) ?>
+                </div>
 
                 <?php if ($this->getUser()) : ?>
                     <br />
diff --git a/application/modules/jobs/views/index/show.php b/application/modules/jobs/views/index/show.php
index 78f990a9a..aaf657bf1 100644
--- a/application/modules/jobs/views/index/show.php
+++ b/application/modules/jobs/views/index/show.php
@@ -15,12 +15,14 @@
 <h1><?=$this->getTrans('menuJob') ?></h1>
 
 <div class="row">
-    <div class="col-xl-2">
+    <div class="col-xl-1">
         <i class="fa-solid fa-briefcase fa-4x briefcase"></i>
     </div>
-    <div class="col-xl-10" style="margin-bottom: 35px;">
+    <div class="col-xl-11" style="margin-bottom: 35px;">
         <h1><?=$this->escape($job->getTitle()) ?></h1>
-        <?=$this->purify($job->getText()) ?>
+        <div class="ck-content">
+            <?=$this->purify($job->getText()) ?>
+        </div>
     </div>
 </div>
 
diff --git a/application/modules/newsletter/config/config.php b/application/modules/newsletter/config/config.php
index b49ebe967..c25f84cd0 100644
--- a/application/modules/newsletter/config/config.php
+++ b/application/modules/newsletter/config/config.php
@@ -13,7 +13,7 @@ class Config extends Install
 {
     public $config = [
         'key' => 'newsletter',
-        'version' => '1.8.1',
+        'version' => '1.8.2',
         'icon_small' => 'fa-regular fa-newspaper',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/newsletter/controllers/admin/Index.php b/application/modules/newsletter/controllers/admin/Index.php
index 81dcf9f74..7bf0d4231 100644
--- a/application/modules/newsletter/controllers/admin/Index.php
+++ b/application/modules/newsletter/controllers/admin/Index.php
@@ -170,7 +170,7 @@ public function treatAction()
                         '{sitetitle}' => $this->getLayout()->escape($this->getConfig()->get('page_title')),
                         '{date}' => $date->format('l, d. F Y', true),
                         '{footer}' => $this->getTranslator()->trans('noReplyMailFooter'),
-                        '{unreadable}' => $this->getTranslator()->trans('mailUnreadable', $newsletterMapper->getLastId(), $email->getEmail()),
+                        '{unreadable}' => $this->getTranslator()->trans('mailUnreadable', $newsletterMapper->getLastId()),
                         '{unsubscribe}' => $this->getTranslator()->trans('mailUnsubscribe', $email->getSelector(), $email->getConfirmCode()),
                     ];
                     $message = str_replace(array_keys($messageReplace), array_values($messageReplace), $messageTemplate);
diff --git a/application/modules/newsletter/layouts/show.php b/application/modules/newsletter/layouts/show.php
index 5bab1fbbe..8fd6e8b24 100644
--- a/application/modules/newsletter/layouts/show.php
+++ b/application/modules/newsletter/layouts/show.php
@@ -4,8 +4,6 @@
 use Ilch\Translator;
 
 $config = Registry::get('config');
-$subscriberMapper = new Modules\Newsletter\Mappers\Subscriber();
-$subscriber = $subscriberMapper->getSubscriberByEMail($this->getRequest()->getParam('email'));
 $translator = new Translator();
 $translator->load(APPLICATION_PATH . '/modules/newsletter/translations/');
 ?>
@@ -223,7 +221,6 @@
                 <td class="container">
                     <div class="content" align="center">
                         <p><?=$translator->trans('noReplyMailFooter') ?></p>
-                        <p><?=$translator->trans('mailUnsubscribe', $subscriber->getSelector(), $subscriber->getConfirmCode()) ?></p>
                     </div>
                 </td>
                 <td></td>
diff --git a/application/modules/newsletter/translations/de.php b/application/modules/newsletter/translations/de.php
index 4f35319c8..f3cf0dd2c 100644
--- a/application/modules/newsletter/translations/de.php
+++ b/application/modules/newsletter/translations/de.php
@@ -23,7 +23,7 @@
     'unsubscribeSuccess' => 'E-Mail wurde erfolgreich ausgetragen.',
     'subscribeFailed' => 'Eintragen fehlgeschlagen.',
     'noReplyMailFooter' => 'Bitte antworten Sie nicht auf diese E-Mail. Dieses Postfach wird nicht überwacht, deshalb werden Sie keine Antwort erhalten.',
-    'mailUnreadable' => 'Falls Sie keine HTML E-Mail lesen können klicken Sie <a href="' . BASE_URL . '/index.php/newsletter/index/show/id/%s/email/%s">hier</a>.',
+    'mailUnreadable' => 'Falls Sie keine HTML E-Mail lesen können klicken Sie <a href="' . BASE_URL . '/index.php/newsletter/index/show/id/%s">hier</a>.',
     'mailUnsubscribe' => 'Wenn Sie keine Newsletter von uns erhalten wollen, können Sie diese jederzeit <a href="' . BASE_URL . '/index.php/newsletter/index/unsubscribe/selector/%s/code/%s">hier</a> abmelden.',
     'incompleteUnsubscribeUrl' => 'Die Adresse zum Austragen aus dem Newsletter ist ungültig.',
     'incompleteDoubleOptInUrl' => 'Die Adresse zur Bestätigung der Registrierung für den Newsletter ist ungültig.',
diff --git a/application/modules/newsletter/translations/en.php b/application/modules/newsletter/translations/en.php
index 301985986..0461c803c 100644
--- a/application/modules/newsletter/translations/en.php
+++ b/application/modules/newsletter/translations/en.php
@@ -23,7 +23,7 @@
     'unsubscribeSuccess' => 'E-Mail has been successfully removed.',
     'subscribeFailed' => 'Subscribing failed.',
     'noReplyMailFooter' => 'Please do not reply to this email. This mailbox is not monitored, so you will not receive a response.',
-    'mailUnreadable' => 'If you can not read HTML E-Mail click <a href="' . BASE_URL . '/index.php/newsletter/index/show/id/%s/email/%s">here</a>.',
+    'mailUnreadable' => 'If you can not read HTML E-Mail click <a href="' . BASE_URL . '/index.php/newsletter/index/show/id/%s">here</a>.',
     'mailUnsubscribe' => 'If you do not wish to receive newsletters from us, you can cancel these at any time <a href="' . BASE_URL . '/index.php/newsletter/index/unsubscribe/selector/%s/code/%s">here</a>.',
     'incompleteUnsubscribeUrl' => 'The url to unsubscribe from the newsletter is invalid.',
     'incompleteDoubleOptInUrl' => 'The url to confirm the subscription to the newsletter is invalid.',
diff --git a/application/modules/newsletter/views/admin/index/show.php b/application/modules/newsletter/views/admin/index/show.php
index d3197bcba..927bb56cd 100644
--- a/application/modules/newsletter/views/admin/index/show.php
+++ b/application/modules/newsletter/views/admin/index/show.php
@@ -9,31 +9,34 @@
 ?>
 
 <h1><?=$this->getTrans('show') ?></h1>
-<form method="POST" action="">
-    <?=$this->getTokenField() ?>
-    <div class="row mb-3">
-        <div class="col-xl-2">
-            <?=$this->getTrans('date') ?>:
-        </div>
-        <div class="col-xl-4"><?=$date->format('d.m.Y H:i', true) ?></div>
+<div class="row mb-3">
+    <div class="col-xl-2">
+        <?=$this->getTrans('date') ?>:
+    </div>
+    <div class="col-xl-4"><?=$date->format('d.m.Y H:i', true) ?></div>
+</div>
+<div class="row mb-3">
+    <div class="col-xl-2">
+        <?=$this->getTrans('from') ?>:
     </div>
-    <div class="row mb-3">
-        <div class="col-xl-2">
-            <?=$this->getTrans('from') ?>:
-        </div>
-        <div class="col-xl-4"><a href="<?=$this->getUrl('user/profil/index/user/' . $user->getId()) ?>" target="_blank"><?=$this->escape($user->getName()) ?></a></div>
+    <div class="col-xl-4"><a href="<?=$this->getUrl('user/profil/index/user/' . $user->getId()) ?>" target="_blank"><?=$this->escape($user->getName()) ?></a></div>
+</div>
+<div class="row mb-3">
+    <div class="col-xl-2">
+        <?=$this->getTrans('subject') ?>:
     </div>
-    <div class="row mb-3">
-        <div class="col-xl-2">
-            <?=$this->getTrans('subject') ?>:
-        </div>
-        <div class="col-xl-10"><?=$this->escape($newsletter->getSubject()) ?></div>
+    <div class="col-xl-10"><?=$this->escape($newsletter->getSubject()) ?></div>
+</div>
+<div class="row mb-3">
+    <div class="col-xl-2">
+        <?=$this->getTrans('text') ?>:
     </div>
-    <div class="row mb-3">
-        <div class="col-xl-2">
-            <?=$this->getTrans('text') ?>:
-        </div>
-        <div class="col-xl-10"><?=$this->purify($newsletter->getText()) ?></div>
+    <div class="col-xl-10 ck-content">
+        <?=$this->purify($newsletter->getText()) ?>
     </div>
+</div>
+
+<form method="POST" action="">
+    <?=$this->getTokenField() ?>
     <?=$this->getSaveBar('delete') ?>
 </form>
diff --git a/application/modules/newsletter/views/index/show.php b/application/modules/newsletter/views/index/show.php
index 0e1dc132e..dba17e46e 100644
--- a/application/modules/newsletter/views/index/show.php
+++ b/application/modules/newsletter/views/index/show.php
@@ -9,4 +9,4 @@
 <p class="small text-muted"><?=$date->format('l, d. F Y', true) ?></p>
 <p>&nbsp;</p>
 <p><b><?=$newsletter->getSubject() ?></b></p>
-<p><?=$newsletter->getText() ?></p>
+<div class="ck-content"><?=$this->purify($newsletter->getText()) ?></div>
diff --git a/application/modules/privacy/views/index/index.php b/application/modules/privacy/views/index/index.php
index 2e1732d37..dc064c380 100644
--- a/application/modules/privacy/views/index/index.php
+++ b/application/modules/privacy/views/index/index.php
@@ -15,7 +15,7 @@
         }
         ?>
         <h1><b><?=$this->escape($privacy->getTitle()) ?></b></h1>
-        <p><?=$this->purify($privacy->getText()) ?><br /></p>
+        <div class="ck-content"><?=$this->purify($privacy->getText()) ?></div><br>
     <?php endforeach; ?>
     <?php if (count($sources) > 0) : ?>
         <b><?=$this->getTrans('source') ?>:</b>
diff --git a/application/modules/rule/config/config.php b/application/modules/rule/config/config.php
index 84f1fd92f..54a62d3ed 100644
--- a/application/modules/rule/config/config.php
+++ b/application/modules/rule/config/config.php
@@ -11,7 +11,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'rule',
-        'version' => '1.9.1',
+        'version' => '1.9.2',
         'icon_small' => 'fa-solid fa-gavel',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/rule/views/admin/index/index.php b/application/modules/rule/views/admin/index/index.php
index f25b705c3..cc3b6b949 100644
--- a/application/modules/rule/views/admin/index/index.php
+++ b/application/modules/rule/views/admin/index/index.php
@@ -50,7 +50,7 @@
                             <td><?=($rulesparent ? $this->escape($rulesparent->getParagraph()) . ' / ' : '') ?><?=$this->escape($rule->getParagraph()) ?></td>
                             <td><?=$this->escape($rule->getTitle()) ?></td>
                             <td><?=$this->escape($rule->getParentTitle()) ?></td>
-                            <td><?=$this->purify($rule->getText()) ?></td>
+                            <td class="ck-content"><?=$this->purify($rule->getText()) ?></td>
                         </tr>
                     <?php endforeach; ?>
                 </tbody>
diff --git a/application/modules/rule/views/admin/index/treat.php b/application/modules/rule/views/admin/index/treat.php
index 961012cc8..46821b545 100644
--- a/application/modules/rule/views/admin/index/treat.php
+++ b/application/modules/rule/views/admin/index/treat.php
@@ -49,7 +49,7 @@ class="form-control"
         </label>
         <div class="col-xl-4">
             <select class="choices-select form-control" id="cat" name="cat">
-                <?php foreach ($rulesparents as $item) : ?>
+                <?php foreach ($rulesparents ?? [] as $item) : ?>
                     <option value="<?=$item->getId() ?>"<?=($this->originalInput('cat', $rule->getParentId()) == $item->getId()) ? ' selected' : '' ?>><?=$this->escape($item->getParagraph() . '. ' . $item->getTitle()) ?></option>
                 <?php endforeach; ?>
             </select>
diff --git a/application/modules/rule/views/index/index.php b/application/modules/rule/views/index/index.php
index 0514dd987..4c47f0b0a 100644
--- a/application/modules/rule/views/index/index.php
+++ b/application/modules/rule/views/index/index.php
@@ -52,7 +52,7 @@ function rec(\Modules\Rule\Models\Rule $item, \Ilch\View $obj)
                     </th>
                 </tr>
                 <tr>
-                    <td>
+                    <td class="ck-content">
                         ' . $obj->purify($item->getText()) . '
                     </td>
                 </tr>';
diff --git a/application/modules/shop/config/config.php b/application/modules/shop/config/config.php
index 85ff5b0c6..1e60acc44 100644
--- a/application/modules/shop/config/config.php
+++ b/application/modules/shop/config/config.php
@@ -14,7 +14,7 @@ class Config extends Install
 {
     public $config = [
         'key' => 'shop',
-        'version' => '1.3.3',
+        'version' => '1.3.4',
         'icon_small' => 'fa-solid fa-cart-shopping',
         'author' => 'blackcoder & LordSchirmer',
         'link' => 'https://ilch.de',
diff --git a/application/modules/shop/views/index/agb.php b/application/modules/shop/views/index/agb.php
index 5b25b7ecd..8a2990271 100644
--- a/application/modules/shop/views/index/agb.php
+++ b/application/modules/shop/views/index/agb.php
@@ -18,7 +18,7 @@
 </h1>
 
 <?php if (!empty($shopAGB)) : ?>
-    <div class="col-lg-12"><?=$shopAGB ?></div>
+    <div class="col-lg-12 ck-content"><?=$this->purify($shopAGB) ?></div>
 <?php else : ?>
     <?=$this->getTrans('noAGB') ?>
 <?php endif; ?>
diff --git a/application/modules/shop/views/index/show.php b/application/modules/shop/views/index/show.php
index b8d8cb356..2d83d149b 100644
--- a/application/modules/shop/views/index/show.php
+++ b/application/modules/shop/views/index/show.php
@@ -168,7 +168,7 @@
                     <td><?=$this->getTrans('approx') ?> <?=$this->escape($shopItem->getShippingTime()) ?> <?=$this->getTrans('days') ?></td>
                 </tr>
                 <tr>
-                    <td colspan="2"><b><?=$this->getTrans('shortInfo') ?></b><br /><br /><small><?=$shopItem->getInfo() ?></small></td>
+                    <td colspan="2"><b><?=$this->getTrans('shortInfo') ?></b><br /><br /><small class="ck-content"><?=$this->purify($shopItem->getInfo()) ?></small></td>
                 </tr>
                 <tr>
                     <td colspan="2" class="text-center">
@@ -210,7 +210,7 @@
     <div class="col-xl-12 desc">
         <table class="table table-striped border">
             <tr>
-                <td>
+                <td class="ck-content">
                     <?=$shopItem->getDesc() ?>
                 </td>
             </tr>
diff --git a/application/modules/teams/config/config.php b/application/modules/teams/config/config.php
index 9bc2af743..0f3e3dacb 100644
--- a/application/modules/teams/config/config.php
+++ b/application/modules/teams/config/config.php
@@ -13,7 +13,7 @@ class Config extends \Ilch\Config\Install
 {
     public $config = [
         'key' => 'teams',
-        'version' => '1.24.2',
+        'version' => '1.24.3',
         'icon_small' => 'fa-solid fa-users',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/teams/views/admin/applications/show.php b/application/modules/teams/views/admin/applications/show.php
index 0c44205d6..971954f5a 100644
--- a/application/modules/teams/views/admin/applications/show.php
+++ b/application/modules/teams/views/admin/applications/show.php
@@ -107,7 +107,7 @@
     <label class="col-lg-2">
         <?=$this->getTrans('text') ?>:
     </label>
-    <div class="col-lg-12">
+    <div class="col-lg-12 ck-content">
         <?=$this->alwaysPurify($join->getText()) ?>
     </div>
 </div>
diff --git a/application/modules/teams/views/admin/applicationshistory/show.php b/application/modules/teams/views/admin/applicationshistory/show.php
index 457a5ed31..d3d146200 100644
--- a/application/modules/teams/views/admin/applicationshistory/show.php
+++ b/application/modules/teams/views/admin/applicationshistory/show.php
@@ -104,7 +104,7 @@
     <label class="col-xl-2">
         <?=$this->getTrans('text') ?>:
     </label>
-    <div class="col-xl-12">
+    <div class="col-xl-12 ck-content">
         <?=$this->alwaysPurify($join->getText()) ?>
     </div>
 </div>
diff --git a/application/modules/teams/views/index/team.php b/application/modules/teams/views/index/team.php
index 8560ef84b..2f063aaed 100644
--- a/application/modules/teams/views/index/team.php
+++ b/application/modules/teams/views/index/team.php
@@ -32,7 +32,7 @@
                 $groupList = $groupMapper->getUsersForGroup($team->getGroupId());
                 $leaderIds = explode(',', $team->getLeader());
                 $coLeaderIds = explode(',', $team->getCoLeader());
-                $groupList = array_unique(array_merge($leaderIds, $coLeaderIds, $groupList));
+                $groupList = array_unique(array_filter(array_merge($leaderIds, $coLeaderIds, $groupList)));
                 ?>
                 <div class="table-responsive">
                     <table class="table table-hover table-striped">
diff --git a/application/modules/training/config/config.php b/application/modules/training/config/config.php
index 8b8d881ea..ef3db843f 100644
--- a/application/modules/training/config/config.php
+++ b/application/modules/training/config/config.php
@@ -13,7 +13,7 @@ class Config extends \Ilch\Config\Install
 {
     public array $config = [
         'key' => 'training',
-        'version' => '1.10.0',
+        'version' => '1.10.1',
         'icon_small' => 'fa-solid fa-graduation-cap',
         'author' => 'Veldscholten, Kevin',
         'link' => 'https://ilch.de',
diff --git a/application/modules/training/views/index/show.php b/application/modules/training/views/index/show.php
index d62208ebb..294ff5634 100644
--- a/application/modules/training/views/index/show.php
+++ b/application/modules/training/views/index/show.php
@@ -166,7 +166,9 @@
     </div>
     <div class="col-xl-12">
         <?php if ($training->getText() != '') : ?>
-            <?=$this->purify($training->getText()) ?>
+            <div class="ck-content">
+                <?=$this->purify($training->getText()) ?>
+            </div>
         <?php else : ?>
             <?=$this->getTrans('noOtherInfo') ?>
         <?php endif; ?>
diff --git a/application/modules/user/views/regist/index.php b/application/modules/user/views/regist/index.php
index 405ce14eb..0a749ce3a 100644
--- a/application/modules/user/views/regist/index.php
+++ b/application/modules/user/views/regist/index.php
@@ -6,7 +6,7 @@
             <div class="card-header">
                 <?=$this->getTrans('rules') ?>
             </div>
-            <div class="card-body" style="background: #eee;">
+            <div class="card-body ck-content" style="background: #eee;">
                 <?=$this->get('regist_rules') ?>
             </div>
             <div class="card-footer clearfix">
diff --git a/application/modules/war/config/config.php b/application/modules/war/config/config.php
index 6fd6db069..2307450d2 100644
--- a/application/modules/war/config/config.php
+++ b/application/modules/war/config/config.php
@@ -15,7 +15,7 @@ class Config extends Install
 {
     public $config = [
         'key' => 'war',
-        'version' => '1.16.3',
+        'version' => '1.16.4',
         'icon_small' => 'fa-solid fa-shield',
         'author' => 'Stantin, Thomas',
         'link' => 'https://ilch.de',
diff --git a/application/modules/war/controllers/admin/Group.php b/application/modules/war/controllers/admin/Group.php
index f642528cc..e49fd208e 100644
--- a/application/modules/war/controllers/admin/Group.php
+++ b/application/modules/war/controllers/admin/Group.php
@@ -126,7 +126,7 @@ public function treatAction()
         if ($this->getRequest()->isPost()) {
             $groupImage = $this->getRequest()->getPost('groupImage');
             if (!empty($groupImage)) {
-                $groupImage = BASE_URL . '/' . $groupImage;
+                $groupImage = BASE_URL . '/' . urlencode($groupImage);
             }
 
             $post = [
diff --git a/application/modules/war/views/admin/index/treat.php b/application/modules/war/views/admin/index/treat.php
index c10b1c707..12dc9d65b 100644
--- a/application/modules/war/views/admin/index/treat.php
+++ b/application/modules/war/views/admin/index/treat.php
@@ -342,7 +342,7 @@ function diasableGame() {
     }
 
     function diasableMatchtype() {
-        if (document.getElementById('warMatchtype').value === 'neu') {
+        if (document.getElementById('warMatchtype').value === 'new') {
             document.getElementById("warMatchtypeNew").style.display = "block";
             document.getElementById("warMatchtype").style.margin = "0 0 5px";
         } else {
diff --git a/application/modules/war/views/admin/maps/treat.php b/application/modules/war/views/admin/maps/treat.php
index 520c1c435..8b62f1d84 100644
--- a/application/modules/war/views/admin/maps/treat.php
+++ b/application/modules/war/views/admin/maps/treat.php
@@ -17,8 +17,8 @@
                    class="form-control"
                    id="mapsNameInput"
                    name="mapsName"
-                   value="<?=$this->escape($this->originalInput('mapsName', ($entry->getId() ? $entrie->getName() : ''))) ?>" />
+                   value="<?=$this->escape($this->originalInput('mapsName', ($entry->getId() ? $entry->getName() : ''))) ?>" />
         </div>
     </div>
-    <?=($entrie->getId()) ? $this->getSaveBar('updateButton') : $this->getSaveBar('addButton') ?>
+    <?=($entry->getId()) ? $this->getSaveBar('updateButton') : $this->getSaveBar('addButton') ?>
 </form>
diff --git a/application/modules/war/views/index/show.php b/application/modules/war/views/index/show.php
index 24e5da5d1..ae8123ca1 100644
--- a/application/modules/war/views/index/show.php
+++ b/application/modules/war/views/index/show.php
@@ -223,7 +223,7 @@
             <div class="card-header">
                 <h6 class="card-title"><?=$this->getTrans('warReport') ?></h6>
             </div>
-            <div class="card-body">
+            <div class="card-body ck-content">
                 <?=$this->purify($war->getWarReport()) ?>
             </div>
         </div>
diff --git a/static/css/ilch.css b/static/css/ilch.css
index 2339ee6df..1a0770bfc 100644
--- a/static/css/ilch.css
+++ b/static/css/ilch.css
@@ -221,4 +221,8 @@ div.input-group.filter input:not(:placeholder-shown) {
     font-weight: bold;
     color: #a94442;
     background: #f2dede;
-}
\ No newline at end of file
+}
+
+.ck-content {
+    overflow: auto;
+}
diff --git a/tests/libraries/ilch/Design/BasePurifyTest.php b/tests/libraries/ilch/Design/BasePurifyTest.php
index b663aaf49..85d5971ad 100644
--- a/tests/libraries/ilch/Design/BasePurifyTest.php
+++ b/tests/libraries/ilch/Design/BasePurifyTest.php
@@ -484,15 +484,36 @@ public function testPurifyLocalVideoNotAllowedURLCK5()
         self::assertEquals('<figure class="media"><div><div style="position:relative;padding-bottom:100%;height:0;"><video style="position:absolute;width:100%;height:100%;top:0;left:0;" controls=""></video></div></div></figure>', $output);
     }
 
+    /**
+     * Embedded Google Maps
+     *
+     * @return void
+     */
     public function testPurifyGoogleMaps()
     {
         $output = $this->view->purify('<div style="width:100%;"><iframe width="100%" height="600" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?width=100%25&amp;height=600&amp;hl=en&amp;q=1%20Grafton%20Street,%20Dublin,%20Ireland+(My%20Business%20Name)&amp;t=&amp;z=14&amp;ie=UTF8&amp;iwloc=B&amp;output=embed"></iframe></div>');
         self::assertEquals('<div style="width:100%;"><iframe width="100%" height="600" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://maps.google.com/maps?width=100%25&amp;height=600&amp;hl=en&amp;q=1%20Grafton%20Street,%20Dublin,%20Ireland+(My%20Business%20Name)&amp;t=&amp;z=14&amp;ie=UTF8&amp;iwloc=B&amp;output=embed"></iframe></div>', $output);
     }
 
+    /**
+     * Another variant of how google maps can be embedded.
+     *
+     * @return void
+     */
     public function testPurifyGoogleMapsVariant()
     {
         $output = $this->view->purify('<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d155421.70603670573!2d13.259929971252207!3d52.506938616502325!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47a84e373f035901%3A0x42120465b5e3b70!2sBerlin!5e0!3m2!1sde!2sde!4v1731237633185!5m2!1sde!2sde" width="600" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>');
         self::assertEquals('<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d155421.70603670573!2d13.259929971252207!3d52.506938616502325!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x47a84e373f035901%3A0x42120465b5e3b70!2sBerlin!5e0!3m2!1sde!2sde!4v1731237633185!5m2!1sde!2sde" width="600" height="450" style="border:0;" allowfullscreen=""></iframe>', $output);
     }
+
+    /**
+     * Wrap text: Left aligned image (CKEditor 5)
+     *
+     * @return void
+     */
+    public function testPurifyWrapTextLeftAlignCK5()
+    {
+        $output = $this->view->purify('<figure class="image image-style-align-left"><img style="aspect-ratio:554/600;" src="http://localhost/application/modules/media/static/upload/67750a712e50801 (3).jpg" alt="test" width="554" height="600"><figcaption>captionA</figcaption></figure><p>Test</p>');
+        self::assertEquals('<figure class="image image-style-align-left"><img style="aspect-ratio:554/600;" src="http://localhost/application/modules/media/static/upload/67750a712e50801%20(3).jpg" alt="test" width="554" height="600" /><figcaption>captionA</figcaption></figure><p>Test</p>', $output);
+    }
 }