diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl
index 093aacc1..c28176bf 100644
--- a/templates/Sparkle/admin/admins/admins.tpl
+++ b/templates/Sparkle/admin/admins/admins.tpl
@@ -22,7 +22,7 @@ $header
 					<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
 				</div>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['customer']['name']}&nbsp;{$arrowcode['name']}</th>
diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl
index c9ffbe6c..cd03236c 100644
--- a/templates/Sparkle/admin/admins/admins_add.tpl
+++ b/templates/Sparkle/admin/admins/admins_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$admin_add_form}
 				</table>
 			</form>
@@ -25,7 +25,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl
index 107c7269..9b58bd70 100644
--- a/templates/Sparkle/admin/admins/admins_edit.tpl
+++ b/templates/Sparkle/admin/admins/admins_edit.tpl
@@ -12,7 +12,7 @@ $header
 			</div>
 		</if>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -21,7 +21,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$admin_edit_form}
 				</table>
 			</form>
@@ -31,7 +31,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
 			</p>
diff --git a/templates/Sparkle/admin/configfiles/choose.tpl b/templates/Sparkle/admin/configfiles/choose.tpl
index b817b5be..aba89934 100644
--- a/templates/Sparkle/admin/configfiles/choose.tpl
+++ b/templates/Sparkle/admin/configfiles/choose.tpl
@@ -8,17 +8,14 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form action="{$linker->getLink(array('section' => 'configfiles'))}" method="get" enctype="application/x-www-form-urlencoded">
-			<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</legend>
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
 
-						<table class="formtable">
-							$distributions
-						</table>
-			</fieldset>
+				<table class="tiny center">
+					$distributions
+				</table>
 			</form>
 		</section>
 	</article>
diff --git a/templates/Sparkle/admin/configfiles/choose_distribution.tpl b/templates/Sparkle/admin/configfiles/choose_distribution.tpl
index 5fb28182..21fa5471 100644
--- a/templates/Sparkle/admin/configfiles/choose_distribution.tpl
+++ b/templates/Sparkle/admin/configfiles/choose_distribution.tpl
@@ -1,9 +1,6 @@
-<tr>
-	<td><strong>{$distribution_details['label']}</strong></td>
+<tr class="section">
+	<th><strong>{$distribution_details['label']}</strong></th>
 </tr>
 <tr>
 	<td>$services</td>
 </tr>
-<tr>
-	<td><br /></td>
-</tr>
diff --git a/templates/Sparkle/admin/configfiles/choose_service.tpl b/templates/Sparkle/admin/configfiles/choose_service.tpl
index d71751ec..71ad348f 100644
--- a/templates/Sparkle/admin/configfiles/choose_service.tpl
+++ b/templates/Sparkle/admin/configfiles/choose_service.tpl
@@ -1,4 +1,4 @@
-{$service_details['label']}
+<strong>{$service_details['label']}</strong>
 <br />
 <ul>
 $daemons
diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl
index d74267f5..28edca8b 100644
--- a/templates/Sparkle/admin/configfiles/configfiles.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles.tpl
@@ -10,11 +10,11 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
-        	<table class="formtable">
+		<section>
+			<table class="full">
 				{$configpage}
 				<if $restart != ''>
-				<tr>
+				<tr class="section">
 					<th>{$lng['admin']['configfiles']['restart']}</th>
 				<tr>
 				<tr>
@@ -23,7 +23,7 @@ $header
 				</tr>
 				</if>
 		</table>
-		<br /><br />
+		<br />
 		</section>
 </article>
 $footer
diff --git a/templates/Sparkle/admin/configfiles/configfiles_commands.tpl b/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
index 6791e7ce..85bfee0a 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr class="section">
 	<th>{$lng['admin']['configfiles']['commands']}</th>
 </tr>
 <tr>
diff --git a/templates/Sparkle/admin/configfiles/configfiles_files.tpl b/templates/Sparkle/admin/configfiles/configfiles_files.tpl
index 054e7cc2..3b07f63c 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_files.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_files.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr class="section">
 	<th>{$lng['admin']['configfiles']['files']}</th>
 </tr>
 <tr>
diff --git a/templates/Sparkle/admin/configfiles/wizard.tpl b/templates/Sparkle/admin/configfiles/wizard.tpl
index 280c9958..a9fec6d0 100644
--- a/templates/Sparkle/admin/configfiles/wizard.tpl
+++ b/templates/Sparkle/admin/configfiles/wizard.tpl
@@ -8,14 +8,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;Wizard</legend>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 
-					<table class="formtable">
+					<table class="tiny center">
 						<tr>
 							<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
 							<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
diff --git a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl
index d3f7d57b..ed0fa55c 100644
--- a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl
+++ b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'cronjobs'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 				
-				<table class="formtable">
+				<table class="full">
 					{$cronjobs_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/cronjobs/cronjobs.tpl b/templates/Sparkle/admin/cronjobs/cronjobs.tpl
index 1b7cfe0d..d644b76b 100644
--- a/templates/Sparkle/admin/cronjobs/cronjobs.tpl
+++ b/templates/Sparkle/admin/cronjobs/cronjobs.tpl
@@ -13,7 +13,7 @@ $header
 		</div>
 		
 		<section>
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['cron']['description']}</th>
diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl
index 5024550e..cfeab255 100644
--- a/templates/Sparkle/admin/customers/customers.tpl
+++ b/templates/Sparkle/admin/customers/customers.tpl
@@ -24,7 +24,7 @@ $header
 				</div>
 				</if>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>
diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl
index 3ec91276..ffabf7d9 100644
--- a/templates/Sparkle/admin/customers/customers_add.tpl
+++ b/templates/Sparkle/admin/customers/customers_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 				
-				<table class="formtable">
+				<table class="full">
 					{$customer_add_form}
 				</table>
 			</form>
@@ -25,7 +25,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl
index b627ea9a..f9d751ec 100644
--- a/templates/Sparkle/admin/customers/customers_edit.tpl
+++ b/templates/Sparkle/admin/customers/customers_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 			
-				<table class="formtable">
+				<table class="full">
 					{$customer_edit_form}
 				</table>
 			</form>
@@ -26,7 +26,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl
index b4e7f48c..aac07c37 100644
--- a/templates/Sparkle/admin/domains/domains.tpl
+++ b/templates/Sparkle/admin/domains/domains.tpl
@@ -24,7 +24,7 @@
 				</div>
 				</if>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
diff --git a/templates/Sparkle/admin/domains/domains_add.tpl b/templates/Sparkle/admin/domains/domains_add.tpl
index 60f59f57..f760faed 100644
--- a/templates/Sparkle/admin/domains/domains_add.tpl
+++ b/templates/Sparkle/admin/domains/domains_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,14 +15,14 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$domain_add_form}
 				</table>
 			</form>
 
 		</section>
 		<br />
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
 			</p>
diff --git a/templates/Sparkle/admin/domains/domains_edit.tpl b/templates/Sparkle/admin/domains/domains_edit.tpl
index 6dfe6f38..89b1acc4 100644
--- a/templates/Sparkle/admin/domains/domains_edit.tpl
+++ b/templates/Sparkle/admin/domains/domains_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="delete_statistics_str" id="delete_statistics_str" value="{$lng['admin']['delete_statistics']}">
@@ -28,13 +28,13 @@ $header
 					</div>
 				</div>
 
-				<table class="formtable">
+				<table class="full">
 					{$domain_edit_form}
 				</table>
 			</form>
 		</section>
 		<br />
-		<section class="fullform bradius">
+		<section>
 			<p>
 				<span class="red">*</span>: {$lng['admin']['valuemandatory']}
 			</p>
diff --git a/templates/Sparkle/admin/index/change_language.tpl b/templates/Sparkle/admin/index/change_language.tpl
index 79f23d76..bed08d56 100644
--- a/templates/Sparkle/admin/index/change_language.tpl
+++ b/templates/Sparkle/admin/index/change_language.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<table class="formtable">
+					<table class="tiny center">
 						<tr>
 							<td><label for="def_language">{$lng['login']['language']}:</label></td>
 							<td><select id="def_language" name="def_language">$language_options</select></td>
diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl
index dd1c9b56..74f24a16 100644
--- a/templates/Sparkle/admin/index/change_password.tpl
+++ b/templates/Sparkle/admin/index/change_password.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<table class="formtable">
+					<table class="tiny center">
 						<tr>
 							<td><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
 							<td><input type="password" id="old_password" name="old_password" /></td>
diff --git a/templates/Sparkle/admin/index/change_theme.tpl b/templates/Sparkle/admin/index/change_theme.tpl
index c4e75e7c..7916516e 100644
--- a/templates/Sparkle/admin/index/change_theme.tpl
+++ b/templates/Sparkle/admin/index/change_theme.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<table class="formtable">
+					<table class="tiny center">
 						<tr>
 							<td><label for="theme">{$lng['panel']['theme']}:</label></td>
 							<td><select id="theme" name="theme">$theme_options</select></td>
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 26e91e40..08fb00fb 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -167,7 +167,7 @@ $header
 		
 
 		<if Settings::Get('admin.show_news_feed') == '1'>
-		<section class="dboarditem dboarditemnews bradius" id="newsfeed">
+		<section class="dboarditem dboarditemnews" id="newsfeed">
 			<table>
 				<tr>
 					<th>News</th>
@@ -177,7 +177,7 @@ $header
 		</section>
 		</if>
 
-		<table class="dboarditem bradius">
+		<table class="dboarditem">
 			<thead>
 				<tr>
 					<th colspan="2">{$lng['admin']['systemdetails']}</th>
diff --git a/templates/Sparkle/admin/index/send_error_report.tpl b/templates/Sparkle/admin/index/send_error_report.tpl
index 7ddda746..6410b025 100644
--- a/templates/Sparkle/admin/index/send_error_report.tpl
+++ b/templates/Sparkle/admin/index/send_error_report.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
 				<input type="hidden" name="send" value="send" />
-				<table class="formtable">
+				<table class="full">
 					<thead>
 					<tr>
 						<th>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
index 7c533fdd..9789dce7 100644
--- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl
+++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
@@ -21,7 +21,7 @@ $header
 					<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
 				</div>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}</th>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl b/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl
index 1f1b6180..806617ee 100644
--- a/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl
+++ b/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ipsandports_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl b/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl
index a98f64e7..4d12e2ac 100644
--- a/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl
+++ b/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ipsandports_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl
index 09cdaaa9..701023b8 100644
--- a/templates/Sparkle/admin/logger/logger.tpl
+++ b/templates/Sparkle/admin/logger/logger.tpl
@@ -23,7 +23,7 @@ $header
 					<a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a>
 				</div>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['logger']['date']}&nbsp;{$arrowcode['date']}</th>
diff --git a/templates/Sparkle/admin/message/message.tpl b/templates/Sparkle/admin/message/message.tpl
index b49cfc63..eaacf581 100644
--- a/templates/Sparkle/admin/message/message.tpl
+++ b/templates/Sparkle/admin/message/message.tpl
@@ -14,14 +14,14 @@ $header
 			</div>
 		</if>
 
-		<section class="fullform bradius">
+		<section>
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<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"/>
 				
-				<table class="formtable">
+				<table class="full">
 					<tr>
 						<td><b><label for="receipient">{$lng['admin']['receipient']}</label></b></td>
 						<td><select name="receipient" id="receipient">$receipients</select></td>
@@ -32,7 +32,7 @@ $header
 					</tr>
 					<tr>
 						<td><b><label for="message">{$lng['admin']['text']}</label></b></td>
-						<td><textarea rows="12" name="message" id="message"></textarea></td>
+						<td><textarea rows="12" cols="80" name="message" id="message"></textarea></td>
 					</tr>
 					<tfoot>
 						<tr>
diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl
index dc957005..6fcfc428 100644
--- a/templates/Sparkle/admin/phpconfig/overview.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview.tpl
@@ -14,18 +14,18 @@ $header
 				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
 			</div>
 
-			<table class="bradius">
-			<thead>
-				<tr>
-					<th>{$lng['admin']['phpsettings']['description']}</th>
-					<th>{$lng['admin']['phpsettings']['activedomains']}</th>
-					<th>{$lng['admin']['phpsettings']['binary']}</th>
-					<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
-					<th>{$lng['panel']['options']}</th>
-			</thead>
-			<tbody>
-				$tablecontent
-			</tbody>
+			<table class="full hl">
+				<thead>
+					<tr>
+						<th>{$lng['admin']['phpsettings']['description']}</th>
+						<th>{$lng['admin']['phpsettings']['activedomains']}</th>
+						<th>{$lng['admin']['phpsettings']['binary']}</th>
+						<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
+						<th>{$lng['panel']['options']}</th>
+				</thead>
+				<tbody>
+					$tablecontent
+				</tbody>
 			</table>
 			
 			<if 15 < $count>
diff --git a/templates/Sparkle/admin/phpconfig/overview_add.tpl b/templates/Sparkle/admin/phpconfig/overview_add.tpl
index d6314a11..7ccd6c5b 100644
--- a/templates/Sparkle/admin/phpconfig/overview_add.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$phpconfig_add_form}
 				</table>
 			</form>
@@ -31,7 +31,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/phpconfig/overview_edit.tpl b/templates/Sparkle/admin/phpconfig/overview_edit.tpl
index fa4ddb0e..6080f877 100644
--- a/templates/Sparkle/admin/phpconfig/overview_edit.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s"/>
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id"/>
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$phpconfig_edit_form}
 				</table>
 			</form>
@@ -32,7 +32,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/settings/phpinfo.tpl b/templates/Sparkle/admin/settings/phpinfo.tpl
index ceb70dbc..45774c1f 100644
--- a/templates/Sparkle/admin/settings/phpinfo.tpl
+++ b/templates/Sparkle/admin/settings/phpinfo.tpl
@@ -7,8 +7,8 @@ $header
 			</h2>
 		</header>
 
-		<section class="dboarditemfull bradius phpinfo">
-			<table width="100%">
+		<section>
+			<table class="full">
 				{$phpinfo}
 			</table>
 		</section>
diff --git a/templates/Sparkle/admin/settings/phpinfo/phpinfo_table.tpl b/templates/Sparkle/admin/settings/phpinfo/phpinfo_table.tpl
index 70d33094..63751eb5 100644
--- a/templates/Sparkle/admin/settings/phpinfo/phpinfo_table.tpl
+++ b/templates/Sparkle/admin/settings/phpinfo/phpinfo_table.tpl
@@ -1,4 +1,4 @@
-	<tr>
+	<tr class="section">
 		<th colspan="3">{$name}</th>
 	</tr>
 	{$phpinfoentries}
\ No newline at end of file
diff --git a/templates/Sparkle/admin/settings/settings.tpl b/templates/Sparkle/admin/settings/settings.tpl
index db9df1f4..7a3075ed 100644
--- a/templates/Sparkle/admin/settings/settings.tpl
+++ b/templates/Sparkle/admin/settings/settings.tpl
@@ -7,8 +7,8 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradius">
-			<table class="formtable">
+		<section>
+			<table class="full">
 			$fields
 			<tfoot>
 				<tr>
diff --git a/templates/Sparkle/admin/settings/settings_form_end.tpl b/templates/Sparkle/admin/settings/settings_form_end.tpl
index a9a6eab1..3a8ef36e 100644
--- a/templates/Sparkle/admin/settings/settings_form_end.tpl
+++ b/templates/Sparkle/admin/settings/settings_form_end.tpl
@@ -3,5 +3,4 @@
 		</if>
 	</form>
 	<br />
-	<br />
 $footer
diff --git a/templates/Sparkle/admin/settings/settings_group.tpl b/templates/Sparkle/admin/settings/settings_group.tpl
index e32c5a00..2ff93156 100644
--- a/templates/Sparkle/admin/settings/settings_group.tpl
+++ b/templates/Sparkle/admin/settings/settings_group.tpl
@@ -1,10 +1,8 @@
-<thead>
-	<tr>
-		<th>
-			{$groupdetails['title']}
-		</th>
-		<th class="right">
-			<input type="reset" value="{$lng['panel']['reset']}" /><input type="submit" value="{$lng['panel']['save']}" />
-		</th>
-	</tr>
-</thead>
\ No newline at end of file
+<tr class="section">
+	<th>
+		{$groupdetails['title']}
+	</th>
+	<th class="right">
+		<input type="reset" value="{$lng['panel']['reset']}" /><input type="submit" value="{$lng['panel']['save']}" />
+	</th>
+</tr>
diff --git a/templates/Sparkle/admin/settings/settings_overview.tpl b/templates/Sparkle/admin/settings/settings_overview.tpl
index ad6d1f6d..c1cd32ac 100644
--- a/templates/Sparkle/admin/settings/settings_overview.tpl
+++ b/templates/Sparkle/admin/settings/settings_overview.tpl
@@ -7,25 +7,25 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradius">
-        	<table class="formtable">
-			<thead>
-				<tr>
-					<th colspan="3" class="right">
-						<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-			$fields
-			</tbody>
-			<tfoot>
-				<tr>
-					<td nowrap="nowrap" colspan="3" class="right">
-						<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
-					</td>
-				</tr>
-			</tfoot>
-		</table>
+		<section>
+			<table class="full">
+				<thead>
+					<tr>
+						<th colspan="3" class="right">
+							<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+				$fields
+				</tbody>
+				<tfoot>
+					<tr>
+						<td nowrap="nowrap" colspan="3" class="right">
+							<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
+						</td>
+					</tr>
+				</tfoot>
+			</table>
 		</section>
 </article>
diff --git a/templates/Sparkle/admin/settings/updatecounters.tpl b/templates/Sparkle/admin/settings/updatecounters.tpl
index 0ee418b3..200689c1 100644
--- a/templates/Sparkle/admin/settings/updatecounters.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters.tpl
@@ -7,20 +7,20 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
-        	<table class="formtable">
+		<section>
+			<table class="full">
 				<thead>
 				<tr>
 					<th colspan="3">{$lng['admin']['customers']}</th>
 				</tr>
 				</thead>
-{$customers}
+					{$customers}
 				<thead>
 				<tr>
 					<th colspan="3">{$lng['admin']['admins']}</th>
 				</tr>
 				</thead>
-{$admins}
+					{$admins}
 			</table>
 		</section>
 </article>
diff --git a/templates/Sparkle/admin/templates/filetemplates_add.tpl b/templates/Sparkle/admin/templates/filetemplates_add.tpl
index a9962dcb..e419d3a8 100644
--- a/templates/Sparkle/admin/templates/filetemplates_add.tpl
+++ b/templates/Sparkle/admin/templates/filetemplates_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="filesend" value="filesend" />
 			
-				<table class="formtable">
+				<table class="full">
 					{$filetemplate_add_form}
 				</table>
 			</form>
@@ -32,7 +32,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/templates/filetemplates_edit.tpl b/templates/Sparkle/admin/templates/filetemplates_edit.tpl
index 0ac86b71..4a8a20dd 100644
--- a/templates/Sparkle/admin/templates/filetemplates_edit.tpl
+++ b/templates/Sparkle/admin/templates/filetemplates_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="filesend" value="filesend" />
 
-				<table class="formtable">
+				<table class="full">
 					{$filetemplate_edit_form}
 				</table>
 			</form>
@@ -33,7 +33,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl
index de494212..60e019d8 100644
--- a/templates/Sparkle/admin/templates/templates.tpl
+++ b/templates/Sparkle/admin/templates/templates.tpl
@@ -3,11 +3,14 @@ $header
 		<header>
 			<h2>
 				<img src="templates/{$theme}/assets/img/icons/templates_big.png" alt="" />&nbsp;
-				{$lng['admin']['templates']['templates']}
+				{$lng['admin']['templates']['email']}
 			</h2>
 		</header>
 
 		<section>
+			<h3>
+				{$lng['admin']['templates']['templates']}
+			</h3>
 			<if $add>
 				<div class="overviewadd">
 					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
@@ -15,7 +18,7 @@ $header
 				</div>
 			</if>
 		
-			<table class="bradius">
+			<table class="full hl">
 			<thead>
 				<tr>
 					<th>{$lng['login']['language']}</th>
@@ -28,20 +31,12 @@ $header
 			</tbody>
 			</table>
 		</section>
-
-	</article>
-	<br />
-	<br />
-	<br />
-	<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/templates_big.png" alt="" />&nbsp;
-				{$lng['admin']['templates']['filetemplates']}
-			</h2>
-		</header>
-
+		<br />
+		<br />
 		<section>
+			<h3>
+				{$lng['admin']['templates']['filetemplates']}
+			</h3>
 			<if $filetemplateadd>
 				<div class="overviewadd">
 					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
@@ -49,7 +44,7 @@ $header
 				</div>
 			</if>
 			
-			<table class="bradius">
+			<table class="full hl">
 			<thead>
 				<tr>
 					<th>{$lng['admin']['templates']['action']}</th>
diff --git a/templates/Sparkle/admin/templates/templates_add_1.tpl b/templates/Sparkle/admin/templates/templates_add_1.tpl
index d4344ec6..9c11f3ef 100644
--- a/templates/Sparkle/admin/templates/templates_add_1.tpl
+++ b/templates/Sparkle/admin/templates/templates_add_1.tpl
@@ -7,16 +7,15 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'templates'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
 					<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="prepare" value="prepare" />
 						
-					<table class="formtable tinyform">
+					<table class="tiny center">
 						<tr>
 							<td><label for="language">{$lng['login']['language']}:</label></td>
 							<td><select id="language" name="language">$language_options</select></td>
diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl
index 785101c7..8ab6aebb 100644
--- a/templates/Sparkle/admin/templates/templates_add_2.tpl
+++ b/templates/Sparkle/admin/templates/templates_add_2.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$template_add_form}
 				</table>
 			</form>
@@ -32,7 +32,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl
index 40e65f9f..4506b419 100644
--- a/templates/Sparkle/admin/templates/templates_edit.tpl
+++ b/templates/Sparkle/admin/templates/templates_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -17,7 +17,7 @@ $header
 				<input type="hidden" name="mailbodyid" value="$mailbodyid" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$template_edit_form}
 				</table>
 			</form>
@@ -34,7 +34,7 @@ $header
 		
 		<section>
 			
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/tickets/archive.tpl b/templates/Sparkle/admin/tickets/archive.tpl
index 68605dfd..0ee79bdd 100644
--- a/templates/Sparkle/admin/tickets/archive.tpl
+++ b/templates/Sparkle/admin/tickets/archive.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section>
 
-			<table class="bradius">
+			<table class="full">
 			<thead>
 				<tr>
 					<th>{$lng['ticket']['archivedtime']}</th>
@@ -31,7 +31,7 @@ $header
 	<br />
 	<br />
 	<article>
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 
@@ -39,7 +39,7 @@ $header
 			<input type="hidden" name="page" value="$page"/>
 			<input type="hidden" name="send" value="send" />
 	
-			<table class="formtable">
+			<table class="full">
 			<thead>
 				<tr>
 					<th colspan="2">{$lng['ticket']['search']}</th>
diff --git a/templates/Sparkle/admin/tickets/archivesearch.tpl b/templates/Sparkle/admin/tickets/archivesearch.tpl
index 94a48b19..265220de 100644
--- a/templates/Sparkle/admin/tickets/archivesearch.tpl
+++ b/templates/Sparkle/admin/tickets/archivesearch.tpl
@@ -1,28 +1,31 @@
 $header
-	<header>
-		<h2><img src="templates/{$theme}/assets/img/icons/ticket_archive_big.png" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</h2>
-	</header>
-	<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
-		<input type="hidden" name="s" value="$s"/>
-		<input type="hidden" name="page" value="$page"/>
-		<input type="hidden" name="send" value="send" />
-		<table cellpadding="5" cellspacing="0" border="0" align="center" class="fullform bradius">
-      		<if 0 < $tickets_count >
+	<section>
+		<header>
+			<h2><img src="templates/{$theme}/assets/img/icons/ticket_archive_big.png" alt="" />&nbsp;{$lng['ticket']['archivesearch']}</h2>
+		</header>
+		<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post">
+			<input type="hidden" name="s" value="$s"/>
+			<input type="hidden" name="page" value="$page"/>
+			<input type="hidden" name="send" value="send" />
+			<table class="full">
+				<if 0 < $tickets_count >
 				<tr>
 					<th class="field_display_border_left">{$lng['ticket']['archivedtime']}</th>
 					<th class="field_display">{$lng['ticket']['ticket_answers']}</th>
 					<th class="field_display">{$lng['ticket']['subject']}</th>
 					<th class="field_display">{$lng['ticket']['lastreplier']}</th>
 					<th class="field_display">{$lng['ticket']['priority']}</th>
-	        		<th class="field_display_search">&nbsp;</th>
+					<th class="field_display_search">&nbsp;</th>
 				</tr>
 				$tickets
-      		</if>
-      		<if $tickets_count < 1 >
-        		<tr>
-				<td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
+	      		</if>
+
+		  		<if $tickets_count < 1 >
+				<tr>
+					<td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
 				</tr>
-			</if>
-		</table>
-	</form>
+				</if>
+			</table>
+		</form>
+	</section>
 $footer
diff --git a/templates/Sparkle/admin/tickets/categories.tpl b/templates/Sparkle/admin/tickets/categories.tpl
index 593433fc..c6f0062c 100644
--- a/templates/Sparkle/admin/tickets/categories.tpl
+++ b/templates/Sparkle/admin/tickets/categories.tpl
@@ -23,7 +23,7 @@ $header
 					<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'addcategory'))}">{$lng['ticket']['ticket_newcateory']}</a>
 				</div>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['ticket']['category']}&nbsp;{$arrowcode['name']}</th>
diff --git a/templates/Sparkle/admin/tickets/tickets.tpl b/templates/Sparkle/admin/tickets/tickets.tpl
index 1a6ddb0a..f41e9c5a 100644
--- a/templates/Sparkle/admin/tickets/tickets.tpl
+++ b/templates/Sparkle/admin/tickets/tickets.tpl
@@ -25,7 +25,7 @@ $header
 				</div>
 				</if>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
diff --git a/templates/Sparkle/admin/tickets/tickets_editcategory.tpl b/templates/Sparkle/admin/tickets/tickets_editcategory.tpl
index bb207fcc..95ae405d 100644
--- a/templates/Sparkle/admin/tickets/tickets_editcategory.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_editcategory.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$category_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/tickets/tickets_new.tpl b/templates/Sparkle/admin/tickets/tickets_new.tpl
index 528d9ac9..499f28b8 100644
--- a/templates/Sparkle/admin/tickets/tickets_new.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_new.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ticket_new_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/tickets/tickets_newcategory.tpl b/templates/Sparkle/admin/tickets/tickets_newcategory.tpl
index 43bd3455..23940418 100644
--- a/templates/Sparkle/admin/tickets/tickets_newcategory.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_newcategory.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$category_new_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/tickets/tickets_reply.tpl b/templates/Sparkle/admin/tickets/tickets_reply.tpl
index 6c9bcaf2..f36dc972 100644
--- a/templates/Sparkle/admin/tickets/tickets_reply.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_reply.tpl
@@ -20,7 +20,7 @@ $header
 			$ticket_replies
 		</if>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -29,7 +29,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ticket_reply_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl b/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
index c1ba3e88..3e76d797 100644
--- a/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
@@ -1,5 +1,5 @@
-<section class="fullform bradius">
-	<table class="formtable">
+<section>
+	<table class="full">
 		<tr>
 			<th>{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</th>
 		</tr>
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl b/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
index 28ff5d89..eb15ffaf 100644
--- a/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
@@ -1,5 +1,5 @@
-<section class="fullform bradius">
-	<table class="formtable">
+<section>
+	<table class="full">
 		<tr>
 			<th>{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</th>
 		</tr>
diff --git a/templates/Sparkle/admin/traffic/index_table.tpl b/templates/Sparkle/admin/traffic/index_table.tpl
index 2da910e2..ee060c70 100644
--- a/templates/Sparkle/admin/traffic/index_table.tpl
+++ b/templates/Sparkle/admin/traffic/index_table.tpl
@@ -1,5 +1,6 @@
 	<h3>{$lng['traffic']['trafficoverview']}&nbsp;{$overview['type']}&nbsp;{$overview['year']}</h3>
-	<table class="bradius" id="stats{$overview['year']}">
+	<section>
+	<table class="full" id="stats{$overview['year']}">
 		<thead>
 			<tr>
 				<th>{$overview['type']}</th>
@@ -24,6 +25,7 @@
 			{$total_list}
 		</tfoot>
 	</table>
+	</section>
 	<script type="text/javascript">
 		var myTextExtraction = function(node)  
 		{  
diff --git a/templates/Sparkle/assets/css/dark.css b/templates/Sparkle/assets/css/dark.css
new file mode 100644
index 00000000..11fef3b1
--- /dev/null
+++ b/templates/Sparkle/assets/css/dark.css
@@ -0,0 +1,34 @@
+.content, nav {
+	background-color: #11171c;
+}
+nav div:first-child {
+	display:inherit;
+}
+nav a {
+	color: #424a51;
+}
+nav a:hover {
+	color: #fff;
+}
+nav .active {
+	color: #fff;
+}
+.menuelement {
+	border: none;
+	color: #424a51;
+	margin: 15px 0px 25px 10px;
+	padding: 0px;
+}
+.menuelement h4 {
+	background: none;
+	color: #088ecc;
+	font-weight: 900;
+	text-transform: uppercase;
+}
+.menuelement h4 a {
+	color: #088ecc;
+}
+
+.topheader {
+	background:#f0f2f4;
+}
diff --git a/templates/Sparkle/assets/css/froxlor.css b/templates/Sparkle/assets/css/froxlor.css
index a2c25092..961b553e 100644
--- a/templates/Sparkle/assets/css/froxlor.css
+++ b/templates/Sparkle/assets/css/froxlor.css
@@ -42,27 +42,6 @@ h2 img {
 	height:32px!important;
 }
 
-table.bradius {
-	/* width: 100%; */
-	border-spacing: 0;
-	background-color: #f8f8f8;
-	border-top: 0;
-	border-left: 1px solid #666;
-	border-bottom: 1px solid #666;
-	border-collapse: separate;
-	-webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
-	border-collapse: separate;
-}
-
-table.bradius tbody tr td {
-	border-right: 1px solid #666;
-}
-
 .topheader {
 	background:#cccccc url('../img/header_g_froxlor.png') 0 bottom repeat-x;
 	margin-bottom:12px;
@@ -78,27 +57,6 @@ table.bradius tbody tr td {
 	width:24px;
 }
 
-.fullform,.midform,.tinyform {
-	-webkit-border-top-right-radius:20px;
-	-webkit-border-bottom-left-radius:20px;
-	-moz-border-radius-topright:20px;
-	-moz-border-radius-bottomleft:20px;
-	border-top-right-radius:20px;
-	border-bottom-left-radius:20px;
-	border:1px solid #666;
-	background-color:#f8f8f8;
-}
-
-.tinyform tbody tr:first-child td:last-child {
-	-webkit-border-top-right-radius:20px;
-	-moz-border-radius-topright:20px;
-	border-top-right-radius:20px;
-}
-
-table.tinyform input {
-	width:50%;
-}
-
 /* navigation */
 nav {
 	background-color:#eeeeee;
@@ -147,10 +105,33 @@ nav div:last-child {
 	color:#000;
 }
 
+/* TABLES */
+table {
+	border-radius: 0;
+	border: 1px solid #666;
+	-webkit-border-top-right-radius:20px;
+	-webkit-border-bottom-left-radius:20px;
+	-moz-border-radius-topright:20px;
+	-moz-border-radius-bottomleft:20px;
+	border-top-right-radius:20px;
+	border-bottom-left-radius:20px;
+	background-color: #fff;
+}
+
 table thead th, table th {
 	color: #fff;
-	background-color: #176fa1 !important;
+	background-color: #176fa1;
 	border: 1px solid #176fa1;
+	text-align: center;
+	-webkit-border-top-right-radius:20px;
+	-webkit-border-bottom-left-radius:20px;
+	-moz-border-radius-topright:20px;
+	-moz-border-radius-bottomleft:20px;
+	border-top-right-radius:20px;
+	border-bottom-left-radius:20px;
+}
+
+table tfoot tr td {
 	-webkit-border-top-right-radius: 20px;
 	-webkit-border-bottom-left-radius: 20px;
 	-moz-border-radius-topright: 20px;
@@ -159,60 +140,6 @@ table thead th, table th {
 	border-bottom-left-radius: 20px;
 }
 
-table th {
-	font-weight:700;
-	text-align:center;
-}
-
-table tbody tr {
-	background-color: #fff;
-}
-
-table tbody tr:last-child td:first-child {
-	border-bottom:0;
-}
-
-table.bradius tfoot tr:last-child td:first-child, table.bradius tbody tr:last-child td:first-child {
-	border-bottom:0;
-	-webkit-border-bottom-left-radius: 20px;
-	-moz-border-radius-bottomleft: 20px;
-	border-bottom-left-radius: 20px;
-}
-
-table.bradius tfoot tr:last-child td {
-	border-right:1px solid #000;
-}
-
-.formtable tbody td, .formtable td {
-	border-bottom: 1px dotted #ccc;
-}
-
-.formtable tbody tr th {
-	background-color: rgb(245, 245, 245);
-}
-
-.formtable tbody tr:first-child th {
-	-webkit-border-top-right-radius: 20px;
-	-moz-border-radius-topright: 20px;
-	border-top-right-radius: 20px;
-}
-
-.formtable tfoot tr:last-child td:first-child {
-	-webkit-border-bottom-left-radius: 20px;
-	-moz-border-radius-bottomleft: 20px;
-	border-bottom-left-radius: 20px;
-}
-
-table tfoot td {
-	height:25px;
-	border-top:0;
-	background-color: #fff;
-}
-
-.formtable tfoot td {
-	padding-right:0;
-}
-
 input {
 	color:#000;
 	background-color:#dae7ee!important;
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 1d6c09be..a53518fb 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -12,7 +12,7 @@ article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
 html,body {
 	font:12px/18px 'Lucida Grande','Lucida Sans Unicode',Helvetica,Arial,Verdana,sans-serif;
 	background-color: #f5f5f5;
-	color:#333;
+	color:#444;
 	-webkit-font-smoothing: subpixel-antialiased;
 }
 
@@ -58,6 +58,7 @@ img.small {
 
 h1 {
 	display:none;
+	font-size: 2em;
 }
 
 h2,h3 {
@@ -76,7 +77,7 @@ h3 {
 }
 
 h4 {
-	font-size:12px;
+	font-size:13px;
 }
 
 img {
@@ -214,26 +215,13 @@ footer img {
 	width:800px;
 }
 
-.fullform,.midform,.tinyform {
-	background-color:#fff;
-	border:1px solid #d1d5d8;
-}
-
-.fullform p {
-	margin:10px!important;
-}
-
-table.tinyform input {
-	width:120px;
-}
-
-.fullform,.midform,.installsec {
+.installsec {
 	margin-top:10px;
 	padding:0;
 	text-align:left;
 }
 
-.tinyform, .loginsec, .errorsec {
+.loginsec, .errorsec {
 	margin-top:10px;
 	padding:10px 0;
 	text-align:center;
@@ -243,28 +231,7 @@ table.tinyform input {
 	padding:10px;
 }
 
-.tinyform {
-	padding:0;
-}
-
-.fullform {
-	width:100%;
-	margin:0 auto;
-	text-align:left;
-}
-
-.midform {
-	width:600px;
-	margin:0 auto;
-	padding:10px 0;
-	text-align:left;
-}
-
-.midform {
-	padding:0;
-}
-
-.tinyform, .loginsec form {
+.loginsec form {
 	width:400px;
 	margin:0 auto;
 	text-align:left;
@@ -279,24 +246,11 @@ table.tinyform input {
 	padding:0;
 }
 
-.fullform fieldset,.midform fieldset,.tinyform fieldset {
-	border:0;
-	width:100%;
-	padding:0;
-}
-
-.fullform legend,.loginsec legend,.midform legend,.tinyform legend {
+.loginsec legend {
 	display:none;
 }
 
-.fullform label {
-	float:left;
-	width:26em;
-	margin-top:6px;
-	text-align:right;
-}
-
-.midform label, .tinyform label, .loginsec label {
+.loginsec label {
 	float:left;
 	width:10em;
 	margin-right:1em;
@@ -304,15 +258,11 @@ table.tinyform input {
 	text-align:right;
 }
 
-.fullform textarea,.midform textarea {
-	width:60%;
-}
-
 .loginsec input[type="text"], .loginsec input[type="password"] {
 	width:183px;
 }
 
-.tinyform select, .loginsec select {
+.loginsec select {
 	width:213px;
 }
 
@@ -529,103 +479,74 @@ nav div:last-child {
 	border:0;
 }
 
-.noborder td {
-	border:0;
-}
-
+/* TABLES */
 table {
-	width:100%;
-	border-spacing:0;
-	border:1px solid #d1d5d8;
-	border-bottom: 0px;
-	border-collapse:separate;
-	box-shadow:0 0 0 #000 !important;
+	border-radius: 3px;
+	border: 1px solid #d1d5d8;
+	border-spacing: 0;
+	border-collapse: separate;
 }
 
-table.bradius tbody tr:hover {
+table thead th, table th {
+	border-bottom: 1px solid #d1d5d8;
+	height: 25px;
+	padding: 5px 0 5px 8px;
+	background-color: #e9edf0;
+	font-weight: 700;
+}
+
+table tr.section:not(:first-child) th {
+	border-top: 1px solid #d1d5d8;
+}
+
+table tbody tr td {
+	border-bottom:1px solid #f1f2f3;
+}
+table tbody tr:last-child td {
+	border-bottom: none;
+}
+
+table.hl tbody tr:hover {
 	background-color: #f5f5f5;
 }
 
-table tr.top td {
-	vertical-align: top;
-}
-
-table thead th,table th {
+table tfoot tr td {
+	height:25px;
 	border-top:1px solid #d1d5d8;
-	border-bottom:1px solid #d1d5d8;
-	height:25px!important;
-	padding:5px 0 5px 8px;
-	background-color:#e9edf0;
-	font-weight:700;
+	background-color:#f2f8fa;
+	padding-right: 0px;
 }
 
-table thead:first-child th,table:first-child th {
-	border-top:none!important;
-}
-
-table th {
-	border-top:0;
+table td {
+	padding: 5px 10px;
+	height: 25px;
+    min-height: 25px;
 }
 
 table th.right, table td.right {
 	text-align: right;
 }
 
-th a:hover {
-	text-decoration:none;
+table.tiny {
+	width: 400px;
 }
-
-th a:nth-child(odd) img {
-	position:relative;
-	top:-5px;
-	left:4px;
+table.middle {
+	width: 600px;
 }
-
-th a:nth-child(even) img {
-	position:relative;
-	top:3px;
-	left:-7px;
+table.full {
+	width: 100%;
 }
-
-table thead:first-child th {
-	border-top:0;
+table.center {
+	margin: 0 auto;
 }
-
-.disabled td,.disabled td a {
+table tr.top {
+	vertical-align: top;
+}
+tr.disabled td, tr.disabled td a {
 	color:#cfcfcf;
 }
 
-table tbody td {
-	border-bottom:1px solid #f1f2f3;
-}
-
-table tbody tr:last-child td {
-	border-bottom: 1px solid #d1d5d8;
-}
-
-.formtable {
-	width:100%;
-	border-spacing:0;
-	border:0;
-	border-collapse:separate;
-	margin:0;
-}
-
-.formtable tbody td, .formtable td {
-	border:0;
-	border-bottom:1px solid #f1f2f3;
-	height: 30px;
-}
-
-.formtable label {
-	float:none;
-	display:block;
-	padding:0;
-	margin:0;
-	width:100%;
-	text-align:left;
-}
-
+/* ADMIN/CUSTOMER BARS */
 .overviewcustomerextras {
 	line-height:15px;
 	font-size:10px;
@@ -639,32 +560,7 @@ table tbody tr:last-child td {
 	float:left;
 }
 
-td {
-	padding-top:5px;
-	padding-left:10px;
-	padding-right:10px;
-	padding-bottom:5px;
-}
-
-table tfoot td {
-	height:25px;
-	border-top:1px solid #d1d5d8;
-	background-color:#f2f8fa;
-}
-
-.formtable tfoot td {
-	padding-right:0;
-}
-
-.tfootleft {
-	text-align:left;
-}
-
-.maintitle {
-	padding-top:20px;
-}
-
-/* input elements */
+/* INPUT ELEMENTS */
 input {
 	background:#fff url(../img/icons/text_align_left.png) no-repeat 5px 4px;
 	color: #333;
diff --git a/templates/Sparkle/assets/css/main_ie.css b/templates/Sparkle/assets/css/main_ie.css
index f35de74b..041abe1d 100644
--- a/templates/Sparkle/assets/css/main_ie.css
+++ b/templates/Sparkle/assets/css/main_ie.css
@@ -9,10 +9,6 @@ input[type="submit"],input[class="nobutton"],input[type="reset"] {
 	padding-left: 24px;
 }
 
-.midform input[type="file"] {
-	width: 90%;
-}
-
 table thead th {
 	border-right: 1px solid #333;
 }
diff --git a/templates/Sparkle/customer/domains/domain_ssleditor.tpl b/templates/Sparkle/customer/domains/domain_ssleditor.tpl
index f2fafe97..4d161cc9 100644
--- a/templates/Sparkle/customer/domains/domain_ssleditor.tpl
+++ b/templates/Sparkle/customer/domains/domain_ssleditor.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradius">
+	<section>
 
 		<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<if $do_insert == 1>
@@ -19,7 +19,7 @@ $header
 			<input type="hidden" name="id" value="$id" />
 			<input type="hidden" name="send" value="send" />
 
-			<table class="formtable">
+			<table class="full">
 			  {$ssleditor_form}
 			</table>
 		</form>
diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl
index cb912378..5325ee92 100644
--- a/templates/Sparkle/customer/domains/domainlist.tpl
+++ b/templates/Sparkle/customer/domains/domainlist.tpl
@@ -24,7 +24,7 @@
 				</div>
 				</if>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
diff --git a/templates/Sparkle/customer/domains/domains_add.tpl b/templates/Sparkle/customer/domains/domains_add.tpl
index ed566b0e..bcc86df9 100644
--- a/templates/Sparkle/customer/domains/domains_add.tpl
+++ b/templates/Sparkle/customer/domains/domains_add.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradius">
+	<section>
 
 		<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 			<input type="hidden" name="action" value="$action" />
 			<input type="hidden" name="send" value="send" />
 
-			<table class="formtable">
+			<table class="full">
 				  {$subdomain_add_form}
 			</table>
 		</form>
diff --git a/templates/Sparkle/customer/domains/domains_edit.tpl b/templates/Sparkle/customer/domains/domains_edit.tpl
index 19de6795..3979537e 100644
--- a/templates/Sparkle/customer/domains/domains_edit.tpl
+++ b/templates/Sparkle/customer/domains/domains_edit.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradius">
+	<section>
 
 		<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 			<input type="hidden" name="id" value="$id" />
 			<input type="hidden" name="send" value="send" />
 
-			<table class="formtable">
+			<table class="full">
 				  {$subdomain_edit_form}
 			</table>
 		</form>
diff --git a/templates/Sparkle/customer/email/account_add.tpl b/templates/Sparkle/customer/email/account_add.tpl
index 7e5d4b76..4937dfb5 100644
--- a/templates/Sparkle/customer/email/account_add.tpl
+++ b/templates/Sparkle/customer/email/account_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$account_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/email/account_changepw.tpl b/templates/Sparkle/customer/email/account_changepw.tpl
index 17f4874b..b881f451 100644
--- a/templates/Sparkle/customer/email/account_changepw.tpl
+++ b/templates/Sparkle/customer/email/account_changepw.tpl
@@ -7,8 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
-
+		<section>
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
@@ -16,7 +15,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$account_changepw_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/email/account_changequota.tpl b/templates/Sparkle/customer/email/account_changequota.tpl
index 0f70c005..a2997e90 100644
--- a/templates/Sparkle/customer/email/account_changequota.tpl
+++ b/templates/Sparkle/customer/email/account_changequota.tpl
@@ -7,8 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
-
+		<section>
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
@@ -16,7 +15,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$quota_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl
index 72544d9e..c4408788 100644
--- a/templates/Sparkle/customer/email/emails.tpl
+++ b/templates/Sparkle/customer/email/emails.tpl
@@ -24,7 +24,7 @@
 				</div>
 				</if>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
diff --git a/templates/Sparkle/customer/email/emails_add.tpl b/templates/Sparkle/customer/email/emails_add.tpl
index bcae9362..f713d2f8 100644
--- a/templates/Sparkle/customer/email/emails_add.tpl
+++ b/templates/Sparkle/customer/email/emails_add.tpl
@@ -16,7 +16,7 @@ $header
 			</div>
 		</div>
 	<else>
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -24,7 +24,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$email_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/email/emails_domain.tpl b/templates/Sparkle/customer/email/emails_domain.tpl
index 7fb59787..618cc991 100644
--- a/templates/Sparkle/customer/email/emails_domain.tpl
+++ b/templates/Sparkle/customer/email/emails_domain.tpl
@@ -1,3 +1,3 @@
 <tr>
-	<td class="title" colspan="7"><b>{$domainname}</b></td>
+	<td colspan="7"><b>{$domainname}</b></td>
 </tr>
\ No newline at end of file
diff --git a/templates/Sparkle/customer/email/emails_edit.tpl b/templates/Sparkle/customer/email/emails_edit.tpl
index a7eb1d23..539c4749 100644
--- a/templates/Sparkle/customer/email/emails_edit.tpl
+++ b/templates/Sparkle/customer/email/emails_edit.tpl
@@ -7,24 +7,20 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradius">
+	<section>
 
 		<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">
-					<thead>
-						<tr><th colspan="2"></th></tr>
-					</thead>
-					{$email_edit_form}
-					<tfoot>
+			<table class="full">
+				<thead>
+					<tr><th colspan="2"></th></tr>
+				</thead>
+				{$email_edit_form}
+				<tfoot>
 					<tr>
 						<td colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{$lng['emails']['back_to_overview']}</a></td>
 					</tr>
-					</tfoot>
-				</table>
-			</fieldset>
+				</tfoot>
+			</table>
 		</form>
 
 	</section>
diff --git a/templates/Sparkle/customer/email/forwarder_add.tpl b/templates/Sparkle/customer/email/forwarder_add.tpl
index 6d0e3410..e6d9c226 100644
--- a/templates/Sparkle/customer/email/forwarder_add.tpl
+++ b/templates/Sparkle/customer/email/forwarder_add.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradius">
+	<section>
 	
 		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 			<input type="hidden" name="id" value="$id" />
 			<input type="hidden" name="send" value="send" />
 
-			<table class="formtable">
+			<table class="full">
 				{$forwarder_add_form}
 			</table>
 		</form>
diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl
index 41e57e4e..eb05e8a8 100644
--- a/templates/Sparkle/customer/extras/htaccess.tpl
+++ b/templates/Sparkle/customer/extras/htaccess.tpl
@@ -22,7 +22,7 @@
 					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
 				</div>
 		
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['panel']['path']}&nbsp;{$arrowcode['path']}</th>
diff --git a/templates/Sparkle/customer/extras/htaccess_add.tpl b/templates/Sparkle/customer/extras/htaccess_add.tpl
index 4d5adc43..ff71f0fc 100644
--- a/templates/Sparkle/customer/extras/htaccess_add.tpl
+++ b/templates/Sparkle/customer/extras/htaccess_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$htaccess_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/extras/htaccess_edit.tpl b/templates/Sparkle/customer/extras/htaccess_edit.tpl
index ac41895e..ade398ac 100644
--- a/templates/Sparkle/customer/extras/htaccess_edit.tpl
+++ b/templates/Sparkle/customer/extras/htaccess_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$htaccess_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl
index 2005c145..10e4898b 100644
--- a/templates/Sparkle/customer/extras/htpasswds.tpl
+++ b/templates/Sparkle/customer/extras/htpasswds.tpl
@@ -22,7 +22,7 @@
 					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
 				</div>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th>
diff --git a/templates/Sparkle/customer/extras/htpasswds_add.tpl b/templates/Sparkle/customer/extras/htpasswds_add.tpl
index 1ea96f82..8f7cd91e 100644
--- a/templates/Sparkle/customer/extras/htpasswds_add.tpl
+++ b/templates/Sparkle/customer/extras/htpasswds_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$htpasswd_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/extras/htpasswds_edit.tpl b/templates/Sparkle/customer/extras/htpasswds_edit.tpl
index 83538274..0c1ef769 100644
--- a/templates/Sparkle/customer/extras/htpasswds_edit.tpl
+++ b/templates/Sparkle/customer/extras/htpasswds_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$htpasswd_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl
index 5f93e052..e6a2c263 100644
--- a/templates/Sparkle/customer/ftp/accounts.tpl
+++ b/templates/Sparkle/customer/ftp/accounts.tpl
@@ -24,7 +24,7 @@
 				</div>
 				</if>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th>
diff --git a/templates/Sparkle/customer/ftp/accounts_add.tpl b/templates/Sparkle/customer/ftp/accounts_add.tpl
index 4ed3c730..9d05c5da 100644
--- a/templates/Sparkle/customer/ftp/accounts_add.tpl
+++ b/templates/Sparkle/customer/ftp/accounts_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'ftp'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ftp_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/ftp/accounts_edit.tpl b/templates/Sparkle/customer/ftp/accounts_edit.tpl
index 92a367ac..66313686 100644
--- a/templates/Sparkle/customer/ftp/accounts_edit.tpl
+++ b/templates/Sparkle/customer/ftp/accounts_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'ftp'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="send" value="send" />
 				<input type="hidden" name="id" value="$id" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ftp_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/index/change_language.tpl b/templates/Sparkle/customer/index/change_language.tpl
index f176b942..5da189f3 100644
--- a/templates/Sparkle/customer/index/change_language.tpl
+++ b/templates/Sparkle/customer/index/change_language.tpl
@@ -7,17 +7,19 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<table class="formtable">
-						<tr>
-							<td width="50%"><label for="def_language">{$lng['login']['language']}:</label></td>
-							<td><select id="def_language" name="def_language">$language_options</select></td>
-						</tr>
+					<table class="tiny center">
+						<tbody>
+							<tr>
+								<td width="50%"><label for="def_language">{$lng['login']['language']}:</label></td>
+								<td><select id="def_language" name="def_language">$language_options</select></td>
+							</tr>
+						</tbody>
 						<tfoot>
 							<tr>
 								<td colspan="2" align="center">
diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl
index 1ed77483..f878195d 100644
--- a/templates/Sparkle/customer/index/change_password.tpl
+++ b/templates/Sparkle/customer/index/change_password.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<input type="hidden" name="s" value="$s" />
 					<input type="hidden" name="page" value="$page" />
 					<input type="hidden" name="send" value="send" />
-					<table class="formtable">
+					<table class="middle center">
 						<tr>
 							<td width="50%"><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
 							<td><input type="password" id="old_password" name="old_password" /></td>
@@ -27,12 +27,18 @@ $header
 							<td><input type="password" id="new_password_confirm" name="new_password_confirm" /></td>
 						</tr>
 						<tr>
-							<td><label for="change_main_ftp">{$lng['changepassword']['also_change_ftp']}:</label></td>
-							<td><input type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<input type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" />
+								<label for="change_main_ftp">{$lng['changepassword']['also_change_ftp']}</label>
+							</td>
 						</tr>
 						<tr>
-							<td><label for="change_webalizer">{$lng['changepassword']['also_change_webalizer']}:</label></td>
-							<td><input type="checkbox" name="change_webalizer" id="change_webalizer" value="true" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<input type="checkbox" name="change_webalizer" id="change_webalizer" value="true" />
+								<label for="change_webalizer">{$lng['changepassword']['also_change_webalizer']}</label>
+							</td>
 						</tr>
 						<tfoot>
 							<tr>
diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl
index 59d0e145..3e40df6b 100644
--- a/templates/Sparkle/customer/index/change_theme.tpl
+++ b/templates/Sparkle/customer/index/change_theme.tpl
@@ -7,13 +7,13 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
 				<input type="hidden" name="send" value="send" />
-				<table class="formtable">
+				<table class="tiny center">
 					<tr>
 						<td width="50%"><label for="theme">{$lng['panel']['theme']}:</label></td>
 						<td><select id="theme" name="theme">$theme_options</select></td>
diff --git a/templates/Sparkle/customer/index/send_error_report.tpl b/templates/Sparkle/customer/index/send_error_report.tpl
index 7ddda746..25fe09ff 100644
--- a/templates/Sparkle/customer/index/send_error_report.tpl
+++ b/templates/Sparkle/customer/index/send_error_report.tpl
@@ -7,26 +7,26 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
 				<input type="hidden" name="send" value="send" />
-				<table class="formtable">
+				<table class="full">
 					<thead>
-					<tr>
-						<th>
-							<p>{$lng['error']['send_report_desc']}</p>
-						</th>
-					</tr>
+						<tr>
+							<th>
+								<p>{$lng['error']['send_report_desc']}</p>
+							</th>
+						</tr>
 					</thead>
 					<tbody>
-					<tr>
-						<td>
-							<code>{$mail_html}</code>
-						</td>
-					</tr>
+						<tr>
+							<td>
+								<code>{$mail_html}</code>
+							</td>
+						</tr>
 					</tbody>
 					<tfoot>
 						<tr>
diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl
index f063dd3f..f1085ca1 100644
--- a/templates/Sparkle/customer/mysql/mysqls.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls.tpl
@@ -24,7 +24,7 @@
 				</div>
 				</if>
 	
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['mysql']['databasename']}&nbsp;{$arrowcode['databasename']}</th>
diff --git a/templates/Sparkle/customer/mysql/mysqls_add.tpl b/templates/Sparkle/customer/mysql/mysqls_add.tpl
index 319175e2..3fa467f7 100644
--- a/templates/Sparkle/customer/mysql/mysqls_add.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls_add.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$mysql_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/mysql/mysqls_edit.tpl b/templates/Sparkle/customer/mysql/mysqls_edit.tpl
index a095ab8b..7beacda2 100644
--- a/templates/Sparkle/customer/mysql/mysqls_edit.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -16,7 +16,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$mysql_edit_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/tickets/tickets.tpl b/templates/Sparkle/customer/tickets/tickets.tpl
index 9300334d..0bae4fb9 100644
--- a/templates/Sparkle/customer/tickets/tickets.tpl
+++ b/templates/Sparkle/customer/tickets/tickets.tpl
@@ -39,7 +39,7 @@ $header
 				</div>
 				</if>
 
-				<table class="bradius">
+				<table class="full hl">
 					<thead>
 						<tr>
 							<th>{$lng['ticket']['lastchange']}&nbsp;{$arrowcode['lastchange']}</th>
diff --git a/templates/Sparkle/customer/tickets/tickets_new.tpl b/templates/Sparkle/customer/tickets/tickets_new.tpl
index dcab3117..14b48601 100644
--- a/templates/Sparkle/customer/tickets/tickets_new.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_new.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradius">
+		<section>
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -15,7 +15,7 @@ $header
 				<input type="hidden" name="action" value="$action" />
 				<input type="hidden" name="send" value="send" />
 
-				<table class="formtable">
+				<table class="full">
 					{$ticket_add_form}
 				</table>
 			</form>
diff --git a/templates/Sparkle/customer/tickets/tickets_reply.tpl b/templates/Sparkle/customer/tickets/tickets_reply.tpl
index 0d67017e..c5bc4854 100644
--- a/templates/Sparkle/customer/tickets/tickets_reply.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_reply.tpl
@@ -11,7 +11,7 @@ $header
 		$ticket_replies
 		</if>
 
-		<section class="fullform bradius">
+		<section>
 			
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<input type="hidden" name="s" value="$s" />
@@ -21,7 +21,7 @@ $header
 				<input type="hidden" name="id" value="$id" />
 
 				<if $isclosed < 1 >
-				<table class="formtable">
+				<table class="full">
 					{$ticket_reply_form}
 				</table>
 				</if>
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets.tpl b/templates/Sparkle/customer/tickets/tickets_tickets.tpl
index 63ebd432..7f10b8d9 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets.tpl
@@ -26,4 +26,3 @@
 		</if>
 	</td>
 </tr>
-
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl b/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
index 18c99289..1ac0d48d 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
@@ -1,5 +1,5 @@
-<section class="fullform bradius">
-	<table class="formtable">
+<section>
+	<table class="full">
 		<tr>
 			<th><strong>{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</strong></th>
 		</tr>
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl b/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
index 0b8aab39..8dd09536 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
@@ -1,5 +1,5 @@
-<section class="fullform bradius">
-	<table class="formtable">
+<section>
+	<table class="full">
 		<tr>
 			<th><strong>{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</strong></th>
 		</tr>
diff --git a/templates/Sparkle/customer/traffic/traffic.tpl b/templates/Sparkle/customer/traffic/traffic.tpl
index 7204a47a..442b8470 100644
--- a/templates/Sparkle/customer/traffic/traffic.tpl
+++ b/templates/Sparkle/customer/traffic/traffic.tpl
@@ -9,7 +9,7 @@ $header
 
 	<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
 		<fieldset>
-			<table class="fullform bradius" id="datatable">
+			<table class="full hl" id="datatable">
 				<thead>
 					<tr>
 						<th>{$lng['traffic']['month']}</td>
diff --git a/templates/Sparkle/customer/traffic/traffic_details.tpl b/templates/Sparkle/customer/traffic/traffic_details.tpl
index cbffb67e..e38c7e21 100644
--- a/templates/Sparkle/customer/traffic/traffic_details.tpl
+++ b/templates/Sparkle/customer/traffic/traffic_details.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 	
-	<table class="bradius" id="datatable">
+	<table class="full hl" id="datatable">
 		<thead>
 			<tr>
 				<th>{$lng['traffic']['day']}</th>
diff --git a/templates/Sparkle/misc/form/table_section.tpl b/templates/Sparkle/misc/form/table_section.tpl
index eccd7e23..37547a79 100644
--- a/templates/Sparkle/misc/form/table_section.tpl
+++ b/templates/Sparkle/misc/form/table_section.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr class="section">
 	<th>
 		{$title}
 	</th>