diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
index 9be0a59..f278f75 100644
--- a/Configuration/TypoScript/setup.txt
+++ b/Configuration/TypoScript/setup.txt
@@ -58,17 +58,17 @@ config.tx_extbase{
 			}
 			In2code\Powermailextended\Domain\Model\Form {
 				mapping {
-					tableName = tx_powermail_domain_model_forms
+					tableName = tx_powermail_domain_model_form
 				}
 			}
 			In2code\Powermailextended\Domain\Model\Page {
 				mapping {
-					tableName = tx_powermail_domain_model_pages
+					tableName = tx_powermail_domain_model_page
 				}
 			}
 			In2code\Powermailextended\Domain\Model\Field {
 				mapping {
-					tableName = tx_powermail_domain_model_fields
+					tableName = tx_powermail_domain_model_field
 				}
 			}
 		}
@@ -76,4 +76,4 @@ config.tx_extbase{
 	objects {
 		In2code\Powermail\Domain\Repository\FormRepository.className = In2code\Powermailextended\Domain\Repository\FormRepository
 	}
-}
\ No newline at end of file
+}
diff --git a/Resources/Private/Partials/Form/Field/Input.html b/Resources/Private/Partials/Form/Field/Input.html
new file mode 100644
index 0000000..e6381d5
--- /dev/null
+++ b/Resources/Private/Partials/Form/Field/Input.html
@@ -0,0 +1,35 @@
+{namespace vh=In2code\Powermail\ViewHelpers}
+
+<div class="powermail_fieldwrap powermail_fieldwrap_type_input powermail_fieldwrap_{field.marker} {field.css} {settings.styles.framework.fieldAndLabelWrappingClasses}">
+	<h2>
+		{field.txPowermailextendedPowermailText}
+	</h2>
+	<label for="powermail_field_{field.marker}" class="{settings.styles.framework.labelClasses}" title="{field.description}">
+		<vh:string.RawAndRemoveXss>{field.title}</vh:string.RawAndRemoveXss><f:if condition="{field.mandatory}"><span class="mandatory">*</span></f:if>
+	</label>
+	<div class="{settings.styles.framework.fieldWrappingClasses}">
+		<f:if condition="{field.txPowermailextendedPowermailReadonly}">
+			<f:then>
+				<f:form.textfield
+						type="{vh:Validation.FieldTypeFromValidation(field:field)}"
+						property="{field.marker}"
+						placeholder="{field.placeholder}"
+						readonly="readonly"
+						value="{vh:Misc.PrefillField(field:field, mail:mail)}"
+						class="powermail_input {settings.styles.framework.fieldClasses} {vh:Validation.ErrorClass(field:field, class:'powermail_field_error')}"
+						additionalAttributes="{vh:Validation.ValidationDataAttribute(field:field)}"
+						id="powermail_field_{field.marker}" />
+			</f:then>
+			<f:else>
+					<f:form.textfield
+							type="{vh:Validation.FieldTypeFromValidation(field:field)}"
+							property="{field.marker}"
+							placeholder="{field.placeholder}"
+							value="{vh:Misc.PrefillField(field:field, mail:mail)}"
+							class="powermail_input {settings.styles.framework.fieldClasses} {vh:Validation.ErrorClass(field:field, class:'powermail_field_error')}"
+							additionalAttributes="{vh:Validation.ValidationDataAttribute(field:field)}"
+							id="powermail_field_{field.marker}" />
+			</f:else>
+		</f:if>
+	</div>
+</div>
diff --git a/Resources/Private/Partials/Form/New.html b/Resources/Private/Partials/Form/Field/New.html
similarity index 100%
rename from Resources/Private/Partials/Form/New.html
rename to Resources/Private/Partials/Form/Field/New.html
diff --git a/Resources/Private/Partials/Form/Input.html b/Resources/Private/Partials/Form/Input.html
deleted file mode 100644
index 285d035..0000000
--- a/Resources/Private/Partials/Form/Input.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{namespace vh=In2code\Powermail\ViewHelpers}
-
-<div id="powermail_fieldwrap_{field.uid}" class="powermail_fieldwrap powermail_fieldwrap_input powermail_fieldwrap_{field.uid} {field.css}">
-	<h2>
-		{field.txPowermailextendedPowermailText}
-	</h2>
-	<label for="powermail_field_{field.marker}" class="powermail_label" title="{field.description}">
-		<vh:string.RawAndRemoveXss>{field.title}</vh:string.RawAndRemoveXss><f:if condition="{field.mandatory}"><span class="mandatory">*</span></f:if>
-	</label>
-	<f:if condition="{field.txPowermailextendedPowermailReadonly}">
-		<f:then>
-			<f:form.textfield
-					type="{vh:Validation.FieldTypeFromValidation(field:field)}"
-					property="{field.marker}"
-					placeholder="{field.placeholder}"
-					readonly="readonly"
-					value="{vh:Misc.PrefillField(field:field, mail:mail)}"
-					class="powermail_field powermail_input {vh:Validation.ErrorClass(field:field, class:'powermail_field_error')}"
-					additionalAttributes="{vh:Validation.ValidationDataAttribute(field:field)}"
-					id="powermail_field_{field.marker}" />
-		</f:then>
-		<f:else>
-			<f:form.textfield
-					type="{vh:Validation.FieldTypeFromValidation(field:field)}"
-					property="{field.marker}"
-					placeholder="{field.placeholder}"
-					value="{vh:Misc.PrefillField(field:field, mail:mail)}"
-					class="powermail_field powermail_input {vh:Validation.ErrorClass(field:field, class:'powermail_field_error')}"
-					additionalAttributes="{vh:Validation.ValidationDataAttribute(field:field)}"
-					id="powermail_field_{field.marker}" />
-		</f:else>
-	</f:if>
-
-</div>
\ No newline at end of file
diff --git a/ext_emconf.php b/ext_emconf.php
index 4fedde8..3b6198a 100755
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -12,10 +12,10 @@
 
 $EM_CONF[$_EXTKEY] = array (
 	'title' => 'powermailextended',
-	'description' => 'Sample Extension to extend powermail 2.1: Add new validators, Add new Fieldtypes or Add new Field Properties',
+	'description' => 'Sample Extension to extend powermail: Add new validators, Add new Fieldtypes or Add new Field Properties',
 	'category' => 'plugin',
 	'shy' => 0,
-	'version' => '2.5.0',
+	'version' => '3.0.0',
 	'dependencies' => '',
 	'conflicts' => '',
 	'priority' => '',
@@ -34,11 +34,11 @@
 	'CGLcompliance_note' => '',
 	'constraints' => array(
 		'depends' => array(
-			'typo3' => '6.2.0-7.99.99',
-			'powermail' => '2.1.0-2.99.99',
+			'typo3' => '7.6.0-8.99.99',
+			'powermail' => '3.0.0-3.99.99',
 		),
 		'conflicts' => array(),
 		'suggests' => array(),
 	),
 	'_md5_values_when_last_written' => '',
-);
\ No newline at end of file
+);
diff --git a/ext_tables.php b/ext_tables.php
index f249cc9..db1d946 100644
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -9,7 +9,7 @@
 );
 
 /**
- * extend powermail fields tx_powermail_domain_model_fields
+ * extend powermail fields tx_powermail_domain_model_field
  */
 $tempColumns = array (
 	'tx_powermailextended_powermail_text' => array(
@@ -30,11 +30,11 @@
 	),
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
-	'tx_powermail_domain_model_fields',
+	'tx_powermail_domain_model_field',
 	$tempColumns
 );
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-	'tx_powermail_domain_model_fields',
+	'tx_powermail_domain_model_field',
 	'--div--;Powermailextended, tx_powermailextended_powermail_text, tx_powermailextended_powermail_readonly',
 	'',
 	'after:own_marker_select'
diff --git a/ext_tables.sql b/ext_tables.sql
index 82df6f9..84ef94d 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -1,7 +1,7 @@
 #
-# Table structure for table 'tx_powermail_domain_model_fields'
+# Table structure for table 'tx_powermail_domain_model_field'
 #
-CREATE TABLE tx_powermail_domain_model_fields (
+CREATE TABLE tx_powermail_domain_model_field (
   tx_powermailextended_powermail_text varchar(255) DEFAULT '' NOT NULL,
   tx_powermailextended_powermail_readonly tinyint(4) unsigned DEFAULT '0' NOT NULL
-);
\ No newline at end of file
+);