diff --git a/data/y-web/Y_Baselib.js b/data/y-web/Y_Baselib.js
index 7bd0552e6..e47890961 100644
--- a/data/y-web/Y_Baselib.js
+++ b/data/y-web/Y_Baselib.js
@@ -412,11 +412,16 @@ function dbox_popup(_msg)
 {
 	return loadSyncURL("/control/message?popup="+_msg);
 }
-function dbox_set_timer(_channel_id, _start, _stop)
+function dbox_set_timer_rec(_channel_id, _start, _stop)
 {
 	var _url = "/control/timer?action=new&type=5&alarm="+_start+"&stop="+_stop+"&announce="+_start+"&channel_id="+_channel_id+"&rs=1";
 	return loadSyncURL(_url);
 }
+function dbox_set_timer_zap(_channel_id, _start)
+{
+	var _url = "/control/timer?action=new&type=3&alarm="+_start+"&channel_id="+_channel_id;
+	return loadSyncURL(_url);
+}
 function dbox_zapto(_channel_id)
 {
 	var _url = "/control/zapto?"+_channel_id;
diff --git a/data/y-web/Y_EPG.js b/data/y-web/Y_EPG.js
index f3d3ebd96..bfaec3e13 100644
--- a/data/y-web/Y_EPG.js
+++ b/data/y-web/Y_EPG.js
@@ -30,12 +30,11 @@ function epg_plus_calc_dimensions(){
 function epg_zapto(){
 	dbox_zapto($('d_channel_id').innerHTML);
 }
-function epg_set_timer(){
-	dbox_set_timer($("d_channel_id").innerHTML, $("d_start").innerHTML, $("d_stop").innerHTML);
+function epg_set_timer_rec(){
+	dbox_set_timer_rec($("d_channel_id").innerHTML, $("d_start").innerHTML, $("d_stop").innerHTML);
 }
-function set_zapit(){
-	var rec = "/control/timer?action=new&type=3&alarm="+$("d_start").innerHTML+"&channel_id="+$("d_channel_id").innerHTML;
-	var res = loadSyncURL(rec);
+function epg_set_timer_zap(){
+	dbox_set_timer_zap($("d_channel_id").innerHTML, $("d_start").innerHTML);
 }
 function build_epg_clear(){
 	var ep = $("epg_plus");
diff --git a/data/y-web/Y_EPG_Plus.yhtm b/data/y-web/Y_EPG_Plus.yhtm
index 4a4eb7c2e..cf4ef0066 100644
--- a/data/y-web/Y_EPG_Plus.yhtm
+++ b/data/y-web/Y_EPG_Plus.yhtm
@@ -59,8 +59,8 @@ function epg_imdb(){
 		<tr>
 			<td colspan="3">
 				<br/>
-				<button ytype="record" title="{=L:epg.set_timer=}" onclick="epg_set_timer();show_obj('epg_info',false);">{=L:record=}</button>
-				<button ytype="zap" title="{=L:epg.zap_to=}" onclick="set_zapit();show_obj('epg_info',false);">{=L:zap=}</button>
+				<button ytype="record" title="{=L:epg.set_timer_rec=}" onclick="epg_set_timer_rec();show_obj('epg_info',false);">{=L:record=}</button>
+				<button ytype="zap" title="{=L:epg.set_timer_zap=}" onclick="epg_set_timer_zap();show_obj('epg_info',false);">{=L:zap=}</button>
 			</td>
 		</tr>
 	</table>
diff --git a/data/y-web/Y_Live_EPG.yhtm b/data/y-web/Y_Live_EPG.yhtm
index 8d0dc53f0..efb7e9dbf 100644
--- a/data/y-web/Y_Live_EPG.yhtm
+++ b/data/y-web/Y_Live_EPG.yhtm
@@ -20,29 +20,27 @@ function sLog_clear()
 	}
 	sLog_line_number =  0;
 }
-function sLog_addRow(_body, _date, _rec, _zapit, _start, _end, _title)
+function sLog_addRow(_body, _date, _rec, _zap, _start, _end, _title)
 {
 	sLog_line_number++;
 	var mycurrent_row = y_add_row_to_table(_body, ((sLog_line_number % 2) ==0)?"a":"b" );
 
 	y_add_html_cell_to_row(mycurrent_row, "rec", _rec);
-	y_add_html_cell_to_row(mycurrent_row, "zap", _zapit);
+	y_add_html_cell_to_row(mycurrent_row, "zap", _zap);
 	y_add_html_cell_to_row(mycurrent_row, "date", _date);
 	y_add_html_cell_to_row(mycurrent_row, "starttime", _start);
 	y_add_html_cell_to_row(mycurrent_row, "endtime", _end);
 	y_add_html_cell_to_row(mycurrent_row, "epgtitle", _title);
 }
-function set_timer(_channel_id, _start, _stop)
+function set_timer_rec(_channel_id, _start, _stop)
 {
-	var rec = "/control/timer?action=new&type=5&alarm="+_start+"&stop="+_stop+"&announce="+_start+"&channel_id="+_channel_id+"&rs=1";
-	var res = loadSyncURL(rec);
-	alert("{=L:epg.set_timer=}");
+	var res = dbox_set_timer_rec(_channel_id, _start, _stop);
+	alert("{=L:epg.set_timer_rec=}");
 }
-function set_zapit(_channel_id, _start)
+function set_timer_zap(_channel_id, _start)
 {
-	var rec = "/control/timer?action=new&type=3&alarm="+_start+"&channel_id="+_channel_id;
-	var res = loadSyncURL(rec);
-	alert("{=L:epg.zap_to=}");
+	var res = dbox_set_timer_zap(_channel_id, _start);
+	alert("{=L:epg.set_timer_zap=}");
 }
 function show_info(_index)
 {
@@ -102,10 +100,10 @@ function _show_epg()
 				var epg_obj= new Array(_desc, _info1, _info2, _start, _start_t, _stop.toString(), "{=channel=}");
 				epg_data.push(epg_obj);
 
-				var _rec 	= "<a title=\"record\" href=\"javascript:set_timer('{=channel=}',"+_start+","+_stop+");\"><img src=\"images/record.png\"/></a>";
-				var _zapit 	= "<a title=\"zapping\" href=\"javascript:set_zapit('{=channel=}',"+_start+");\"><img src=\"images/zap.png\"/></a>";
-				var _tit 	= "<span onmouseover=\"show_info('"+epg_data_index+"')\">"+_desc+"</span>";
-				sLog_addRow(sLog_body, _date, _rec, _zapit, _start_t, _stop_t, _tit);
+				var _rec = "<a title=\"record\" href=\"javascript:set_timer_rec('{=channel=}',"+_start+","+_stop+");\"><img src=\"images/record.png\"/></a>";
+				var _zap = "<a title=\"zapping\" href=\"javascript:set_timer_zap('{=channel=}',"+_start+");\"><img src=\"images/zap.png\"/></a>";
+				var _title = "<span onmouseover=\"show_info('"+epg_data_index+"')\">"+_desc+"</span>";
+				sLog_addRow(sLog_body, _date, _rec, _zap, _start_t, _stop_t, _title);
 				epg_data_index++;
 			}
 		}
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index cdf6bc930..df5cf3f7c 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.9.0.39
-date=26.08.2016
+version=2.9.0.40
+date=01.03.2017
 type=Release
 info=Port Tuxbox-Neutrino
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index e726ac538..47bbe3947 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -203,8 +203,8 @@ epg.hover_for_details=F&uuml;r Details: Maus &uuml;ber die entsprechende Sendung
 epg.refresh=EPG Daten aktualisieren
 epg.past_hours=Stunden zur&uuml;ck
 epg.next_hours=Stunden vor
-epg.set_timer=Timer f&uuml;r Aufnahme gesetzt
-epg.zap_to=Umschalt-Timer gesetzt
+epg.set_timer_rec=Aufnahme-Timer gesetzt
+epg.set_timer_zap=Umschalt-Timer gesetzt
 
 ========EPG Streaminfo
 epg.si.streaminfo=Streaminfo
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index 8ee0e178d..e3af6cbae 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -206,8 +206,8 @@ epg.hover_for_details=move to program for more details
 epg.refresh=get or refresh EPG
 epg.past_hours=past hours
 epg.next_hours=next hours
-epg.set_timer=Set timer for recording. Done.
-epg.zap_to=Set switch to channel. Done.
+epg.set_timer_rec=Set timer for recording. Done.
+epg.set_timer_zap=Set switch to channel. Done.
 
 ========EPG Streaminfo
 epg.si.streaminfo=Streaminfo
diff --git a/data/y-web/languages/Polski b/data/y-web/languages/Polski
index 034d3f54a..7588b3cfc 100644
--- a/data/y-web/languages/Polski
+++ b/data/y-web/languages/Polski
@@ -187,8 +187,8 @@ epg.hover_for_details=Przełącz, aby uzyskać więcej informacji
 epg.refresh=Aktualizacja EPG
 epg.past_hours=Poprzednie
 epg.next_hours=Następne
-epg.set_timer=Ustawianie timera
-epg.zap_to=Przełączanie kanału
+epg.set_timer_rec=Ustawianie timera
+epg.set_timer_zap=Przełączanie kanału
 
 # ========= EPG Stream Informacje
 epg.si.streaminfo=Informacje Stream
diff --git a/data/y-web/languages/Portuguese b/data/y-web/languages/Portuguese
index 1dffab32c..37d51e692 100644
--- a/data/y-web/languages/Portuguese
+++ b/data/y-web/languages/Portuguese
@@ -191,8 +191,8 @@ epg.hover_for_details=mover para programa para ver detalhes
 epg.refresh=buscar ou actualizar a EPG
 epg.past_hours=últimas horas
 epg.next_hours=próximas horas
-epg.set_timer=Ajustar o programador para gravação. Realizado.
-epg.zap_to=Coloque o canal para mudar. Realizado.
+epg.set_timer_rec=Ajustar o programador para gravação. Realizado.
+epg.set_timer_zap=Coloque o canal para mudar. Realizado.
 
 
 ========EPG Streaminfo
diff --git a/data/y-web/languages/Slovak b/data/y-web/languages/Slovak
index 440ce4ea7..c6ea61153 100644
--- a/data/y-web/languages/Slovak
+++ b/data/y-web/languages/Slovak
@@ -185,8 +185,8 @@ epg.hover_for_details=Presun ukazovateľa na stanicu pre získanie podrobností
 epg.refresh=obnovovanie EPG
 epg.past_hours=predchádzajúce hodiny
 epg.next_hours=nasledujúce hodiny
-epg.set_timer=Nastavenie časovaca. Vykonané.
-epg.zap_to=Prepnutie na kanál. Vykonané.
+epg.set_timer_rec=Nastavenie časovaca. Vykonané.
+epg.set_timer_zap=Prepnutie na kanál. Vykonané.
 
 ======= EPG Streaminfo
 epg.si.streaminfo=Informácie streamu