diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 213eeaef7..8e01eb794 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -251,7 +251,7 @@ end-block~snip_show_wait
 #<img src="/images/help.gif" align="bottom" />
 start-block~wiki_help
 <!--
-<a href="http://www.yjogol.com/{=var-get:help_url=}" target="_blank" title="get help from www.yjogol.com">?</a>
+<a href="https://wiki.tuxbox-neutrino.org/wiki/{=var-get:help_url=}" target="_blank" title="get help from https://wiki.tuxbox-neutrino.org">?</a>
 -->
 end-block~wiki_help
 
@@ -356,7 +356,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-StartWizard=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:help_url=NeutrinoHD:Inbetriebnahme#Inbetriebnahme=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table border="0" width="100%">
diff --git a/data/y-web/Y_Info_Help.yhtm b/data/y-web/Y_Info_Help.yhtm
index 17e9bf5a3..37b17a15b 100644
--- a/data/y-web/Y_Info_Help.yhtm
+++ b/data/y-web/Y_Info_Help.yhtm
@@ -7,9 +7,9 @@
 	{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<ul>
-		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino-HD" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
-		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
-		<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Tuxbox-Neutrino" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
+		<li><a href="https://forum.tuxbox-neutrino.org/forum/" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
 		<li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
 	</ul>
 	</div>
diff --git a/data/y-web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm
index 6f6671eab..f1c6a5be8 100644
--- a/data/y-web/Y_Tools_Check_Install.yhtm
+++ b/data/y-web/Y_Tools_Check_Install.yhtm
@@ -40,7 +40,7 @@ function sLog_addRow(_body, state, action_text, state_text){
 }
 /*check*/
 function wiki_url(_page){
-	return "<a href=\"http://wiki.dbox2-tuning.net/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
+	return "<a href=\"https://wiki.tuxbox-neutrino.org/wiki/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
 }
 function do_check(){
 	sLog_init();
@@ -62,18 +62,18 @@ function do_check(){
 	=}
 	{=if-equal:{=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=}~80~~
 		sLog_addRow(sLog_body, "yellow",
-		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=} "+wiki_url("Neutrino:yWeb#Webserver"), "notice");
+		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=} "+wiki_url("Neutrino:yWeb:Settings#WebServer"), "notice");
 	=}
 	/*settings*/
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=}~~
 		sLog_addRow(sLog_body, "yellow",
 		"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}. "
-		+wiki_url("Help-Settings-yWeb"), "notice");
+		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~~
 		sLog_addRow(sLog_body, "yellow",
 		"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}. "
-		+wiki_url("Neutrino:yWeb#yWeb"), "notice");
+		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}
 
 	/*programs*/
diff --git a/data/y-web/Y_Tools_Timer_Sync.js b/data/y-web/Y_Tools_Timer_Sync.js
index 418f37622..ab1cec5e5 100644
--- a/data/y-web/Y_Tools_Timer_Sync.js
+++ b/data/y-web/Y_Tools_Timer_Sync.js
@@ -1,6 +1,6 @@
 function wiki_url(_page)
 {
-	return "<a href=\"http://wiki.dbox2-tuning.net/"+_page+"\"' target=\"_blank\"><b>[Help]<\/b><\/a>";
+	return "<a href=\"https://wiki.tuxbox-neutrino.org/wiki/"+_page+"\"' target=\"_blank\"><b>[Help]<\/b><\/a>";
 }
 /*timer_list*/
 var timer_body;
@@ -185,19 +185,19 @@ function do_get_tvinfo()
 			if(res.search("SSL certificate verify ok")!=-1)
 				sLog_addRow(sLog_body, "green", "TVinfo: SSL certificate verify", "ok");
 			else
-				sLog_addRow(sLog_body, "red", "TVinfo: SSL certificate verify "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+				sLog_addRow(sLog_body, "red", "TVinfo: SSL certificate verify "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 
 			if(res.search("left intact")!=-1)
 			{
 				sLog_addRow(sLog_body, "green", "TVinfo: connecting ", "ok");
 			}
 			else
-				sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+				sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 		}
 		else
-			sLog_addRow(sLog_body, "red", "TVinfo: no password given. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+			sLog_addRow(sLog_body, "red", "TVinfo: no password given. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 	else
-		sLog_addRow(sLog_body, "red", "TVinfo: no username given. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+		sLog_addRow(sLog_body, "red", "TVinfo: no username given. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 
 }
 function do_get_klack()
@@ -208,7 +208,7 @@ function do_get_klack()
 	if(res.search(/Connecting/)!=-1)
 		sLog_addRow(sLog_body, "green", "Klack: connecting: "+res, "ok");
 	else
-		sLog_addRow(sLog_body, "red", "Klack: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+		sLog_addRow(sLog_body, "red", "Klack: connecting. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 }
 function do_clear_all()
 {