diff --git a/Classes/Finisher/Forms/FormsFinisher.php b/Classes/Finisher/Forms/FormsFinisher.php
index 1d2765aeb8042343742fee4b9580b5f11891935b..965d5a55fcc9b1d99675523af65e0c15730921a1 100644
--- a/Classes/Finisher/Forms/FormsFinisher.php
+++ b/Classes/Finisher/Forms/FormsFinisher.php
@@ -96,7 +96,7 @@ class FormsFinisher extends AbstractFinisher {
 
 		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 		$mailTemplateService = $objectManager->get(
-			MailTemplateService::class, $templateName, 'sg_mail', $markers
+			MailTemplateService::class, $templateName, 'project_theme', $markers
 		);
 
 		$ignoreMailQueue = (boolean) $this->parseOption('ignoreMailQueue');
diff --git a/Classes/Service/RegisterService.php b/Classes/Service/RegisterService.php
index 80d7dec16ff9ed65a3fdf783003f2c7e95a82f66..6533ad9d6b7eb8efdcaf31dacd83c65b58703238 100644
--- a/Classes/Service/RegisterService.php
+++ b/Classes/Service/RegisterService.php
@@ -249,15 +249,9 @@ class RegisterService implements \TYPO3\CMS\Core\SingletonInterface {
 		// get the location where registrations should be stored
 		$configurationLocation = $this->getRegistrationPath();
 
-		$registerFolder = GeneralUtility::getFileAbsFileName(
-			$configurationLocation
-		);
-		// create folder
-		GeneralUtility::mkdir($registerFolder);
-
-		$registerFile = GeneralUtility::getFileAbsFileName(
-			$registerFolder . '/' . $templateKey . '.php'
-		);
+		$registerFolder = GeneralUtility::getFileAbsFileName($configurationLocation);
+		GeneralUtility::mkdir_deep($registerFolder);
+		$registerFile = GeneralUtility::getFileAbsFileName($registerFolder . '/' . $templateKey . '.php');
 
 		// build the register array
 		$newRegisterArray = [
@@ -282,4 +276,3 @@ class RegisterService implements \TYPO3\CMS\Core\SingletonInterface {
 		file_put_contents($registerFile, '<?php return ' . var_export($newRegisterArray, TRUE) . ';');
 	}
 }
-
diff --git a/Classes/XClass/Form/FormEditorController.php b/Classes/XClass/Form/FormEditorController.php
index d3c2e53b38727bea66fd12cc305d089fd7b5d36d..0e5d631dc73689a4211e52e750c8e909c0ea439e 100644
--- a/Classes/XClass/Form/FormEditorController.php
+++ b/Classes/XClass/Form/FormEditorController.php
@@ -91,7 +91,7 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll
 
 			// retrieve the extension and template key and jump out of loop
 			$extensionKey = (string) $finisher['options']['extension'];
-			$extensionKey = $extensionKey ?: 'sg_mail';
+			$extensionKey = $extensionKey ?: 'project_theme';
 			$templateKey = str_replace('_', '-', $finisher['options']['template']);
 
 			// if no template key was explicitly set, use the form identifier as template key
@@ -163,12 +163,8 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll
 	private function writeRegisterFile(array $renderables, $extensionKey, $templateKey): string {
 		// get the location where automatic registrations should be stored
 		$configurationLocation = $this->getRegistrationPath();
-
-		$registerFolder = GeneralUtility::getFileAbsFileName(
-			$configurationLocation
-		);
-
-		GeneralUtility::mkdir($registerFolder);
+		$registerFolder = GeneralUtility::getFileAbsFileName($configurationLocation);
+		GeneralUtility::mkdir_deep($registerFolder);
 
 		$hashPrefix = md5($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] . '|' . $templateKey . '.php');
 		$registerFile = GeneralUtility::getFileAbsFileName(
@@ -186,8 +182,8 @@ class FormEditorController extends \TYPO3\CMS\Form\Controller\FormEditorControll
 
 		// add the markers for this template
 		foreach ($renderables as $element) {
-			$markerName = $element['identifier'];
 			// if markerName is explicitly set, override the registered identifier
+			$markerName = $element['identifier'];
 			if (isset($element['properties']['markerName']) && $element['properties']['markerName'] !== '') {
 				$markerName = $element['properties']['markerName'];
 			}