diff --git a/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
index c395ed6d..c980efd3 100644
--- a/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
@@ -87,25 +87,17 @@ lib.stdheader.3.headerClass >
 @import "EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript"
 
 config {
-    doctype = html5
     removeDefaultCSS = 1
     removePageCss = 1
     removeDefaultJS = 0
     disablePrefixComment = 1
     inlineStyle2TempFile = 1
-    absRefPrefix = /
     compressJs = 1
     compressCss = 1
     typolinkEnableLinksAcrossDomains = 1
 }
 
-[globalVar = GP:L = 1]
-    config {
-        sys_language_uid = 1
-        language = en
-        locale_all = en_EN.UTF-8
-        htmlTag_langKey = en
-    }
+[siteLanguage("languageId") == "1"]
     plugin.tx_epevents.settings.configurator.options {
         budget = 1:undetermined;2:400 - 600 €;3:600 - 800 €;4:800 - 1000 €;5:1000 - 1500 €;6:1500 - 2000 €;7:2500 - 3000 €
         pax = 1:20 - 40;2:40 - 60;3:60 - 80;4:80 - 100;5:100 - 150;6:150 - 200;7:200 - 250;8:250 - 300;9:350 - 400;10:400 - 450;11:450 - 500;12:500+
diff --git a/public/typo3conf/ext/ep_products/ext_localconf.php b/public/typo3conf/ext/ep_products/ext_localconf.php
index d7207c57..7fb56729 100644
--- a/public/typo3conf/ext/ep_products/ext_localconf.php
+++ b/public/typo3conf/ext/ep_products/ext_localconf.php
@@ -34,7 +34,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\T
 $GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpProducts']['Service']['GroupsSwissService']['writerConfiguration'] = [
     \TYPO3\CMS\Core\Log\LogLevel::INFO => [
         'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [
-            'logFile' => 'typo3temp/var/log/groups.swiss.log',
+            'logFile' => \TYPO3\CMS\Core\Core\Environment::getVarPath() . '/log/groups.swiss.log',
         ],
     ],
 ];
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript
index 57d35a7c..f2c29c96 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript
@@ -1,6 +1,6 @@
 @import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript"
 
-[{$plugin.tx_eptheme.settings.bookingLinksPid} > 0]
+["{$plugin.tx_eptheme.settings.bookingLinksPid}" > "0"]
 plugin.tx_seo {
     config {
         xmlSitemap {
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 3adf00cf..8a7b1c8d 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
@@ -15,6 +15,10 @@
                 <th>Name</th>
                 <td>{contactForm.name}</td>
             </tr>
+            <tr>
+                <th>Vorname</th>
+                <td>{contactForm.firstName}</td>
+            </tr>
             <tr>
                 <th>Geschlecht</th>
                 <td>{contactForm.gender}</td>
diff --git a/public/typo3conf/ext/ep_theme/ext_localconf.php b/public/typo3conf/ext/ep_theme/ext_localconf.php
index 1be55d12..348ee34a 100644
--- a/public/typo3conf/ext/ep_theme/ext_localconf.php
+++ b/public/typo3conf/ext/ep_theme/ext_localconf.php
@@ -7,14 +7,14 @@ $GLOBALS['TYPO3_CONF_VARS']['LOG']['TYPO3']['CMS']['deprecations']['writerConfig
 $GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpTheme']['Service']['BookingApiService']['writerConfiguration'] = [
     \TYPO3\CMS\Core\Log\LogLevel::INFO => [
         'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [
-            'logFile' => 'typo3temp/var/log/bpn-api.log',
+            'logFile' => \TYPO3\CMS\Core\Core\Environment::getVarPath() . '/log/bpn-api.log',
         ],
     ],
 ];
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$_EXTKEY] =
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['ep_theme'] =
     \EP\EpTheme\Hook\Tcemain::class;
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem'][$_EXTKEY] =
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem']['ep_theme'] =
     \EP\EpTheme\Hook\PageLayoutView::class;
 
 $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = 'tx_eptheme_slides';