diff --git a/lng/english.lng.php b/lng/english.lng.php
index 0e7676ce..be471b70 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1318,7 +1318,7 @@ $lng['admin']['cronjob_edit'] = 'Edit cronjob';
 $lng['cronjob']['cronjobsettings'] = 'Cronjob settings';
 $lng['cronjob']['cronjobintervalv'] = 'Runtime interval value';
 $lng['cronjob']['cronjobinterval'] = 'Runtime interval';
-$lng['panel']['options'] = 'options';
+$lng['panel']['options'] = 'Options';
 $lng['admin']['warning'] = 'WARNING - Please note!';
 $lng['cron']['changewarning'] = 'Changing these values can have a negative cause to the behavior of Froxlor and its automated tasks.<br /><br />Please only change values here, if you are sure you know what you are doing.';
 
diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl
index f724999c..623ca6e9 100644
--- a/templates/Sparkle/admin/templates/templates_add_2.tpl
+++ b/templates/Sparkle/admin/templates/templates_add_2.tpl
@@ -191,8 +191,8 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em></td>
-					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
+					<td><em>{SALUTATION}</em></td>
+					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
 					<td><em>{DB_NAME}</em></td>
@@ -220,8 +220,8 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em></td>
-					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
+					<td><em>{SALUTATION}</em></td>
+					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
 					<td><em>{USR_NAME}</em></td>
diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl
index 1b356a15..258adeb1 100644
--- a/templates/Sparkle/admin/templates/templates_edit.tpl
+++ b/templates/Sparkle/admin/templates/templates_edit.tpl
@@ -191,8 +191,8 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em></td>
-					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
+					<td><em>{SALUTATION}</em></td>
+					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
 					<td><em>{DB_NAME}</em></td>
@@ -220,8 +220,8 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em></td>
-					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
+					<td><em>{SALUTATION}</em></td>
+					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
 					<td><em>{USR_NAME}</em></td>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 5b0cb71e..da4d0fee 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -694,17 +694,17 @@ input[type="button"]:hover,input[type="submit"]:hover,input[type="reset"]:hover
 }
 
 input[type="submit"],input[class="yesbutton"] {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #77d42a), color-stop(1, #5cb811) );
-	background:-moz-linear-gradient( center top, #77d42a 5%, #5cb811 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#77d42a', endColorstr='#5cb811');
-	background-color:#77d42a;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
+	background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
+	background-color:#9dce2c;
 	text-shadow:1px 1px 0px #aade7c;
 }
 input[type="submit"]:hover,input[class="yesbutton"]:hover {
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #5cb811), color-stop(1, #77d42a) );
-	background:-moz-linear-gradient( center top, #5cb811 5%, #77d42a 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5cb811', endColorstr='#77d42a');
-	background-color:#5cb811;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
+	background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
+	background-color:#8cb82b;
 }
 
 input[class="nobutton"],input[type="reset"] {
diff --git a/templates/Sparkle/customer/email/emails_add.tpl b/templates/Sparkle/customer/email/emails_add.tpl
index 730ac912..13bea014 100644
--- a/templates/Sparkle/customer/email/emails_add.tpl
+++ b/templates/Sparkle/customer/email/emails_add.tpl
@@ -1,14 +1,6 @@
 $header
 <article>
-	<if $domains == ''>
-		<div class="messagewrapperfull">
-			<div class="warningcontainer bradius">
-				<div class="warningtitle">{$lng['admin']['warning']}</div>
-				<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
-			</div>
-		</div>
-	</if>
-	<else>
+
 	<header>
 		<h2>
 			<img src="templates/{$theme}/assets/img/icons/email_add_big.png" alt="{$title}" />&nbsp;
@@ -16,24 +8,33 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradiusodd">
+	<if $domains == ''>
+		<div class="messagewrapperfull">
+			<div class="warningcontainer bradius">
+				<div class="warningtitle">{$lng['admin']['warning']}</div>
+				<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
+			</div>
+		</div>
+	<else>
+		<section class="fullform bradiusodd">
 
-		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
-			<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+					
+					<table class="formtable">
+						{$email_add_form}
+					</table>
 
-				<table class="formtable">
-					{$email_add_form}
-				</table>
-
-				<p style="display: none;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="$action" />
-					<input type="hidden" name="send" value="send" />
-				</p>
-			</fieldset>
-		</form>
-	</section>
+					<p style="display: none;">
+						<input type="hidden" name="s" value="$s" />
+						<input type="hidden" name="page" value="$page" />
+						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
+			</form>
+		</section>
+	</if>
 </article>
 $footer
diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl
index cc5ab12d..6e39c0d0 100644
--- a/templates/Sparkle/header.tpl
+++ b/templates/Sparkle/header.tpl
@@ -46,7 +46,7 @@
 		<ul class="topheadernav">
 		<if $userinfo['adminsession'] == 1 >
 			<li><a href="admin_index.php?s={$userinfo['hash']}">{$lng['admin']['overview']}</a></li>
-			<li><a href="#">Options</a>
+			<li><a href="#">{$lng['panel']['options']}</a>
 				<ul>
 					<li><a href="admin_index.php?page=change_password&s={$userinfo['hash']}">{$lng['login']['password']}</a></li>
 					<li><a href="admin_index.php?page=change_language&s={$userinfo['hash']}">{$lng['login']['language']}</a></li>
@@ -58,7 +58,7 @@
 			<li><a href="admin_index.php?action=logout&s={$userinfo['hash']}">{$lng['login']['logout']} {$userinfo['name']} ({$userinfo['loginname']})</a></li>
 		<else>
 			<li><a href="customer_index.php?s={$userinfo['hash']}">{$lng['admin']['overview']}</a></li>
-			<li><a href="#">Options</a>
+			<li><a href="#">{$lng['panel']['options']}</a>
 				<ul>
 					<li><a href="customer_index.php?page=change_password&s={$userinfo['hash']}">{$lng['login']['password']}</a></li>
 					<li><a href="customer_index.php?page=change_language&s={$userinfo['hash']}">{$lng['login']['language']}</a></li>