diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl
index 58dc1bf3..078e837d 100644
--- a/templates/Sparkle/admin/admins/admins.tpl
+++ b/templates/Sparkle/admin/admins/admins.tpl
@@ -22,7 +22,7 @@ $header
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>
diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl
index ae51051a..d5246d74 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -31,7 +31,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 			<p style="margin-left:15px;">
 				<span style="color:#ff0000;">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span style="color:#ff0000;">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl
index 7a26f354..651f1daf 100644
--- a/templates/Sparkle/admin/admins/admins_edit.tpl
+++ b/templates/Sparkle/admin/admins/admins_edit.tpl
@@ -13,7 +13,7 @@ $header
 			</div>
 		</if>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'admins'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -38,7 +38,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 			<p style="margin-left:15px;">
 				<span style="color:#ff0000;">*</span>: {$lng['admin']['valuemandatory']}
 			</p>
diff --git a/templates/Sparkle/admin/aps/manage_instances.tpl b/templates/Sparkle/admin/aps/manage_instances.tpl
index cabd79e2..43cbbbd4 100644
--- a/templates/Sparkle/admin/aps/manage_instances.tpl
+++ b/templates/Sparkle/admin/aps/manage_instances.tpl
@@ -6,7 +6,7 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 	        	<table class="formtable">
 						<tr>
 							<td><strong>{$lng['aps']['statistics']}</strong></td>
@@ -26,7 +26,7 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['manageinstances']}</legend>
diff --git a/templates/Sparkle/admin/aps/manage_packages.tpl b/templates/Sparkle/admin/aps/manage_packages.tpl
index ca3b367c..e9cbcce7 100644
--- a/templates/Sparkle/admin/aps/manage_packages.tpl
+++ b/templates/Sparkle/admin/aps/manage_packages.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 
-	<section class="midform midformaps_2 bradiusodd">
+	<section class="midform midformaps_2 bradius">
 	
 		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 			<p style="margin-left:10px;">
@@ -53,7 +53,7 @@
 
 	</section>
 	<br />
-	<section class="midform bradiusodd">
+	<section class="midform bradius">
 		<p style="margin-left:10px;"><strong>{$lng['aps']['statistics']}</strong></p>
 		<p style="margin-left:10px;">{$Statistics}</p>
 	</section>
@@ -71,7 +71,7 @@
 	
 		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 
-			<table class="bradiusodd aps">
+			<table class="bradius aps">
 			<thead>
 				<tr>
 					<th style="width:30%;">{$lng['aps']['packagenameandversion']}</th>
diff --git a/templates/Sparkle/admin/aps/manage_packages_download.tpl b/templates/Sparkle/admin/aps/manage_packages_download.tpl
index e2eceaf7..2db11f92 100644
--- a/templates/Sparkle/admin/aps/manage_packages_download.tpl
+++ b/templates/Sparkle/admin/aps/manage_packages_download.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 
-	<section class="midform midformaps_2 bradiusodd">
+	<section class="midform midformaps_2 bradius">
 	
 		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
diff --git a/templates/Sparkle/admin/aps/upload.tpl b/templates/Sparkle/admin/aps/upload.tpl
index 7744e666..6ef5982e 100644
--- a/templates/Sparkle/admin/aps/upload.tpl
+++ b/templates/Sparkle/admin/aps/upload.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 
-	<section class="midform midformaps_1 bradiusodd">
+	<section class="midform midformaps_1 bradius">
 	
 		<form action="$filename" method="post" enctype="multipart/form-data">
 			<fieldset>
diff --git a/templates/Sparkle/admin/configfiles/choose.tpl b/templates/Sparkle/admin/configfiles/choose.tpl
index 61694481..b817b5be 100644
--- a/templates/Sparkle/admin/configfiles/choose.tpl
+++ b/templates/Sparkle/admin/configfiles/choose.tpl
@@ -8,7 +8,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<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>
diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl
index c5f242f7..671f68f3 100644
--- a/templates/Sparkle/admin/configfiles/configfiles.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles.tpl
@@ -10,7 +10,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
         	<table class="formtable">
 				{$configpage}
 				<if $restart != ''>
diff --git a/templates/Sparkle/admin/configfiles/wizard.tpl b/templates/Sparkle/admin/configfiles/wizard.tpl
index 297ad916..c0746287 100644
--- a/templates/Sparkle/admin/configfiles/wizard.tpl
+++ b/templates/Sparkle/admin/configfiles/wizard.tpl
@@ -8,7 +8,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
 			<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;Wizard</legend>
diff --git a/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl b/templates/Sparkle/admin/cronjobs/cronjob_edit.tpl
index 168d9f48..5ee7f040 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'cronjobs'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/cronjobs/cronjobs.tpl b/templates/Sparkle/admin/cronjobs/cronjobs.tpl
index 3cb1628d..61b151fd 100644
--- a/templates/Sparkle/admin/cronjobs/cronjobs.tpl
+++ b/templates/Sparkle/admin/cronjobs/cronjobs.tpl
@@ -6,7 +6,7 @@ $header
                 </header>
 
 		<section>
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['cron']['description']}</th>
diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl
index 8b1bb479..b97ce1f8 100644
--- a/templates/Sparkle/admin/customers/customers.tpl
+++ b/templates/Sparkle/admin/customers/customers.tpl
@@ -22,7 +22,7 @@ $header
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>
diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl
index 49149255..1e19c3ab 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -31,7 +31,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 			<p style="margin:10px;">
 				<span style="color:#ff0000;">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span style="color:#ff0000;">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl
index 3f34cde3..dff0fe8a 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -32,7 +32,7 @@ $header
 	</article>
 	<br />
 	<article>
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 			<p style="margin-left:15px;">
 				<span style="color:#ff0000;">*</span>: {$lng['admin']['valuemandatory']}<br />
 				<span style="color:#ff0000;">**</span>: {$lng['admin']['valuemandatorycompany']}
diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl
index bf840209..5496012b 100644
--- a/templates/Sparkle/admin/domains/domains.tpl
+++ b/templates/Sparkle/admin/domains/domains.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<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 945dbbb2..fe4c57bd 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/domains/domains_edit.tpl b/templates/Sparkle/admin/domains/domains_edit.tpl
index fde66d88..addb79ee 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/index/change_language.tpl b/templates/Sparkle/admin/index/change_language.tpl
index f3ceccc1..77169651 100644
--- a/templates/Sparkle/admin/index/change_language.tpl
+++ b/templates/Sparkle/admin/index/change_language.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl
index 57bd0780..e2dae3f9 100644
--- a/templates/Sparkle/admin/index/change_password.tpl
+++ b/templates/Sparkle/admin/index/change_password.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
diff --git a/templates/Sparkle/admin/index/change_theme.tpl b/templates/Sparkle/admin/index/change_theme.tpl
index 93903550..c0c40eec 100644
--- a/templates/Sparkle/admin/index/change_theme.tpl
+++ b/templates/Sparkle/admin/index/change_theme.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 38911525..b04666b2 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -10,7 +10,7 @@ $header
 	</div>
 	</if>
 
-	<section class="dboarditemfull bradiusodd">
+	<section class="dboarditemfull bradius">
 		<table>
 		<tr>
 			<th colspan="2">{$lng['admin']['ressourcedetails']}</th>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
index 7b57c310..ab315ba2 100644
--- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl
+++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
@@ -22,7 +22,7 @@ $header
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}&nbsp;:&nbsp;{$lng['admin']['ipsandports']['port']}&nbsp;{$arrowcode['port']}</th>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl b/templates/Sparkle/admin/ipsandports/ipsandports_add.tpl
index 8043d171..d1265003 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl b/templates/Sparkle/admin/ipsandports/ipsandports_edit.tpl
index ec1eed62..470aa236 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'ipsandports'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl
index ea580a21..44b96cb3 100644
--- a/templates/Sparkle/admin/logger/logger.tpl
+++ b/templates/Sparkle/admin/logger/logger.tpl
@@ -22,7 +22,7 @@ $header
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['logger']['date']}&nbsp;&nbsp;{$arrowcode['date']}</th>
diff --git a/templates/Sparkle/admin/message/message.tpl b/templates/Sparkle/admin/message/message.tpl
index 7ceb4c5c..b31593f9 100644
--- a/templates/Sparkle/admin/message/message.tpl
+++ b/templates/Sparkle/admin/message/message.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="midform bradiusodd">
+		<section class="midform bradius">
 
 			<if 0 < $success >
 				<div class="successcontainer bradius">
diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl
index 236c3a29..9f2311a4 100644
--- a/templates/Sparkle/admin/phpconfig/overview.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview.tpl
@@ -16,7 +16,7 @@ $header
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['admin']['phpsettings']['description']}</th>
diff --git a/templates/Sparkle/admin/phpconfig/overview_add.tpl b/templates/Sparkle/admin/phpconfig/overview_add.tpl
index f47bcd77..618c1587 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -39,7 +39,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 d445867c..5150c087 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'phpsettings'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -40,7 +40,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/settings/phpinfo.tpl b/templates/Sparkle/admin/settings/phpinfo.tpl
index 85b13a3e..56d3c183 100644
--- a/templates/Sparkle/admin/settings/phpinfo.tpl
+++ b/templates/Sparkle/admin/settings/phpinfo.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="dboarditemfull bradiusodd">
+		<section class="dboarditemfull bradius">
 			<table width="100%">
 				{$phpinfo}
 			</table>
diff --git a/templates/Sparkle/admin/settings/settings.tpl b/templates/Sparkle/admin/settings/settings.tpl
index 19ed4d1d..dfb5fcd6 100644
--- a/templates/Sparkle/admin/settings/settings.tpl
+++ b/templates/Sparkle/admin/settings/settings.tpl
@@ -7,7 +7,7 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 			<table class="formtable">
 			$fields
 			<tr>
diff --git a/templates/Sparkle/admin/settings/settings_overview.tpl b/templates/Sparkle/admin/settings/settings_overview.tpl
index 6bbf522d..8a386960 100644
--- a/templates/Sparkle/admin/settings/settings_overview.tpl
+++ b/templates/Sparkle/admin/settings/settings_overview.tpl
@@ -7,7 +7,7 @@
 			</h2>
 		</header>
 		
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
         	<table class="formtable">
 			$fields
 			<tr>
diff --git a/templates/Sparkle/admin/settings/updatecounters.tpl b/templates/Sparkle/admin/settings/updatecounters.tpl
index ee4adfb8..c9daa1b0 100644
--- a/templates/Sparkle/admin/settings/updatecounters.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
         	<table class="formtable">
 				<thead>
 				<tr>
diff --git a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
index 3e19ac3d..851f8739 100644
--- a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
@@ -3,7 +3,7 @@
 				<b><if $admin['adminid'] != $userinfo['userid']><a href="{$linker->getLink(array('section' => 'admins', 'page' => 'admins', 'action' => 'su', 'id' => $admin['adminid']))}" target="_blank">{$admin['loginname']}</a></if><if $admin['adminid'] == $userinfo['userid']>{$admin['loginname']}</if>:</b>
 			</td>
 			<td>
-				<section class="fullform bradiusodd">
+				<section class="fullform bradius">
 					<table class="formtable" border="0" style="text-align: left; width: 100%">
 						<tr>
 							<td>{$lng['admin']['customers']}:</td>
diff --git a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
index ea3f88a0..96a5f0c8 100644
--- a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
@@ -3,7 +3,7 @@
 				<b><if $customer['name'] != '' && $customer['firstname'] != ''>{$customer['name']}, {$customer['firstname']}</if><if $customer['name'] != '' && $customer['firstname'] != '' && $customer['company'] != ''> | </if><if $customer['company'] != ''>{$customer['company']}</if> (<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customer['customerid']))}" target="_blank">{$customer['loginname']}</a>):</b>
 			</td>
 			<td>
-				<section class="fullform bradiusodd">
+				<section class="fullform bradius">
 					<table class="formtable" border="0" style="text-align: left; width: 100%">
 						<tr>
 							<td>{$lng['customer']['subdomains']}:</td>
diff --git a/templates/Sparkle/admin/templates/filetemplates_add.tpl b/templates/Sparkle/admin/templates/filetemplates_add.tpl
index 9a711ff9..031ec019 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -38,7 +38,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 e74e4cae..0c82cadb 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -39,7 +39,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl
index b9e0004b..5ee6825a 100644
--- a/templates/Sparkle/admin/templates/templates.tpl
+++ b/templates/Sparkle/admin/templates/templates.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section>
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['login']['language']}</th>
@@ -41,7 +41,7 @@ $header
 		</header>
 
 		<section>
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 f2b2ed42..8a2059af 100644
--- a/templates/Sparkle/admin/templates/templates_add_1.tpl
+++ b/templates/Sparkle/admin/templates/templates_add_1.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<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>
diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl
index d24a7739..8478416c 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -39,7 +39,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 258adeb1..81704b94 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'templates'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
@@ -40,7 +40,7 @@ $header
 		
 		<section>
 			
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['panel']['variable']}</th>
diff --git a/templates/Sparkle/admin/tickets/archive.tpl b/templates/Sparkle/admin/tickets/archive.tpl
index 70e473d1..8b8d746b 100644
--- a/templates/Sparkle/admin/tickets/archive.tpl
+++ b/templates/Sparkle/admin/tickets/archive.tpl
@@ -9,7 +9,7 @@ $header
 
 		<section>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<thead>
 				<tr>
 					<th>{$lng['ticket']['archivedtime']}</th>
@@ -37,7 +37,7 @@ $header
 			</h3>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 
diff --git a/templates/Sparkle/admin/tickets/archivesearch.tpl b/templates/Sparkle/admin/tickets/archivesearch.tpl
index dcdeb92d..5d07529e 100644
--- a/templates/Sparkle/admin/tickets/archivesearch.tpl
+++ b/templates/Sparkle/admin/tickets/archivesearch.tpl
@@ -6,7 +6,7 @@ $header
 		<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 bradiusodd">
+		<table cellpadding="5" cellspacing="0" border="0" align="center" class="fullform bradius">
       		<if 0 < $tickets_count >
 				<tr>
 					<th class="field_display_border_left">{$lng['ticket']['archivedtime']}</th>
diff --git a/templates/Sparkle/admin/tickets/categories.tpl b/templates/Sparkle/admin/tickets/categories.tpl
index 471632d8..5c52a83a 100644
--- a/templates/Sparkle/admin/tickets/categories.tpl
+++ b/templates/Sparkle/admin/tickets/categories.tpl
@@ -22,7 +22,7 @@ $header
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 cb129a3e..5ae28a6d 100644
--- a/templates/Sparkle/admin/tickets/tickets.tpl
+++ b/templates/Sparkle/admin/tickets/tickets.tpl
@@ -22,7 +22,7 @@ $header
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 fb8e36af..375efbcc 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/tickets/tickets_new.tpl b/templates/Sparkle/admin/tickets/tickets_new.tpl
index 153989c3..4751f5aa 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/tickets/tickets_newcategory.tpl b/templates/Sparkle/admin/tickets/tickets_newcategory.tpl
index 902b2f6f..86136ba8 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/tickets/tickets_reply.tpl b/templates/Sparkle/admin/tickets/tickets_reply.tpl
index d0d1d772..414a80fd 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl b/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
index b5417890..c1ba3e88 100644
--- a/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_tickets_list.tpl
@@ -1,4 +1,4 @@
-<section class="fullform bradiusodd">
+<section class="fullform bradius">
 	<table class="formtable">
 		<tr>
 			<th>{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</th>
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl b/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
index a07980db..28ff5d89 100644
--- a/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_tickets_main.tpl
@@ -1,4 +1,4 @@
-<section class="fullform bradiusodd">
+<section class="fullform bradius">
 	<table class="formtable">
 		<tr>
 			<th>{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</th>
diff --git a/templates/Sparkle/admin/traffic/index_table.tpl b/templates/Sparkle/admin/traffic/index_table.tpl
index 7471cfd6..2da910e2 100644
--- a/templates/Sparkle/admin/traffic/index_table.tpl
+++ b/templates/Sparkle/admin/traffic/index_table.tpl
@@ -1,5 +1,5 @@
 	<h3>{$lng['traffic']['trafficoverview']}&nbsp;{$overview['type']}&nbsp;{$overview['year']}</h3>
-	<table class="bradiusodd" id="stats{$overview['year']}">
+	<table class="bradius" id="stats{$overview['year']}">
 		<thead>
 			<tr>
 				<th>{$overview['type']}</th>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 486f2b4c..c7fb75b6 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -91,16 +91,9 @@ td a {
 	text-decoration:none;
 }
 
-.bradius,.ui-corner-all {
-	/*background: none repeat scroll 0 0 #FFFFFF;*/
+.bradius {
 	border-radius: 5px 5px 5px 5px;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
-	/*padding: 40px;*/
-}
-
-.bradiusodd {
-	border-radius: 5px 5px 5px 5px !important;
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
 }
 
 .topheader {
@@ -113,7 +106,7 @@ td a {
 	position:fixed;
 	z-index: 100;
 }
-.topheaderinfo {
+.topheader_navigation {
 	float: right;
 	margin: 35px 40px 0 0;
 }
@@ -165,6 +158,7 @@ nav div:first-child {
 	display: none;
 }
 
+/* FOOTER */
 footer {
 	clear:both;
 	text-align:center;
@@ -175,32 +169,22 @@ footer {
 }
 
 footer a,footer a:active,footer a:visited {
-	text-decoration:none;
 	color:rgb(136, 136, 136);
 }
 
-footer a:hover {
-	text-decoration:underline;
-}
-
-.login {
+.login, .install {
 	background-color:#fff;
 	margin-top:9%;
 	margin-left:auto;
 	margin-right:auto;
 	margin-bottom:12px;
-	width:600px;
-	/*border:1px solid #999;*/
 }
 
+.login {
+	width: 600px;
+}
 .install {
-	background-color:#fff;
-	margin-top:20px;
-	margin-left:auto;
-	margin-right:auto;
-	margin-bottom:12px;
-	width:800px;
-	border:1px solid #999;
+	width: 800px;
 }
 
 .fullform,.midform,.tinyform {
@@ -287,7 +271,6 @@ footer a:hover {
 .fullform label {
 	float:left;
 	width:26em;
-/*	margin-right: 1em; */
 	margin-top:6px;
 	text-align:right;
 }
@@ -377,7 +360,7 @@ p.submit {
  * error message display
  */
 .errorcontainer {
-	background:url(../img/icons/bad_big.png) 10px center no-repeat #ffedef;
+	background:url(../img/icons/error_big.png) 10px center no-repeat #ffedef;
 	border:1px solid #ffc2ca;
 	padding:10px 10px 10px 68px!important;
 	margin: 10px 0 10px 0 !important;
@@ -493,7 +476,9 @@ a:hover {
 	margin:0;
 	padding:0 0 0 20px;
 }
-
+.menuelement h4 a {
+	color: #000;
+}
 .menuelement ul {
 	list-style:none;
 	margin:3px 0 0px;
@@ -509,32 +494,20 @@ a:hover {
  * main container
  */
 .main {
-/* same value as nav-width */
 	margin-left:240px;
 	margin-right:10px;
 	margin-top:105px;
 	margin-bottom:0;
 	background-color:#fff;
 	padding: 30px 30px 30px 30px;
-	/*border:1px solid #666;*/
 	min-height:400px;
-/*	background:-webkit-gradient(linear,left top,right top,color-stop(0.16,#dcdcdc),color-stop(1,#fff));
-	background:-moz-linear-gradient(left center,#dcdcdc 16%,#fff 100%);
-/* For Internet Explorer 5.5 - 7
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#dcdcdc,endColorStr=#ffffff,GradientType=1);
-/* For Internet Explorer 8
-	-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#dcdcdc,endColorstr=#ffffff,GradientType=1)";*/
 }
 
 .noborder {
 	width:100%;
 	border-spacing:0;
-	background-color:#f8f8f8;
 	border-collapse:separate;
-	border-top:0;
-	border-left:0;
-	border-right:0;
-	border-bottom:1px solid #666;
+	border: 0;
 }
 
 .noborder td {
@@ -606,10 +579,6 @@ table tbody tr:last-child td {
 	min-height: 20px;
 }
 
-.formlabeltd {
-
-}
-
 .formtable label {
 	float:none;
 	display:block;
@@ -643,7 +612,6 @@ table tfoot td {
 	height:25px;
 	border-top: 1px solid #d1d5d8;
 	background-color: #f2f8fa;
-	/*border-right:1px solid #666;*/
 }
 
 .tfootleft {
@@ -735,9 +703,7 @@ select {
 	background:#fff;
 	padding:4px;
 	border:1px solid #d9d9d9;
-	height: 26px;
 	margin-bottom: 5px;
-	border-radius: 0;
 }
 
 .customer_add {
@@ -926,11 +892,6 @@ label.nobr {
 	margin: 0 10px 0 0;
 }
 
-caption {
-	font-weight:700;
-	margin-bottom:.2em;
-}
-
 .scrollup {
     width:40px;
     height:40px;
@@ -941,4 +902,4 @@ caption {
     display:none;
     text-indent:-9999px;
     background: url(../img/top.png) no-repeat;
-}
\ No newline at end of file
+}
diff --git a/templates/Sparkle/assets/img/icons/error.png b/templates/Sparkle/assets/img/icons/error.png
index b369ba64..1f010b77 100644
Binary files a/templates/Sparkle/assets/img/icons/error.png and b/templates/Sparkle/assets/img/icons/error.png differ
diff --git a/templates/Sparkle/assets/img/icons/error_big.png b/templates/Sparkle/assets/img/icons/error_big.png
index bc19e7af..67a30c8d 100644
Binary files a/templates/Sparkle/assets/img/icons/error_big.png and b/templates/Sparkle/assets/img/icons/error_big.png differ
diff --git a/templates/Sparkle/assets/img/icons/ok.png b/templates/Sparkle/assets/img/icons/ok_big.png
similarity index 100%
rename from templates/Sparkle/assets/img/icons/ok.png
rename to templates/Sparkle/assets/img/icons/ok_big.png
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
index 53ab32ff..5301336c 100644
--- a/templates/Sparkle/assets/js/main.js
+++ b/templates/Sparkle/assets/js/main.js
@@ -55,8 +55,8 @@ $(document).ready(function() {
 		$("#loginname").focus();
 	}
 
-	if ($("table.bradiusodd").length != 0) {
-		$("table.bradiusodd tbody tr").hover(function() {
+	if ($("table.bradius").length != 0) {
+		$("table.bradius tbody tr").hover(function() {
 			$(this).css("background-color", "#f5f5f5");
 		}, function() {
 			$(this).css("background-color", "#fff");
diff --git a/templates/Sparkle/customer/aps/installer.tpl b/templates/Sparkle/customer/aps/installer.tpl
index 8e2bfda2..ef936318 100644
--- a/templates/Sparkle/customer/aps/installer.tpl
+++ b/templates/Sparkle/customer/aps/installer.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 	
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/aps/package.tpl b/templates/Sparkle/customer/aps/package.tpl
index b959e67a..18f6204e 100644
--- a/templates/Sparkle/customer/aps/package.tpl
+++ b/templates/Sparkle/customer/aps/package.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 	
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;</legend>
diff --git a/templates/Sparkle/customer/aps/package_status.tpl b/templates/Sparkle/customer/aps/package_status.tpl
index d566b0d3..35982810 100644
--- a/templates/Sparkle/customer/aps/package_status.tpl
+++ b/templates/Sparkle/customer/aps/package_status.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 	
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 				<fieldset>
 					<legend>Froxlor&nbsp;-&nbsp;</legend>
diff --git a/templates/Sparkle/customer/aps/search.tpl b/templates/Sparkle/customer/aps/search.tpl
index d24ddc2b..97ec712a 100644
--- a/templates/Sparkle/customer/aps/search.tpl
+++ b/templates/Sparkle/customer/aps/search.tpl
@@ -6,7 +6,7 @@
 		</h2>
 	</header>
 	
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/autoresponder/autoresponder.tpl b/templates/Sparkle/customer/autoresponder/autoresponder.tpl
index 7801ea11..f3c362e2 100644
--- a/templates/Sparkle/customer/autoresponder/autoresponder.tpl
+++ b/templates/Sparkle/customer/autoresponder/autoresponder.tpl
@@ -16,7 +16,7 @@
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<thead>
 					<tr>
 						<th>{$lng['emails']['emailaddress']}</th>
diff --git a/templates/Sparkle/customer/autoresponder/autoresponder_add.tpl b/templates/Sparkle/customer/autoresponder/autoresponder_add.tpl
index 299c6455..2ebe4631 100644
--- a/templates/Sparkle/customer/autoresponder/autoresponder_add.tpl
+++ b/templates/Sparkle/customer/autoresponder/autoresponder_add.tpl
@@ -7,7 +7,7 @@ $header
 				</h2>
 		</header>
   
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'autoresponder'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/autoresponder/autoresponder_edit.tpl b/templates/Sparkle/customer/autoresponder/autoresponder_edit.tpl
index 56f115fd..d1b3c160 100644
--- a/templates/Sparkle/customer/autoresponder/autoresponder_edit.tpl
+++ b/templates/Sparkle/customer/autoresponder/autoresponder_edit.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
   
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'autoresponder'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/domains/domain_ssleditor.tpl b/templates/Sparkle/customer/domains/domain_ssleditor.tpl
index ebb6ce9d..45fee2b8 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 bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl
index 86ad5090..0dba51ba 100644
--- a/templates/Sparkle/customer/domains/domainlist.tpl
+++ b/templates/Sparkle/customer/domains/domainlist.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<thead>
 					<tr>
 						<th>{$lng['domains']['domainname']}&nbsp;&nbsp;{$arrowcode['d.domain']}</th>
diff --git a/templates/Sparkle/customer/domains/domains_add.tpl b/templates/Sparkle/customer/domains/domains_add.tpl
index ded0d8df..5fddbe1b 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 bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/domains/domains_edit.tpl b/templates/Sparkle/customer/domains/domains_edit.tpl
index ddf8fa5e..0881a738 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 bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/email/account_add.tpl b/templates/Sparkle/customer/email/account_add.tpl
index ee58ddb1..355cb15d 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/email/account_changepw.tpl b/templates/Sparkle/customer/email/account_changepw.tpl
index 3749003b..6980d590 100644
--- a/templates/Sparkle/customer/email/account_changepw.tpl
+++ b/templates/Sparkle/customer/email/account_changepw.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/email/account_changequota.tpl b/templates/Sparkle/customer/email/account_changequota.tpl
index 47ca9d02..ee18597e 100644
--- a/templates/Sparkle/customer/email/account_changequota.tpl
+++ b/templates/Sparkle/customer/email/account_changequota.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl
index 6cad62ae..be8c7b34 100644
--- a/templates/Sparkle/customer/email/emails.tpl
+++ b/templates/Sparkle/customer/email/emails.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<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 13bea014..645b830d 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/email/emails_edit.tpl b/templates/Sparkle/customer/email/emails_edit.tpl
index d5637257..1fbdbc39 100644
--- a/templates/Sparkle/customer/email/emails_edit.tpl
+++ b/templates/Sparkle/customer/email/emails_edit.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
diff --git a/templates/Sparkle/customer/email/forwarder_add.tpl b/templates/Sparkle/customer/email/forwarder_add.tpl
index 2a15eb9f..50281450 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 bradiusodd">
+	<section class="fullform bradius">
 	
 		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
 			<fieldset>
diff --git a/templates/Sparkle/customer/extras/backup.tpl b/templates/Sparkle/customer/extras/backup.tpl
index 23e06b84..4a487e6c 100644
--- a/templates/Sparkle/customer/extras/backup.tpl
+++ b/templates/Sparkle/customer/extras/backup.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="fullform bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl
index 8c6ff3e0..b33f4d38 100644
--- a/templates/Sparkle/customer/extras/htaccess.tpl
+++ b/templates/Sparkle/customer/extras/htaccess.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<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 3b239722..c43b8a9b 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/extras/htaccess_edit.tpl b/templates/Sparkle/customer/extras/htaccess_edit.tpl
index 3f9d998c..7bed8e6c 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl
index 0509f398..92e70e3c 100644
--- a/templates/Sparkle/customer/extras/htpasswds.tpl
+++ b/templates/Sparkle/customer/extras/htpasswds.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<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 8409e0a0..f717e625 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/extras/htpasswds_edit.tpl b/templates/Sparkle/customer/extras/htpasswds_edit.tpl
index 0dcea55c..3c9c487b 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'extras'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl
index 25cd4fd2..c972e554 100644
--- a/templates/Sparkle/customer/ftp/accounts.tpl
+++ b/templates/Sparkle/customer/ftp/accounts.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<thead>
 					<tr>
 						<th>{$lng['login']['username']}&nbsp;&nbsp;{$arrowcode['username']}</th>
diff --git a/templates/Sparkle/customer/ftp/accounts_add.tpl b/templates/Sparkle/customer/ftp/accounts_add.tpl
index 72771398..1c764d80 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'ftp'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/ftp/accounts_edit.tpl b/templates/Sparkle/customer/ftp/accounts_edit.tpl
index 711d87ca..767f396b 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'ftp'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/index/change_language.tpl b/templates/Sparkle/customer/index/change_language.tpl
index 1285f515..32c43f20 100644
--- a/templates/Sparkle/customer/index/change_language.tpl
+++ b/templates/Sparkle/customer/index/change_language.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changelanguage']}</legend>
diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl
index 5afab9c8..3598b701 100644
--- a/templates/Sparkle/customer/index/change_password.tpl
+++ b/templates/Sparkle/customer/index/change_password.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp{$lng['menue']['main']['changepassword']}</legend>
diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl
index b1ecd985..e2621fbf 100644
--- a/templates/Sparkle/customer/index/change_theme.tpl
+++ b/templates/Sparkle/customer/index/change_theme.tpl
@@ -7,7 +7,7 @@ $header
 			</h2>
 		</header>
 
-		<section class="tinyform bradiusodd">
+		<section class="tinyform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changetheme']}</legend>
diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl
index 44dcf247..b435303e 100644
--- a/templates/Sparkle/customer/index/index.tpl
+++ b/templates/Sparkle/customer/index/index.tpl
@@ -10,7 +10,7 @@ $header
 	</div>
 	</if>
 
-	<section class="dboarditem bradiusodd">
+	<section class="dboarditem bradius">
 	<table>
 	<tr>
 		<th colspan="2">{$lng['index']['accountdetails']}</th>
@@ -83,7 +83,7 @@ $header
 		</table>
 	</section>
 
-    <section class="dboarditem bradiusodd">
+    <section class="dboarditem bradius">
         <table>
        	<tr>
 		<th colspan="2">{$lng['index']['customerdetails']}</th>
diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl
index f49794fe..d455f809 100644
--- a/templates/Sparkle/customer/mysql/mysqls.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls.tpl
@@ -22,7 +22,7 @@
 				</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 				<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 f12c6a6b..48128684 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/mysql/mysqls_edit.tpl b/templates/Sparkle/customer/mysql/mysqls_edit.tpl
index 3d04be03..775d7ef2 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'mysql'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/tickets/tickets.tpl b/templates/Sparkle/customer/tickets/tickets.tpl
index 8a236895..77f1ca16 100644
--- a/templates/Sparkle/customer/tickets/tickets.tpl
+++ b/templates/Sparkle/customer/tickets/tickets.tpl
@@ -35,7 +35,7 @@ $header
 			</div>
 			</if>
 
-			<table class="bradiusodd">
+			<table class="bradius">
 			<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 1d149495..8bcb33d2 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 bradiusodd">
+		<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/tickets/tickets_reply.tpl b/templates/Sparkle/customer/tickets/tickets_reply.tpl
index 46d15493..15250456 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 bradiusodd">
+		<section class="fullform bradius">
 			
 			<form action="{$linker->getLink(array('section' => 'tickets'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl b/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
index 94185be0..18c99289 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets_list.tpl
@@ -1,4 +1,4 @@
-<section class="fullform bradiusodd">
+<section class="fullform bradius">
 	<table class="formtable">
 		<tr>
 			<th><strong>{$lastchange}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}</strong></th>
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl b/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
index 871f3c24..0b8aab39 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets_main.tpl
@@ -1,4 +1,4 @@
-<section class="fullform bradiusodd">
+<section class="fullform bradius">
 	<table class="formtable">
 		<tr>
 			<th><strong>{$dt}&nbsp;{$lng['ticket']['by']}&nbsp;{$by}&nbsp;({$status})</strong></th>
diff --git a/templates/Sparkle/customer/traffic/traffic.tpl b/templates/Sparkle/customer/traffic/traffic.tpl
index c92a258a..f7988639 100644
--- a/templates/Sparkle/customer/traffic/traffic.tpl
+++ b/templates/Sparkle/customer/traffic/traffic.tpl
@@ -11,7 +11,7 @@ $header
 
 			<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<table class="fullform bradiusodd">
+					<table class="fullform bradius">
 						<tr>
 							<th>{$lng['traffic']['sumftp']} GB</th>
 							<th>{$lng['traffic']['sumhttp']} GB</th>
@@ -23,7 +23,7 @@ $header
 							<td><div style="color:#800000;">{$traffic_complete['mail']}</div></td>
 						</tr>
 					</table><br />
-					<table class="fullform bradiusodd" id="datatable">
+					<table class="fullform bradius" id="datatable">
 						<tr id="datalegend">
 							<th>{$lng['traffic']['month']}</td>
 							<th>{$lng['traffic']['ftp']}</th>
diff --git a/templates/Sparkle/customer/traffic/traffic_details.tpl b/templates/Sparkle/customer/traffic/traffic_details.tpl
index e4e92eeb..3eaf4d9e 100644
--- a/templates/Sparkle/customer/traffic/traffic_details.tpl
+++ b/templates/Sparkle/customer/traffic/traffic_details.tpl
@@ -7,7 +7,7 @@ $header
 		</h2>
 	</header>
 	
-	<section class="fullform bradiusodd">
+	<section class="fullform bradius">
 
 			<form action="{$linker->getLink(array('section' => 'traffic'))}" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
diff --git a/templates/Sparkle/footer.tpl b/templates/Sparkle/footer.tpl
index 2be72311..b42f5c28 100644
--- a/templates/Sparkle/footer.tpl
+++ b/templates/Sparkle/footer.tpl
@@ -1,4 +1,6 @@
-</div>
+<if isset($userinfo['loginname'])>
+	</div>
+</if>
 <footer>
 	<span>Froxlor 
 		<if ($settings['admin']['show_version_login'] == '1' && $filename == 'index.php') || ($filename != 'index.php' && $settings['admin']['show_version_footer'] == '1')>
diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl
index 90c8ea5a..eb47ee8f 100644
--- a/templates/Sparkle/header.tpl
+++ b/templates/Sparkle/header.tpl
@@ -42,39 +42,26 @@
 		<h1>Froxlor Server Management Panel</h1>
 	</hgroup>
 	<img src="{$header_logo}" alt="Froxlor Server Management Panel" />
-	<div class="topheaderinfo">
+	<div class="topheader_navigation">
 		<ul class="topheadernav">
-		<if $userinfo['adminsession'] == 1 >
-			<li><a href="admin_index.php?s={$userinfo['hash']}">{$lng['admin']['overview']}</a></li>
+			<li><a href="{$linker->getLink(array('section' => 'index'))}">{$lng['admin']['overview']}</a></li>
 			<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>
-					<if $settings['panel']['allow_theme_change_admin'] == '1'>
-						<li><a href="admin_index.php?page=change_theme&s={$userinfo['hash']}">{$lng['panel']['theme']}</a></li>
+					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_password'))}">{$lng['login']['password']}</a></li>
+					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_language'))}">{$lng['login']['language']}</a></li>
+					<if $settings['panel']['allow_theme_change_admin'] == '1' && $userinfo['adminsession'] == 1>
+						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
+					</if>
+					<if $settings['panel']['allow_theme_change_customer'] == '1' && $userinfo['adminsession'] == 0>
+						<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
 					</if>
 				</ul>
 			</li>
-			<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="#">{$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>
-					<if $settings['panel']['allow_theme_change_customer'] == '1'>
-						<li><a href="customer_index.php?page=change_theme&s={$userinfo['hash']}">{$lng['panel']['theme']}</a></li>
-					</if>
-				</ul>
-			</li>
-			<li><a href="customer_index.php?action=logout&s={$userinfo['hash']}">{$lng['login']['logout']} {$userinfo['firstname']} {$userinfo['name']} ({$userinfo['loginname']})</a></li>
-		</if>
+			<li><a href="{$linker->getLink(array('section' => 'index', 'action' => 'logout'))}">{$lng['login']['logout']} {$userinfo['loginname']}</a></li>
 		</ul>
 	</div>
 </header>
 
 	<nav>$navigation</nav>
-	<div class="main bradiusodd">
-<else>
-	<div class="loginpage">
+	<div class="main bradius">
 </if>
diff --git a/templates/Sparkle/index.tpl b/templates/Sparkle/index.tpl
index 18a81088..88d3fac4 100644
--- a/templates/Sparkle/index.tpl
+++ b/templates/Sparkle/index.tpl
@@ -37,7 +37,7 @@
 {/if}
 
 {if $loggedin}
-	<div class="main bradiusodd">
+	<div class="main bradius">
 {else}
 	<div class="loginpage">
 {/if}
diff --git a/templates/Sparkle/navigation_element.tpl b/templates/Sparkle/navigation_element.tpl
index a3f5fd25..d9c23077 100644
--- a/templates/Sparkle/navigation_element.tpl
+++ b/templates/Sparkle/navigation_element.tpl
@@ -1,4 +1,4 @@
-<div class="menuelement bradiusodd">
+<div class="menuelement bradius">
 	<h4>{$completeLink}</h4>
 	<ul>
 		{$navigation_links}
diff --git a/templates/Sparkle/webftp/webftp_main.tpl b/templates/Sparkle/webftp/webftp_main.tpl
index 36206636..dbd36c36 100644
--- a/templates/Sparkle/webftp/webftp_main.tpl
+++ b/templates/Sparkle/webftp/webftp_main.tpl
@@ -3,7 +3,7 @@
 			<input type="hidden" name="action" value="multiple" />
 			<input type="hidden" name="currentDir" value="{$currentDir}" />
 			<input type="hidden" name="mode" value="{$mode}" />
-			<table class="bradiusodd">
+			<table class="bradius">
 				<thead>
 					<tr>
 						<th>&nbsp;</th>
diff --git a/templates/Sparkle/webftp/webftp_main_additional.tpl b/templates/Sparkle/webftp/webftp_main_additional.tpl
index 9374756c..3a247f7f 100644
--- a/templates/Sparkle/webftp/webftp_main_additional.tpl
+++ b/templates/Sparkle/webftp/webftp_main_additional.tpl
@@ -1,5 +1,5 @@
 	<article>
-		<section class="dboarditem bradiusodd">
+		<section class="dboarditem bradius">
 			<h2>{t}Basic operations{/t}</h2>
 			<table>
 				<tr>
@@ -36,7 +36,7 @@
 				</tr>
 			</table>
 		</section>
-		<section class="dboarditem bradiusodd">
+		<section class="dboarditem bradius">
 			<h2>{t}Upload files{/t}</h2>
 			<form name="putForm" enctype="multipart/form-data" method="POST" action="webftp.php">
 				<input type="hidden" name="action" value="put" />
@@ -77,4 +77,4 @@
 			</form>
 		</section>
 		<br />
-		<section class="dboarditemfull bradiusodd">
+		<section class="dboarditemfull bradius">