From 303b1b53925ddd404b3877de755ed8ae7c3c28d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Fri, 10 Sep 2021 11:08:23 +0200
Subject: [PATCH 1/3] Remove obsolete plugin

---
 .../Classes/Controller/FormController.php     |  12 --
 .../Private/Templates/Form/FullForm.html      | 108 ------------------
 .../typo3conf/ext/ep_theme/ext_localconf.php  |  22 ----
 3 files changed, 142 deletions(-)
 delete mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html

diff --git a/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php b/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php
index 50d7acac..1a6d44ba 100644
--- a/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php
+++ b/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php
@@ -44,18 +44,6 @@ class FormController extends ActionController
         $this->view->assign('contactForm', $contactForm);
     }
 
-    /**
-     * @param ContactForm $contactForm
-     */
-    public function fullFormAction(ContactForm $contactForm = null)
-    {
-        if ($contactForm === null) {
-            $pageUrl = $this->getCurrentPageUrl();
-            $contactForm = new ContactForm($pageUrl, ContactForm::FORM_TYPE_FULL);
-        }
-        $this->view->assign('contactForm', $contactForm);
-    }
-
     /**
      * @return string
      */
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html
deleted file mode 100644
index c3dcc900..00000000
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml" lang="en"
-     xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
-     xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
-
-    <f:layout name="Form/Default"/>
-
-    <f:section name="Main">
-        <contact-form inline-template>
-                <div class="relative">
-                    <f:form id="contactform" object="{contactForm}" name="contactForm"
-                            action="processForm" controller="AjaxForm" pluginName="Ajax" pageType="1803"
-                            pageUid="{settings.defaultAjaxUid}"
-                            additionalAttributes="{'v-show': '!success', '@submit.prevent': 'submitForm()'}">
-                        <f:form.hidden property="pageUrl"/>
-                        <label class="block mb-4 hidden">
-                            <span class="text-gray-700">Betreff*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="subject"/>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.name }">
-                            <span :class="formErrors.name ? 'text-red-500' : 'text-gray-700'">Name*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="name"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.name" v-html="formErrors.name"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.firstName }">
-                            <span :class="formErrors.firstName ? 'text-red-500' : 'text-gray-700'">Vorname*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="firstName"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.firstName" v-html="formErrors.firstName"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.gender }">
-                            <span :class="formErrors.gender ? 'text-red-500' : 'text-gray-700'">Gender*</span>
-                            <f:form.select class="form-select mt-1 block w-full" property="gender" options="{M: 'M', W: 'W', D: 'D'}"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.gender" v-html="formErrors.gender"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.company }">
-                            <span :class="formErrors.company ? 'text-red-500' : 'text-gray-700'">Firma/Verein*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="company"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.company" v-html="formErrors.company"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.email }">
-                            <span :class="formErrors.email ? 'text-red-500' : 'text-gray-700'">E-Mail*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="email"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.email" v-html="formErrors.email"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.phone }">
-                            <span :class="formErrors.phone ? 'text-red-500' : 'text-gray-700'">Telefon/Fax*</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="phone"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.phone" v-html="formErrors.phone"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.period }">
-                            <span :class="formErrors.period ? 'text-red-500' : 'text-gray-700'">Zeitraum</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="period" placeholder="tt.mm.jjjj - tt.mm.jjjj"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.period" v-html="formErrors.period"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.duration }">
-                            <span :class="formErrors.duration ? 'text-red-500' : 'text-gray-700'">Aufenthaltsdauer</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="duration" placeholder="Tage inkl. An- & Abreisetag"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.duration" v-html="formErrors.duration"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.pax }">
-                            <span :class="formErrors.pax ? 'text-red-500' : 'text-gray-700'">Anzahl der Personen</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="pax" placeholder="ab 25 Personen"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.pax" v-html="formErrors.pax"></div>
-                        </label>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.age }">
-                            <span :class="formErrors.age ? 'text-red-500' : 'text-gray-700'">Durchschnittsalter</span>
-                            <f:form.textfield class="form-input mt-1 block w-full" property="age"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.age" v-html="formErrors.age"></div>
-                        </label>
-                        <div class="mb-4">
-                            <label class="inline-flex items-center">
-                                <f:form.checkbox class="form-checkbox" property="children" value="Ja"/>
-                                <span class="ml-2">Kinder (ja/nein)</span>
-                            </label>
-                        </div>
-                        <label class="block mb-4" :class="{ 'has-validation-error': formErrors.inquiry }">
-                            <span :class="formErrors.inquiry ? 'text-red-500' : 'text-gray-700'">(Zusatz-) Wünsche</span>
-                            <f:form.textarea class="form-textarea mt-1 block w-full"
-                                             property="inquiry"
-                                             placeholder="z. B. Reiseleiter, Halbpension, Bus Anreise, Programm"
-                                             cols="30" rows="5"/>
-                            <div class="text-red-500 mt-2" v-show="formErrors.inquiry" v-html="formErrors.inquiry"></div>
-                        </label>
-                        <div class="mb-4">
-                            Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
-                                                      title="Datenschutzerklärung"
-                                                      target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.
-                        </div>
-                        <div class="mb-4">
-                            <button type="submit" class="button button-warning">Jetzt anfragen</button>
-                        </div>
-                    </f:form>
-                    <div class="form__overlay" v-show="processing">
-                        <img src="{f:uri.resource(path: 'images/ajax-loader-white.gif', extensionName: 'ep_theme')}" alt="Processing...">
-                    </div>
-                    <div class="form__success" v-show="success">
-                        <p>Vielen Dank für Eure Anfrage. Wir werden uns schnellstmöglich mit Euch in Verbindung
-                            setzen.</p>
-                        <p><button class="button button-warning button-small" @click.prevent="resetForm()">Neue Anfrage</button></p>
-                    </div>
-                    <div class="form__overlay" v-show="error">
-                        <p>Es ist ein Problem aufgetreten. Bitte versucht es noch einmal.</p>
-                        <p><button class="button button-warning button-small" @click.prevent="resetForm()">Neue Anfrage</button></p>
-                    </div>
-                </div>
-            </contact-form>
-    </f:section>
-
-</div>
diff --git a/public/typo3conf/ext/ep_theme/ext_localconf.php b/public/typo3conf/ext/ep_theme/ext_localconf.php
index 9a21f00c..54a9277d 100644
--- a/public/typo3conf/ext/ep_theme/ext_localconf.php
+++ b/public/typo3conf/ext/ep_theme/ext_localconf.php
@@ -42,28 +42,6 @@ $metaTagManagerRegistry->registerManager(
     ]
 );
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.ep_theme',
-    'FullForm',
-    [
-        'Form' => 'fullForm',
-    ],
-    [
-        'Form' => 'fullForm',
-    ]
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.ep_theme',
-    'FullForm',
-    [
-        'Form' => 'fullForm',
-    ],
-    [
-        'Form' => 'fullForm',
-    ]
-);
-
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'EP.ep_theme',
     'Ajax',

From 4ce449e8708dcea46efa0f4e468f9ef26a1beabe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Fri, 10 Sep 2021 11:39:06 +0200
Subject: [PATCH 2/3] Reduce number of selectable form fields, adjust naming

---
 .../ep_theme/Configuration/Yaml/FormsBase.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/public/typo3conf/ext/ep_theme/Configuration/Yaml/FormsBase.yaml b/public/typo3conf/ext/ep_theme/Configuration/Yaml/FormsBase.yaml
index 7687bbb7..a6783fed 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/Yaml/FormsBase.yaml
+++ b/public/typo3conf/ext/ep_theme/Configuration/Yaml/FormsBase.yaml
@@ -6,7 +6,25 @@ TYPO3:
           10: EXT:ep_theme/Resources/Private/Forms/
       prototypes:
         standard:
+          formEditor:
+            formElementGroups:
+              input:
+                label: Basiselemente
+              html5:
+                label: HTML5-Elemente
+              select:
+                label: Auswahlelemente
+              custom:
+                label: Sonstiges
           formElementsDefinition:
+            AdvancedPassword: null
+            DatePicker: null
+            Fieldset: null
+            FileUpload: null
+            GridRow: null
+            Hidden: null
+            ImageUpload: null
+            Password: null
             Form:
               renderingOptions:
                 templateRootPaths:

From c2571fec458ced3c676565c0520e1a28519e1166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Fri, 10 Sep 2021 12:08:59 +0200
Subject: [PATCH 3/3] Improve email layout, replace system email layout

---
 .../Private/Layouts/Email/Default.html        |  35 --
 .../Private/Layouts/Email/SystemEmail.html    | 384 ++++++++++++++++++
 .../Private/Templates/Email/Autoreply.html    |   2 +-
 .../Private/Templates/Email/ContactForm.html  |   2 +-
 .../Private/Templates/Email/GroupsPrice.html  |   2 +-
 5 files changed, 387 insertions(+), 38 deletions(-)
 delete mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/Default.html
 create mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/Default.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/Default.html
deleted file mode 100644
index 5877a26e..00000000
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/Default.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-    <head>
-        <title>HTML E-Mail</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <style type="text/css">
-            body {
-                font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-            }
-            table {
-                width: 80%;
-                border: 1px solid #ddd;
-                border-collapse: collapse;
-                margin-bottom: 20px;
-            }
-            th {
-                width: 25%;
-                padding: 5px;
-                vertical-align: top;
-                text-align: left;
-                border: 1px solid #ddd;
-                border-collapse: collapse;
-            }
-            td {
-                width: 74%;
-                padding: 5px;
-                vertical-align: top;
-                border: 1px solid #ddd;
-                border-collapse: collapse;
-            }
-        </style>
-    </head>
-    <body>
-        <f:render section="Main"/>
-    </body>
-</html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html
new file mode 100644
index 00000000..829dd037
--- /dev/null
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Email/SystemEmail.html
@@ -0,0 +1,384 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true" >
+<head>
+    <!--[if gte mso 15]>
+    <xml>
+    <o:OfficeDocumentSettings>
+        <o:AllowPNG/>
+        <o:PixelsPerInch>96</o:PixelsPerInch>
+    </o:OfficeDocumentSettings>
+    </xml>
+    <![endif]-->
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title></title>
+    <style type="text/css">
+        p {
+            margin:10px 0;
+            padding:0;
+        }
+        table {
+            border-collapse:collapse;
+        }
+        h1,
+        h2,
+        h3,
+        h4,
+        h5,
+        h6 {
+            display:block;
+            margin:0;
+            padding:0;
+        }
+        img,
+        a img {
+            border:0;
+            height:auto;
+            outline:none;
+            text-decoration:none;
+        }
+        body,
+        #bodyTable,
+        #bodyCell {
+            height:100%;
+            margin:0;
+            padding:0;
+            width:100%;
+        }
+        #outlook a {
+            padding:0;
+        }
+        img {
+            -ms-interpolation-mode:bicubic;
+        }
+        table {
+            mso-table-lspace:0pt;
+            mso-table-rspace:0pt;
+        }
+        .ReadMsgBody {
+            width:100%;
+        }
+        .ExternalClass {
+            width:100%;
+        }
+        p,
+        a,
+        td {
+            mso-line-height-rule:exactly;
+        }
+        a[href^=tel],
+        a[href^=sms] {
+            color:inherit;
+            cursor:default;
+            text-decoration:none;
+        }
+        p,
+        a,
+        td,
+        body,
+        table,
+        blockquote {
+            -ms-text-size-adjust:100%;
+            -webkit-text-size-adjust:100%;
+        }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass td,
+        .ExternalClass div,
+        .ExternalClass span,
+        .ExternalClass font {
+            line-height:100%;
+        }
+        a[x-apple-data-detectors]{
+            color:inherit !important;
+            text-decoration:none !important;
+            font-size:inherit !important;
+            font-family:inherit !important;
+            font-weight:inherit !important;
+            line-height:inherit !important;
+        }
+
+        .templateContainer {
+            max-width:600px !important;
+        }
+        a.button {
+            display:block;
+        }
+        .image,.retinaImage {
+            vertical-align:bottom;
+        }
+        .textContent {
+            word-break:break-word;
+        }
+        .textContent img {
+            height:auto !important;
+        }
+        .dividerBlock {
+            table-layout:fixed !important;
+        }
+        h1 {
+            color:#222222;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:40px;
+            font-style:normal;
+            font-weight:bold;
+            line-height:150%;
+            letter-spacing:normal;
+            text-align:center;
+        }
+        h2 {
+            color:#222222;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:34px;
+            font-style:normal;
+            font-weight:bold;
+            line-height:150%;
+            letter-spacing:normal;
+            text-align:left;
+        }
+        h3 {
+            color:#444444;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:22px;
+            font-style:normal;
+            font-weight:bold;
+            line-height:150%;
+            letter-spacing:normal;
+            text-align:left;
+        }
+        h4 {
+            color:#999999;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:20px;
+            font-style:italic;
+            font-weight:normal;
+            line-height:125%;
+            letter-spacing:normal;
+            text-align:left;
+        }
+        #templateHeader {
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:0;
+            border-bottom:0;
+            padding-top:36px;
+            padding-bottom:0;
+        }
+        .headerContainer {
+            background-color:#ffffff;
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:1px none ;
+            border-bottom:0;
+            padding-top:36px;
+            padding-bottom:36px;
+        }
+        .headerContainer .textContent,
+        .headerContainer .textContent p {
+            color:#808080;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:16px;
+            line-height:150%;
+            text-align:left;
+        }
+        .headerContainer .textContent a,
+        .headerContainer .textContent p a {
+            color:#538bb3;
+            font-weight:normal;
+            text-decoration:underline;
+        }
+        #templateBody {
+            background-color:#f2f2f2;
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:0;
+            border-bottom:0;
+            padding-top:0;
+            padding-bottom:0;
+        }
+        .bodyContainer {
+            background-color:#ffffff;
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:0;
+            border-bottom:0;
+            padding-top:0;
+            padding-bottom:18px;
+        }
+        .bodyContainer .textContent,
+        .bodyContainer .textContent p {
+            color:#808080;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:16px;
+            line-height:150%;
+            text-align:left;
+        }
+        .bodyContainer .textContent a,
+        .bodyContainer .textContent p a {
+            color:#538bb3;
+            font-weight:normal;
+            text-decoration:underline;
+        }
+        #templateFooter{
+            background-color:#f2f2f2;
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:1px none ;
+            border-bottom:0;
+            padding-top:0;
+            padding-bottom:36px;
+        }
+        .footerContainer{
+            background-color:#313131;
+            background-image:none;
+            background-repeat:no-repeat;
+            background-position:center;
+            background-size:cover;
+            border-top:0;
+            border-bottom:0;
+            padding-top:45px;
+            padding-bottom:45px;
+        }
+        .footerContainer .textContent,
+        .footerContainer .textContent p {
+            color:#FFFFFF;
+            font-family:'Helvetica Neue', Helvetica, Arial, Verdana, sans-serif;
+            font-size:12px;
+            line-height:150%;
+            text-align:center;
+        }
+        .footerContainer .textContent a,
+        .footerContainer .textContent p a {
+            color:#FFFFFF;
+            font-weight:normal;
+            text-decoration:underline;
+        }
+        @media only screen and (min-width:768px){
+            .templateContainer {
+                width:600px !important;
+            }
+        }
+        @media only screen and (max-width: 480px){
+            body,
+            table,
+            td,
+            p,
+            a {
+                -webkit-text-size-adjust:none !important;
+            }
+            body {
+                width:100% !important;
+                min-width:100% !important;
+            }
+            h1 {
+                font-size:30px !important;
+                line-height:125% !important;
+            }
+            h2 {
+                font-size:26px !important;
+                line-height:125% !important;
+            }
+            h3 {
+                font-size:20px !important;
+                line-height:150% !important;
+            }
+            h4 {
+                font-size:18px !important;
+                line-height:150% !important;
+            }
+            .headerContainer .textContent,
+            .headerContainer .textContent p {
+                font-size:16px !important;
+                line-height:150% !important;
+            }
+            .bodyContainer .textContent,
+            .bodyContainer .textContent p {
+                font-size:16px !important;
+                line-height:150% !important;
+            }
+        }
+    </style>
+</head>
+<body>
+
+
+<center>
+    <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable"><tr><td align="center" valign="top" id="bodyCell">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+
+            <!-- HEADER START -->
+            <tr><td align="center" valign="top" id="templateHeader" style="background-color: #ffffff">
+
+                <!--[if (gte mso 9)|(IE)]><table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;"><![endif]-->
+                <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer"><tr><td valign="top" class="headerContainer">
+                    <table border="0" cellpadding="0" cellspacing="0" width="100%" class="textBlock" style="min-width:100%;"><tbody class="textBlockOuter"><tr><td valign="top" class="textBlockInner" style="padding-top:9px;">
+
+                        <!--[if mso]><table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;"><tr><td valign="top" width="600" style="width:600px;"><![endif]-->
+                        <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="textContentContainer">
+                            <tbody>
+                            <tr>
+                                <td valign="top" class="image" align="center" style="padding: 0px 36px; padding-bottom: 20px; color: #222222;text-align: center;">
+                                    <f:image src="EXT:ep_theme/Resources/Public/images/logo_wide.svg" absolute="1" alt="Logo" height="60" width="197" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td valign="top" class="textContent" style="padding: 0px 36px;color: #222222;font-family: &quot;Helvetica Neue&quot;, Helvetica, Arial, Verdana, sans-serif;font-size: 24px;text-align: center;">
+                                    <strong><f:render section="Title" optional="true" /></strong>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <!--[if mso]></td></tr></table><![endif]-->
+
+                    </td></tr></tbody></table>
+                </td></tr></table>
+                <!--[if (gte mso 9)|(IE)]></td></tr></table><![endif]-->
+
+            </td></tr>
+            <!-- HEADER END -->
+
+
+            <!-- BODY START -->
+            <tr><td align="center" valign="top" id="templateBody">
+
+                <!--[if (gte mso 9)|(IE)]><table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;"><tr><td align="center" valign="top" width="600" style="width:600px;"><![endif]-->
+                <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" class="templateContainer"><tr><td valign="top" class="bodyContainer">
+                    <table border="0" cellpadding="0" cellspacing="0" width="100%" class="textBlock" style="min-width:100%;"><tbody class="textBlockOuter"><tr><td valign="top" class="textBlockInner" style="padding: 36px 0px;">
+
+                        <!--[if mso]><table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;"><tr><td valign="top" width="600" style="width:600px;"><![endif]-->
+                        <table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="textContentContainer">
+                            <tbody>
+                            <tr>
+                                <td valign="top" class="textContent" style="padding: 0px 36px;">
+
+                                    <f:render section="Main" />
+
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                        <!--[if mso]></td></tr></table><![endif]-->
+
+                    </td></tr></tbody></table>
+                </td></tr></table>
+                <!--[if (gte mso 9)|(IE)]></td></tr></table><![endif]-->
+
+            </td></tr>
+            <!-- BODY END -->
+        </table>
+    </td></tr></table>
+</center>
+
+</body>
+</html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html
index cbb9c75b..0db083ca 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html
@@ -2,7 +2,7 @@
 	 xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-    <f:layout name="Default"/>
+    <f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
         <p>Sehr geehrte Damen und Herren,</p>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html
index cacd7aec..74c4cd04 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html
@@ -2,7 +2,7 @@
 	 xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-	<f:layout name="Default"/>
+	<f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
 		<h1>Anfrage E&amp;P Reisen vom <f:format.date date="now" format="d.m.y" /></h1>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html
index b3247f1b..a91a90dc 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html
@@ -2,7 +2,7 @@
      xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
 	 xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
-	<f:layout name="Default"/>
+	<f:layout name="SystemEmail"/>
 
 	<f:section name="Main">
 		<h1>Anfrage Gruppenhaus vom <f:format.date date="now" format="d.m.y" /></h1>