diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt
index c5f78a2cf..79995cc78 100644
--- a/src/nhttpd/web/Y_Blocks.txt
+++ b/src/nhttpd/web/Y_Blocks.txt
@@ -384,7 +384,7 @@ start-block~frame_main
 {=include-block:Y_Blocks.txt;frame_head=}
 <title>yWeb</title>
 </head>
-	<frameset rows="60,*" frameborder="0" framespacing="0">
+	<frameset rows="70,*" frameborder="0" framespacing="0">
 	<frame name="prim_menu" src="Y_Menue.yhtm" scrolling="no"  marginwidth="0" marginheight="0" frameborder="0" noresize="noresize" />
 	<frame name="base" src="Y_Dyn_Pages.yhtm?page=frame_boxcontrol"  marginwidth="0" marginheight="0" frameborder="0" style="height:100%"; />
 </frameset>
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css
index df5072da4..ce40619fa 100644
--- a/src/nhttpd/web/Y_Main.css
+++ b/src/nhttpd/web/Y_Main.css
@@ -1,6 +1,6 @@
 body {
 	font-family: Verdana, Geneva, Arial, 'Lucida Grande',Tahoma, Helvetica, sans-serif;
-	background-color: White;
+	background-color: #ffffff;
 	margin: 0;
 	padding:0;
 	font-size:10pt;
@@ -13,18 +13,17 @@ button,input,select,form,td {
 	color:#555555;
 }
 /* buttons */
-/*button{margin:1px}*/
 a img:hover {
 	position:relative;
 	left:1px;
 	top:1px;
 }
 button[ytype]{
-	background-position:1px;
+	background-position: 5px;
 	background-attachment: scroll;
 	background-color: transparent;
 	background-repeat: no-repeat;
-	padding-left: 20px;
+	padding-left: 25px;
 	padding-right: 5px;
 	vertical-align: middle;
 	text-align:left;
@@ -48,7 +47,10 @@ button[ytype="delete"]{background-image:url(/images/remove.png);}
 button[ytype="edit"]{background-image:url(/images/modify.png);}
 button[ytype="flash"]{background-image:url(/images/flash.png);}
 
-button[ytype="no"]{height:21px;padding-left:1px}
+button[ytype="no"] {
+	height: 21px;
+	padding-left: 5px
+}
 
 /*TODO: input file*/
 button,input[type="button"],input[type="submit"]/*,input[type="file"],input[type="file"] > input[type="button"],input[type="file"] > input[type="text"]*/ {
@@ -108,56 +110,42 @@ tr {
 }
 /* primary Navigation */
 .y_menu_prim_box {
-	margin: 0;
-/*	padding:0;*/
-	width: 100%;
-	background: url(/images/body-trans-r.gif) no-repeat bottom right;
-	font-size: 100%;
+	margin: 5px;
+	font-size: 100.01%;
+	border: 1px solid #a0a0a0;
+	border-radius: 5px;
 }
 .y_menu_prim_box_head {
-	background: url(/images/head-trans-r.gif) no-repeat top right;
 	margin: 0;
 	padding: 0;
 	text-align: center;
+	background: #ffffff;
+	border-radius: 4px 4px 0 0;
 }
 .y_menu_prim_box_head_h2 {
-	background: url(/images/head-trans-l.gif) no-repeat top left;
 	margin: 0;
 	padding: 5px 0px 5px;
 	color: white;
-/*	font-size: 0;*/
-/*	line-height: 0.5em;*/
 }
 .y_menu_prim_box_body {
-	background: url(/images/body-trans-l.gif) no-repeat bottom left;
-/*	margin: 0;*/
-	padding-bottom: 8px;
-	padding-left: 20px;
-	padding-right: 20px;
+	padding: 0 20px 5px;
+	background-color: #ffffff;
+	border-radius: 0 0 4px 4px;
 }
 .y_menu_item {
 	margin: 0;
-/*	display: block;
-	background-repeat: no-repeat;*/
 }
 .y_menu_prim {
 	margin: 0;
 	padding: 0;
-/*	background-color: transparent;
-	white-space: nowrap;*/
 	list-style: none;
 	height: auto;
-/*	line-height: normal;*/
 }
 .y_menu_prim li {
 	display: inline;
 	margin: 0;
-/*	font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
-	background-repeat: no-repeat;
-	background-position: 0 1px;
-*/	text-align:center;
+	text-align:center;
 	font-weight: normal;
-/*	height: auto;*/
 	padding: 0em 0.3em;
 }
 .y_menu_prim_item {
@@ -180,38 +168,36 @@ tr {
 }
 /* secondary Navigation */
 .y_menu_sec_box {
-	margin: 0;
+	margin: 0 5px 5px;
 	padding: 0;
-	width: 100%;
-	background: url(/images/body-trans-r.gif) no-repeat bottom right;
-	font-size: 100%;
+	font-size: 100.01%;
+	border: 1px solid #a0a0a0;
+	border-radius: 5px;
 }
 .y_menu_sec_box_head {
-	background: url(/images/head-orange-r.gif) no-repeat top right;
 	margin: 0;
 	padding: 0;
+	background: #ff6600;
+	border-radius: 4px 4px 0 0;
 }
 .y_menu_sec_box_head h2 {
 	margin: 0;
-	padding: 10px 30px 3px 25px;
-	background: url(/images/head-orange-l.gif) no-repeat top left;
+	padding: 5px 5px 5px 10px;
 	font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
 	color: white;
 	font-weight: bold;
-	font-size: 12pt;
-/*	line-height: 1.5em;*/
+	font-size: 1.2em;
 	text-align: left;
 }
 .y_menu_sec_box_body {
-	background: url(/images/body-trans-l.gif) no-repeat bottom left;
 	margin: 0;
-/*	padding:0;*/
-	padding: 5px 5px 20px 5px;
-
+	padding: 5px 0 10px;
+	background-color: #ffffff;
+	border-radius: 0 0 4px 4px;
 }
 .y_menu_sec {
-    display: block;
-    background-repeat: no-repeat;
+	display: block;
+	background-repeat: no-repeat;
 	margin: 0px;
 
 }
@@ -263,31 +249,33 @@ tr {
 
 /*work*/
 .work_box {
-	margin: 0;
-	background: url(/images/body-trans-r.gif) no-repeat bottom right;
+	margin: 0 5px 5px 0;
+	padding: 0;
 	font-size: 100.01%;
+	border: 1px solid #a0a0a0;
+	border-radius: 5px;
 }
 .work_box_head {
-	background: url(/images/head-blue-r.gif) no-repeat top right;
 	margin: 0;
 	padding: 0;
 	text-align: center;
+	background-color: #2188e0;
+	border-radius: 4px 4px 0 0;
 }
 .work_box_head h2,.work_box_head_h2 {
-	background: url(/images/head-blue-l.gif) no-repeat top left;
 	margin: 0;
-	padding: 10px 30px 3px 30px;
+	padding: 5px 20px;
 	font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
 	color: white;
 	font-weight: bold;
-	font-size: 12pt;
-/*	line-height: 1.5em;*/
+	font-size: 1.2em;
 	text-align: left;
 }
 .work_box_body {
-	background: url(/images/body-trans-l.gif) no-repeat bottom left;
 	margin: 0;
 	padding: 5px 30px 10px 30px;
+	background-color: #ffffff;
+	border-radius: 0 0 4px 4px;
 }
 .work_box_help {
 	float:right;
@@ -340,47 +328,45 @@ tr {
 /*wait box*/
 .y_wait_box {
 	margin: 0;
-	background: url(/images/body-trans-r.gif) no-repeat bottom right;
 	font-size: 100%;
 	position : absolute;
 	left : 100px;
 	top : 100px;
 	visibility : hidden;
 	z-index : 500;
+	border: 1px solid #a0a0a0;
+	border-radius: 5px;
 }
 .y_wait_box_visible {
 	margin: 0;
-	background: url(/images/body-trans-r.gif) no-repeat bottom right;
 	font-size: 100%;
 	position : absolute;
 	left : 100px;
 	top : 100px;
 	visibility : visible;
 	z-index : 500;
+	border: 1px solid #a0a0a0;
+	border-radius: 5px;
 }
 .y_wait_box_head {
-	background: url(/images/head-orange-r.gif) no-repeat top right;
 	margin: 0;
 	padding: 0;
+	background: #ff6600;
+	border-radius: 4px 4px 0 0;
 }
 .y_wait_box_head h2 {
-	background: url(/images/head-orange-l.gif) no-repeat top left;
 	margin: 0;
-	padding: 12px 30px 3px 30px;
+	padding: 5px 20px;
 	color: white;
 	font-weight: bold;
 	font-size: 1.2em;
-	line-height: 1.5em;
 	text-align: center;
 }
 .y_wait_box_body {
-	background: url(/images/body-trans-l.gif) no-repeat bottom left;
 	margin: 0;
-	padding-top: 5px;
-	padding-left: 16px;
-	padding-bottom: 20px;
-	padding-right: 16px;
-
+	padding: 5px 15px 20px;
+	background-color: #ffffff;
+	border-radius: 0 0 4px 4px;
 }
 .y_wait_box_main {
 	color: #666666;
@@ -491,9 +477,10 @@ tr {
 .y_text_boxcontrol_table {
 	width:114px;
 	height: 22px;
-	background : url('/images/audiobar.gif') no-repeat 1px 0px;
-	padding : 1px;
-	border : #FF8e42 solid 1px;
+	background: url('/images/audiobar.gif') no-repeat 1px 0px;
+	padding: 1px;
+	margin-top: 10px;
+	border: #FF8e42 solid 1px;
 }
 .y_epg_info {
 	border: 1px solid #CCCCCC;
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index 239aa3a89..2769674bf 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -13,7 +13,7 @@ function init(){
 				'href': e.get('file')
 			}).update("-"+e.get('menuitem'))
 		);
-		$('secmenu_general').insert({'bottom':el}); 
+		$('secmenu_general').insert({'bottom':el});
 	});
 	var menu=ext.select_menu('settings_neutrino');
 	menu.each(function(e){
@@ -23,7 +23,7 @@ function init(){
 				'href': e.get('file')
 			}).update("-"+e.get('menuitem'))
 		);
-		$('secmenu_neutrino').insert({'bottom':el}); 
+		$('secmenu_neutrino').insert({'bottom':el});
 	});
 	var menu=ext.select_menu('settings_plugins');
 	menu.each(function(e){
@@ -33,7 +33,7 @@ function init(){
 				'href': e.get('file')
 			}).update("-"+e.get('menuitem'))
 		);
-		$('secmenu_plugins').insert({'bottom':el}); 
+		$('secmenu_plugins').insert({'bottom':el});
 	});
 }
 </script>
diff --git a/src/nhttpd/web/Y_Settings_Timer.yhtm b/src/nhttpd/web/Y_Settings_Timer.yhtm
index 1c82b4a9f..bd9a69344 100644
--- a/src/nhttpd/web/Y_Settings_Timer.yhtm
+++ b/src/nhttpd/web/Y_Settings_Timer.yhtm
@@ -29,19 +29,19 @@ function do_submit() {
 			</tr>
 			<tr>
 				<td>{=L:set.timer.password=}</td>
-				<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/><br/><br/></td>
+				<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/></td>
 			</tr>
 			<tr>
 				<td colspan="2" class="y_form_header">klack.de (V2)</td>
 			</tr>
 			<tr>
 				<td>{=L:set.timer.klack.url=}</td>
-				<td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}"/><br/>
-				{=L:set.timer.klack.url_desc=}</br></td>
+				<td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}"/>
+				<br/>{=L:set.timer.klack.url_desc=}</td>
 			</tr>
 			<tr>
 				<td>{=L:set.timer.klack.security_code=}</td>
-				<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/><br/><br/></td>
+				<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/></td>
 			</tr>
 			<tr>
 				<td colspan="2" class="y_form_header">{=L:set.timer.channel_name_replacelist=}</td>
diff --git a/src/nhttpd/web/Y_Settings_automount_liste.yhtm b/src/nhttpd/web/Y_Settings_automount_liste.yhtm
index 51a3b72a9..1ea68f360 100644
--- a/src/nhttpd/web/Y_Settings_automount_liste.yhtm
+++ b/src/nhttpd/web/Y_Settings_automount_liste.yhtm
@@ -41,6 +41,7 @@ function do_delete()
 	<div class="work_box_body">
 	<form action="/y/cgi" name="f" id="f">
 		{=script:Y_Tools automount_list {=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}=}
+		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_automount.yhtm"/>
 		<input type="hidden" name="execute" value=""/>
 		<input type="hidden" name="cmd" value=""/>
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 894eae6c5..8548da598 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.21
-date=24.07.2012
+version=2.8.0.22
+date=25.07.2012
 type=Release
 info=Port Coolstream
diff --git a/src/nhttpd/web/images/LICENSE b/src/nhttpd/web/images/LICENSE
index 5988e4386..c98e4bd19 100644
--- a/src/nhttpd/web/images/LICENSE
+++ b/src/nhttpd/web/images/LICENSE
@@ -9,10 +9,6 @@ Published under GPL v2
 - y.png
 - audiobar.gif
 - blank.gif
-- body-trans*
-- head-blue*
-- head-orange*
-- head-trans*
 - help_white.gif
 
 From old (before yWeb):
diff --git a/src/nhttpd/web/images/body-trans-l.gif b/src/nhttpd/web/images/body-trans-l.gif
deleted file mode 100644
index 20e08cbf4..000000000
Binary files a/src/nhttpd/web/images/body-trans-l.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/body-trans-r.gif b/src/nhttpd/web/images/body-trans-r.gif
deleted file mode 100644
index ed091687e..000000000
Binary files a/src/nhttpd/web/images/body-trans-r.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-blue-l.gif b/src/nhttpd/web/images/head-blue-l.gif
deleted file mode 100644
index 9e763cf03..000000000
Binary files a/src/nhttpd/web/images/head-blue-l.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-blue-r.gif b/src/nhttpd/web/images/head-blue-r.gif
deleted file mode 100644
index a998161c8..000000000
Binary files a/src/nhttpd/web/images/head-blue-r.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-orange-l.gif b/src/nhttpd/web/images/head-orange-l.gif
deleted file mode 100644
index 6adb3fc94..000000000
Binary files a/src/nhttpd/web/images/head-orange-l.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-orange-r.gif b/src/nhttpd/web/images/head-orange-r.gif
deleted file mode 100644
index a1875e3a2..000000000
Binary files a/src/nhttpd/web/images/head-orange-r.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-trans-l.gif b/src/nhttpd/web/images/head-trans-l.gif
deleted file mode 100644
index 035aa26f0..000000000
Binary files a/src/nhttpd/web/images/head-trans-l.gif and /dev/null differ
diff --git a/src/nhttpd/web/images/head-trans-r.gif b/src/nhttpd/web/images/head-trans-r.gif
deleted file mode 100644
index 7dc2c7828..000000000
Binary files a/src/nhttpd/web/images/head-trans-r.gif and /dev/null differ
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index 1958127c3..b047ddf96 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -16,19 +16,19 @@ url=URL
 server=Server
 refreshing=aktualisieren ...
 refresh=Aktualisieren
-record=aufnehmen
-zap=umschalten
-lookup=nachschlagen
-save_values_desc=senden und speichern der Werte
+record=Aufnehmen
+zap=Umschalten
+lookup=Nachschlagen
+save_values_desc=Senden und Speichern der Werte
 save_values=Werte werden übernommen ...
 administration=Administration
 normal=Normal
 management=Management
 uninstaller=Deinstallation
-send=senden
-save=speichern
+send=Senden
+save=Speichern
 save_all=Alle &Auml;nderungen speichern
-cancel=abbrechen
+cancel=Abbrechen
 answer=Antwort
 reboot=Neustart
 shutdown=Ausschalten
@@ -47,7 +47,7 @@ description=Beschreibung
 color=Farbe
 tag=Bezeichnung
 empty=leer
-check=prüfen
+check=Prüfen
 help=Hilfe
 attention=Achtung!
 directory=Verzeichnis
@@ -366,10 +366,10 @@ set.ap.start_dir=Start-Verzeichnis
 set.ap.parse_shoutcast=Shoutcast Meta-Daten
 
 ========Settings Timer
-set.timer.header=Timer Settings
+set.timer.header=Timer Einstellungen
 set.timer.username=Benutzername
 set.timer.password=Passwort
-set.timer.klack.url_desc=("&" wir beim Speichern zu ";" konvertiert)
+set.timer.klack.url_desc=("&" wird beim Speichern zu ";" konvertiert)
 set.timer.klack.url=Persönliche RSS TV-Planer URL
 set.timer.klack.security_code_desc=Klack Sicherheits Code
 set.timer.klack.security_code=Sicherheits Code