From 1a5e324f023f4b558d69fb7ebc3fbc1db99c19ed Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Wed, 1 Feb 2023 23:44:48 +0100
Subject: [PATCH] yWeb: introduce head_close block

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/25b6cc49ba9caf33e3a23844c637431794cff5d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-01 (Wed, 01 Feb 2023)

Origin message was:
------------------
- yWeb: introduce head_close block

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 data/y-web/Y_About.yhtm                       |  2 +-
 data/y-web/Y_Blank.yhtm                       |  2 +-
 data/y-web/Y_Blocks.txt                       | 33 +++++++++++--------
 data/y-web/Y_Blocks_Neutrino.txt              |  2 +-
 .../Y_Boxcontrol_Bouquet_Editor_Edit.yhtm     |  2 +-
 .../Y_Boxcontrol_Bouquet_Editor_Main.yhtm     |  2 +-
 data/y-web/Y_Boxcontrol_Bouquetlist.yhtm      |  2 +-
 data/y-web/Y_Boxcontrol_Bouquets.yhtm         |  2 +-
 data/y-web/Y_Boxcontrol_Channellist.yhtm      |  2 +-
 data/y-web/Y_Boxcontrol_Menue.yhtm            |  2 +-
 data/y-web/Y_Boxcontrol_Messages.yhtm         |  2 +-
 data/y-web/Y_EPG_Plus.yhtm                    |  2 +-
 data/y-web/Y_Ext_Menue.yhtm                   |  2 +-
 data/y-web/Y_Ext_Settings.yhtm                |  2 +-
 data/y-web/Y_Ext_Uninstall.yhtm               |  2 +-
 data/y-web/Y_Ext_Update.yhtm                  |  2 +-
 data/y-web/Y_Ext_Update_refresh.yhtm          |  2 +-
 data/y-web/Y_Filemgr.yhtm                     |  2 +-
 data/y-web/Y_Filemgr_Edit.yhtm                |  2 +-
 data/y-web/Y_Info_Help.yhtm                   |  2 +-
 data/y-web/Y_Info_Menue.yhtm                  |  2 +-
 data/y-web/Y_Info_Updates.yhtm                |  2 +-
 data/y-web/Y_Live_EPG.yhtm                    |  2 +-
 data/y-web/Y_Live_EPG_Info.yhtm               |  2 +-
 data/y-web/Y_Menue.yhtm                       |  2 +-
 data/y-web/Y_NI_About.yhtm                    |  2 +-
 data/y-web/Y_NI_Camd-control.yhtm             |  2 +-
 data/y-web/Y_NI_Infoicons-control.yhtm        |  2 +-
 data/y-web/Y_NI_NetFS-control.yhtm            |  2 +-
 data/y-web/Y_NI_NetFS-edit.yhtm               |  2 +-
 data/y-web/Y_NI_NetFS-init.yhtm               |  2 +-
 data/y-web/Y_NI_PZapit-control.yhtm           |  2 +-
 data/y-web/Y_NI_Plugin-control.yhtm           |  2 +-
 data/y-web/Y_NI_m3uConInfo.yhtm               |  3 +-
 data/y-web/Y_NI_m3uConvert.yhtm               |  3 +-
 data/y-web/Y_Refresh.yhtm                     |  2 +-
 data/y-web/Y_Settings_Backup.yhtm             |  2 +-
 data/y-web/Y_Settings_Menue.yhtm              |  2 +-
 data/y-web/Y_Settings_automount.yhtm          |  2 +-
 data/y-web/Y_Settings_automount_list.yhtm     |  2 +-
 data/y-web/Y_Settings_buttons.yhtm            |  2 +-
 data/y-web/Y_Settings_glcd.yhtm               |  2 +-
 data/y-web/Y_Settings_lcd.yhtm                |  2 +-
 data/y-web/Y_Settings_mount.yhtm              |  2 +-
 data/y-web/Y_Settings_mount_list.yhtm         |  2 +-
 data/y-web/Y_Settings_nhttpd.yhtm             |  2 +-
 data/y-web/Y_Settings_personalize.yhtm        |  2 +-
 data/y-web/Y_Settings_umount_list.yhtm        |  2 +-
 data/y-web/Y_Settings_video_audio.yhtm        |  2 +-
 data/y-web/Y_Settings_wol.yhtm                |  2 +-
 data/y-web/Y_Settings_xmltv.yhtm              |  2 +-
 data/y-web/Y_Settings_yWeb.yhtm               |  2 +-
 data/y-web/Y_Settings_zapit.yhtm              |  2 +-
 data/y-web/Y_StreamInfo.yhtm                  |  2 +-
 data/y-web/Y_Timer_Edit.yhtm                  |  2 +-
 data/y-web/Y_Timer_List.yhtm                  |  2 +-
 data/y-web/Y_Tools_Boxcontrol.yhtm            |  2 +-
 data/y-web/Y_Tools_Check_Install.yhtm         |  2 +-
 data/y-web/Y_Tools_Cmd.yhtm                   |  2 +-
 data/y-web/Y_Tools_Info_Menue.yhtm            |  2 +-
 data/y-web/Y_Tools_Installer.yhtm             |  2 +-
 data/y-web/Y_Tools_Menue.yhtm                 |  2 +-
 data/y-web/Y_Tools_Rcsim.yhtm                 |  2 +-
 data/y-web/Y_Tools_Screenshot.yhtm            |  2 +-
 data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm   |  2 +-
 data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm  |  2 +-
 data/y-web/Y_Version.txt                      |  2 +-
 data/y-web/Y_Wait.yhtm                        |  2 +-
 data/y-web/info/yinfo.yhtm                    |  2 +-
 data/y-web/lcd4linux/ylcd4linux.yhtm          |  2 +-
 70 files changed, 88 insertions(+), 85 deletions(-)

diff --git a/data/y-web/Y_About.yhtm b/data/y-web/Y_About.yhtm
index 397f11f00..7c230c343 100644
--- a/data/y-web/Y_About.yhtm
+++ b/data/y-web/Y_About.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPConf=}
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=}
 {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
 <body>
diff --git a/data/y-web/Y_Blank.yhtm b/data/y-web/Y_Blank.yhtm
index 126972c6d..05d44d1a1 100644
--- a/data/y-web/Y_Blank.yhtm
+++ b/data/y-web/Y_Blank.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 <div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 6446a77fe..628f7d707 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -1,6 +1,6 @@
 start-block~timer
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
@@ -152,7 +152,7 @@ end-block~ext_save_settings
 # ------- No Managemant Error
 start-block~no_management
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <br />
 <div class="y_head">Error</div>
@@ -261,7 +261,7 @@ start-block~head_no_charset
 end-block~head_no_charset
 
 # ------- Lay-Frame HEAD
-start-block~frame_head
+start-block~head_frame
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -271,10 +271,10 @@ start-block~frame_head
 <link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
 <link rel="stylesheet" type="text/css" href="/Y_User.css" />
 <title>yWeb</title>
-end-block~frame_head
+end-block~head_frame
 
 # ------- Lay-Frame HEAD
-start-block~frame_iso_head
+start-block~head_frame_iso
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -284,7 +284,7 @@ start-block~frame_iso_head
 <link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
 <link rel="stylesheet" type="text/css" href="/Y_User.css" />
 <title>yWeb</title>
-end-block~frame_iso_head
+end-block~head_frame_iso
 
 # ------- Lay-HEAD NI
 start-block~head_ni
@@ -314,6 +314,11 @@ start-block~head_ni
 {=include-block:Y_Blocks.txt;jQuery_ui=}
 end-block~head_ni
 
+# ------- Lay-HEAD close
+start-block~head_close
+{=include-block:Y_Blocks.txt;head_close=}
+end-block~head_close
+
 # ============= jQuery
 # ------- jQuery library
 start-block~jQuery
@@ -353,7 +358,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
@@ -397,9 +402,9 @@ start-block~frame_main
 {=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;startup=}~
 {=include-block:Y_Blocks.txt;start_wizard_page=}
 ~
-{=include-block:Y_Blocks.txt;frame_head=}
+{=include-block:Y_Blocks.txt;head_frame=}
 <title>yWeb</title>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 	<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%"; />
@@ -417,7 +422,7 @@ end-block~frame_main
 # ------- Lay-Frame MAIN
 start-block~page_frame_rest
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 </body>
 </html>
@@ -425,8 +430,8 @@ end-block~page_frame_rest
 
 # ------- Lay-Frame Secondary-Menu
 start-block~frame_secondary
-{=include-block:Y_Blocks.txt;frame_iso_head=}
-</head>
+{=include-block:Y_Blocks.txt;head_frame_iso=}
+{=include-block:Y_Blocks.txt;head_close=}
 <frameset cols="175,*" frameborder="0" framespacing="0">
 	<frame name="sec_menu" src="{=var-get:sec_menu=}" scrolling="no" noresize="noresize" frameborder="0" />
 	<frame name="work" src="{=var-get:work=}" scrolling="auto" frameborder="0" />
@@ -492,8 +497,8 @@ end-block~frame_info
 # ==== LIVE
 # ------- Lay-Frame Live-EPG Frameset
 start-block~frame_live_epg
-{=include-block:Y_Blocks.txt;frame_head=}
-</head>
+{=include-block:Y_Blocks.txt;head_frame=}
+{=include-block:Y_Blocks.txt;head_close=}
 <frameset rows="100,*" frameborder="0" framespacing="0">
 	<frame name="epg_info" src="Y_Live_EPG_Info.yhtm" scrolling="auto" frameborder="0" />
 	<frame name="epg_list" src="Y_Live_EPG.yhtm?channel={=channel=}&logoid={=logoid=}" scrolling="auto" frameborder="0" style="height:100%" />
diff --git a/data/y-web/Y_Blocks_Neutrino.txt b/data/y-web/Y_Blocks_Neutrino.txt
index ca8b43f97..633e5ec3c 100644
--- a/data/y-web/Y_Blocks_Neutrino.txt
+++ b/data/y-web/Y_Blocks_Neutrino.txt
@@ -11,7 +11,7 @@ start-block~neutrino_form
 .line {border-top: 1px solid #6D96A9;}
 /*]]>*/
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 {=include-block:Y_Blocks_Neutrino.txt;{=var-get:neutrino=}=}
diff --git a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
index 3135e0410..5bea98bf5 100644
--- a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
+++ b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm
@@ -50,7 +50,7 @@ function poschannel(box, direction){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
diff --git a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
index ba1bb6aef..ad633f7a4 100644
--- a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
+++ b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm
@@ -112,7 +112,7 @@ function do_rename(){
 	padding: 1em;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Boxcontrol_Bouquetlist.yhtm b/data/y-web/Y_Boxcontrol_Bouquetlist.yhtm
index a75677bab..d8af36389 100644
--- a/data/y-web/Y_Boxcontrol_Bouquetlist.yhtm
+++ b/data/y-web/Y_Boxcontrol_Bouquetlist.yhtm
@@ -1,6 +1,6 @@
 {=include-block:Y_Blocks.txt;head_no_charset=}
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body class="iframe">
 <table class="bouquetlist" width="100%">
 <tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm#akt" target="content">{=L:bc.channels=}</a></td></tr>
diff --git a/data/y-web/Y_Boxcontrol_Bouquets.yhtm b/data/y-web/Y_Boxcontrol_Bouquets.yhtm
index 02eadd8d0..5190f1c87 100644
--- a/data/y-web/Y_Boxcontrol_Bouquets.yhtm
+++ b/data/y-web/Y_Boxcontrol_Bouquets.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Boxcontrol_Channellist.yhtm b/data/y-web/Y_Boxcontrol_Channellist.yhtm
index 85c06603d..954ea55a4 100644
--- a/data/y-web/Y_Boxcontrol_Channellist.yhtm
+++ b/data/y-web/Y_Boxcontrol_Channellist.yhtm
@@ -25,7 +25,7 @@ function do_streaminfo() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body class="iframe">
 <table class="bouquetitemlist">
 {=func:get_bouquets_with_epg {=bouquet=}=}
diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm
index f879e2fe3..0e0eeb77c 100644
--- a/data/y-web/Y_Boxcontrol_Menue.yhtm
+++ b/data/y-web/Y_Boxcontrol_Menue.yhtm
@@ -131,7 +131,7 @@ function epg_plus_popup() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="y_menu_sec_box">
 	<div class="y_menu_sec_box_head"><h2>{=L:main.boxcontrol=}</h2></div>
diff --git a/data/y-web/Y_Boxcontrol_Messages.yhtm b/data/y-web/Y_Boxcontrol_Messages.yhtm
index 25562e6a8..e35a4f378 100644
--- a/data/y-web/Y_Boxcontrol_Messages.yhtm
+++ b/data/y-web/Y_Boxcontrol_Messages.yhtm
@@ -15,7 +15,7 @@ function do_send(mode) {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_EPG_Plus.yhtm b/data/y-web/Y_EPG_Plus.yhtm
index d0596f2b9..f2dcbacf7 100644
--- a/data/y-web/Y_EPG_Plus.yhtm
+++ b/data/y-web/Y_EPG_Plus.yhtm
@@ -7,7 +7,7 @@
 <script type="text/javascript">
 </script>
 
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:epg.get_epg=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Ext_Menue.yhtm b/data/y-web/Y_Ext_Menue.yhtm
index e1bfa0fc0..aabf4f7a2 100644
--- a/data/y-web/Y_Ext_Menue.yhtm
+++ b/data/y-web/Y_Ext_Menue.yhtm
@@ -23,7 +23,7 @@ function build_menu(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="build_menu()">
 <div class="y_menu_sec_box">
 	<div class="y_menu_sec_box_head"><h2>{=L:main.extensions=}</h2></div>
diff --git a/data/y-web/Y_Ext_Settings.yhtm b/data/y-web/Y_Ext_Settings.yhtm
index 3cb48cb3e..b0a8275f9 100644
--- a/data/y-web/Y_Ext_Settings.yhtm
+++ b/data/y-web/Y_Ext_Settings.yhtm
@@ -12,7 +12,7 @@ function do_submit(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Ext_Uninstall.yhtm b/data/y-web/Y_Ext_Uninstall.yhtm
index 66ec1f7d5..c2908f6c2 100644
--- a/data/y-web/Y_Ext_Uninstall.yhtm
+++ b/data/y-web/Y_Ext_Uninstall.yhtm
@@ -16,7 +16,7 @@ function init(){
 	text-align: center;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Ext_Update.yhtm b/data/y-web/Y_Ext_Update.yhtm
index e1978834b..b539a717a 100644
--- a/data/y-web/Y_Ext_Update.yhtm
+++ b/data/y-web/Y_Ext_Update.yhtm
@@ -4,7 +4,7 @@
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/Y_yweb.js"></script>
 <script type="text/javascript" src="/Y_Ext_Update.js"></script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Ext_Update_refresh.yhtm b/data/y-web/Y_Ext_Update_refresh.yhtm
index 0ae21d900..5b3ca4003 100644
--- a/data/y-web/Y_Ext_Update_refresh.yhtm
+++ b/data/y-web/Y_Ext_Update_refresh.yhtm
@@ -11,7 +11,7 @@ function do_onload() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_onload()">
 {=var-set:wait_text={=L:refreshing=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Filemgr.yhtm b/data/y-web/Y_Filemgr.yhtm
index 1c2732301..78ba9313b 100644
--- a/data/y-web/Y_Filemgr.yhtm
+++ b/data/y-web/Y_Filemgr.yhtm
@@ -583,7 +583,7 @@ function ni() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Filemgr_Edit.yhtm b/data/y-web/Y_Filemgr_Edit.yhtm
index 092c3d900..a7aff190f 100644
--- a/data/y-web/Y_Filemgr_Edit.yhtm
+++ b/data/y-web/Y_Filemgr_Edit.yhtm
@@ -37,7 +37,7 @@ function ni(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 {=var-set:wait_text=Speichern (Save).=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Info_Help.yhtm b/data/y-web/Y_Info_Help.yhtm
index 974e2ae03..bb56710a5 100644
--- a/data/y-web/Y_Info_Help.yhtm
+++ b/data/y-web/Y_Info_Help.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPConf=}
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm
index 10f5aed50..f8a6fc111 100644
--- a/data/y-web/Y_Info_Menue.yhtm
+++ b/data/y-web/Y_Info_Menue.yhtm
@@ -8,7 +8,7 @@ function init(){
 	add_yExtensions('info', 'secmenu_info');
 }
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=}
 <body onload="init()">
 <div class="y_menu_sec_box">
diff --git a/data/y-web/Y_Info_Updates.yhtm b/data/y-web/Y_Info_Updates.yhtm
index 9c6faa5a4..f10ebb4e7 100644
--- a/data/y-web/Y_Info_Updates.yhtm
+++ b/data/y-web/Y_Info_Updates.yhtm
@@ -9,7 +9,7 @@ function check_updates()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Live_EPG.yhtm b/data/y-web/Y_Live_EPG.yhtm
index 7fb2646ae..38940a693 100644
--- a/data/y-web/Y_Live_EPG.yhtm
+++ b/data/y-web/Y_Live_EPG.yhtm
@@ -114,7 +114,7 @@ function _show_epg()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="show_epg()" class="iframe">
 {=var-set:wait_text={=L:epg.get_epg=}=}{=include-block:Y_Blocks.txt;snip_show_wait=}
 	<table id="epglist" class="y_invisible_table" cellpadding="4" cellspacing="0" width="100%">
diff --git a/data/y-web/Y_Live_EPG_Info.yhtm b/data/y-web/Y_Live_EPG_Info.yhtm
index c109d09e7..48aa238c7 100644
--- a/data/y-web/Y_Live_EPG_Info.yhtm
+++ b/data/y-web/Y_Live_EPG_Info.yhtm
@@ -9,7 +9,7 @@ function show_info(_desc, _info1, _info2){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <a href="javascript:window.history.back()"><u>{=L:back=}</u></a>
 <body class="iframe">
 	<div class="y_epg_info">
diff --git a/data/y-web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm
index 2ad3ca6ea..19a2698e1 100644
--- a/data/y-web/Y_Menue.yhtm
+++ b/data/y-web/Y_Menue.yhtm
@@ -78,7 +78,7 @@ function vlc() {
 	height:38px;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=}
 {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
 <body>
diff --git a/data/y-web/Y_NI_About.yhtm b/data/y-web/Y_NI_About.yhtm
index 90a83c661..0506382d4 100644
--- a/data/y-web/Y_NI_About.yhtm
+++ b/data/y-web/Y_NI_About.yhtm
@@ -37,7 +37,7 @@ jQuery(document).ready(function(){
 });
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_NI_Camd-control.yhtm b/data/y-web/Y_NI_Camd-control.yhtm
index 7902c2c64..efc4ee4c7 100644
--- a/data/y-web/Y_NI_Camd-control.yhtm
+++ b/data/y-web/Y_NI_Camd-control.yhtm
@@ -26,7 +26,7 @@ input[type="button"], .tools select {
 	width: 100%;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:ni.camd-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_NI_Infoicons-control.yhtm b/data/y-web/Y_NI_Infoicons-control.yhtm
index 3e3aec3ea..575a504ad 100644
--- a/data/y-web/Y_NI_Infoicons-control.yhtm
+++ b/data/y-web/Y_NI_Infoicons-control.yhtm
@@ -17,7 +17,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:ni.infoicons-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_NI_NetFS-control.yhtm b/data/y-web/Y_NI_NetFS-control.yhtm
index dbbbfe60f..6a19465e3 100644
--- a/data/y-web/Y_NI_NetFS-control.yhtm
+++ b/data/y-web/Y_NI_NetFS-control.yhtm
@@ -55,7 +55,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:ni.netfs-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_NI_NetFS-edit.yhtm b/data/y-web/Y_NI_NetFS-edit.yhtm
index d2cbb4e2c..5fa104e39 100644
--- a/data/y-web/Y_NI_NetFS-edit.yhtm
+++ b/data/y-web/Y_NI_NetFS-edit.yhtm
@@ -21,7 +21,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="form_init()">
 {=var-set:wait_text={=L:ni.netfs-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_NI_NetFS-init.yhtm b/data/y-web/Y_NI_NetFS-init.yhtm
index 827595fbe..a7df237df 100644
--- a/data/y-web/Y_NI_NetFS-init.yhtm
+++ b/data/y-web/Y_NI_NetFS-init.yhtm
@@ -6,7 +6,7 @@ jQuery(document).ready(function(){
 });
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_NI_PZapit-control.yhtm b/data/y-web/Y_NI_PZapit-control.yhtm
index 1b79a6f5f..93e7fac88 100644
--- a/data/y-web/Y_NI_PZapit-control.yhtm
+++ b/data/y-web/Y_NI_PZapit-control.yhtm
@@ -1,5 +1,5 @@
 {=include-block:Y_Blocks.txt;head_ni=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_NI_Plugin-control.yhtm
index a872a261e..7e3397780 100644
--- a/data/y-web/Y_NI_Plugin-control.yhtm
+++ b/data/y-web/Y_NI_Plugin-control.yhtm
@@ -9,7 +9,7 @@
 {=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=}
 
 {=include-block:Y_Blocks.txt;head_ni=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload='goUrl("/control/reloadplugins");'>
 {=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_NI_m3uConInfo.yhtm b/data/y-web/Y_NI_m3uConInfo.yhtm
index 17485346a..885b8f307 100644
--- a/data/y-web/Y_NI_m3uConInfo.yhtm
+++ b/data/y-web/Y_NI_m3uConInfo.yhtm
@@ -30,8 +30,7 @@
 			border: 1px solid #a0a0a0;
 		}
 	</style>
-
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_NI_m3uConvert.yhtm b/data/y-web/Y_NI_m3uConvert.yhtm
index a01072a92..8c26cc92f 100644
--- a/data/y-web/Y_NI_m3uConvert.yhtm
+++ b/data/y-web/Y_NI_m3uConvert.yhtm
@@ -30,8 +30,7 @@
 			border: 1px solid #a0a0a0;
 		}
 	</style>
-
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Refresh.yhtm b/data/y-web/Y_Refresh.yhtm
index f9bd0667f..f8eb73190 100644
--- a/data/y-web/Y_Refresh.yhtm
+++ b/data/y-web/Y_Refresh.yhtm
@@ -7,7 +7,7 @@ function do_onload()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_onload()">
 refreshing...
 </body>
diff --git a/data/y-web/Y_Settings_Backup.yhtm b/data/y-web/Y_Settings_Backup.yhtm
index ea2d3c72a..0b8dac6c5 100644
--- a/data/y-web/Y_Settings_Backup.yhtm
+++ b/data/y-web/Y_Settings_Backup.yhtm
@@ -31,7 +31,7 @@ function do_backup2()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text=Settings=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm
index 03faceab3..9e8209c89 100644
--- a/data/y-web/Y_Settings_Menue.yhtm
+++ b/data/y-web/Y_Settings_Menue.yhtm
@@ -11,7 +11,7 @@ function init(){
 	add_yExtensions('settings_plugins', 'secmenu_plugins');
 }
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=}
 <div class="y_menu_sec_box">
diff --git a/data/y-web/Y_Settings_automount.yhtm b/data/y-web/Y_Settings_automount.yhtm
index 9dd466b7a..410442e11 100644
--- a/data/y-web/Y_Settings_automount.yhtm
+++ b/data/y-web/Y_Settings_automount.yhtm
@@ -128,7 +128,7 @@ function change_type()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onLoad="form_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_automount_list.yhtm b/data/y-web/Y_Settings_automount_list.yhtm
index 6aa767b0d..e96aa032b 100644
--- a/data/y-web/Y_Settings_automount_list.yhtm
+++ b/data/y-web/Y_Settings_automount_list.yhtm
@@ -31,7 +31,7 @@ function do_delete()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_buttons.yhtm b/data/y-web/Y_Settings_buttons.yhtm
index 91fddad79..1912f56e8 100644
--- a/data/y-web/Y_Settings_buttons.yhtm
+++ b/data/y-web/Y_Settings_buttons.yhtm
@@ -206,7 +206,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text=Werte werden &uuml;bernommen (Save).=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_glcd.yhtm b/data/y-web/Y_Settings_glcd.yhtm
index 10dd878c4..40031822e 100644
--- a/data/y-web/Y_Settings_glcd.yhtm
+++ b/data/y-web/Y_Settings_glcd.yhtm
@@ -57,7 +57,7 @@ function do_submit()
 }
 /*]]>*/
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_lcd.yhtm b/data/y-web/Y_Settings_lcd.yhtm
index a7069ccea..72a2d3069 100644
--- a/data/y-web/Y_Settings_lcd.yhtm
+++ b/data/y-web/Y_Settings_lcd.yhtm
@@ -66,7 +66,7 @@ function do_submit()
 }
 /*]]>*/
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_mount.yhtm b/data/y-web/Y_Settings_mount.yhtm
index b1994fe07..f408143cc 100644
--- a/data/y-web/Y_Settings_mount.yhtm
+++ b/data/y-web/Y_Settings_mount.yhtm
@@ -17,7 +17,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onLoad="form_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_mount_list.yhtm b/data/y-web/Y_Settings_mount_list.yhtm
index 91ad95fff..37fc937b1 100644
--- a/data/y-web/Y_Settings_mount_list.yhtm
+++ b/data/y-web/Y_Settings_mount_list.yhtm
@@ -22,7 +22,7 @@ function do_edit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_nhttpd.yhtm b/data/y-web/Y_Settings_nhttpd.yhtm
index c2b45701d..b9ff60d3e 100644
--- a/data/y-web/Y_Settings_nhttpd.yhtm
+++ b/data/y-web/Y_Settings_nhttpd.yhtm
@@ -36,7 +36,7 @@ function do_check_input_LogosURL()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="form_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_personalize.yhtm b/data/y-web/Y_Settings_personalize.yhtm
index ad73be2fc..2f18c3154 100644
--- a/data/y-web/Y_Settings_personalize.yhtm
+++ b/data/y-web/Y_Settings_personalize.yhtm
@@ -57,7 +57,7 @@ function do_init()
 //]]>
 </script>
 
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_umount_list.yhtm b/data/y-web/Y_Settings_umount_list.yhtm
index 392cc954a..06eaec4f1 100644
--- a/data/y-web/Y_Settings_umount_list.yhtm
+++ b/data/y-web/Y_Settings_umount_list.yhtm
@@ -18,7 +18,7 @@ function do_unmount()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_video_audio.yhtm b/data/y-web/Y_Settings_video_audio.yhtm
index a7d3f09f6..686482b64 100644
--- a/data/y-web/Y_Settings_video_audio.yhtm
+++ b/data/y-web/Y_Settings_video_audio.yhtm
@@ -55,7 +55,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_wol.yhtm b/data/y-web/Y_Settings_wol.yhtm
index efa8e1227..f79dedba7 100644
--- a/data/y-web/Y_Settings_wol.yhtm
+++ b/data/y-web/Y_Settings_wol.yhtm
@@ -21,7 +21,7 @@ function goto_settings(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head">
diff --git a/data/y-web/Y_Settings_xmltv.yhtm b/data/y-web/Y_Settings_xmltv.yhtm
index 1efbc4a53..2c015c070 100644
--- a/data/y-web/Y_Settings_xmltv.yhtm
+++ b/data/y-web/Y_Settings_xmltv.yhtm
@@ -9,7 +9,7 @@ function do_submit() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm
index 9b6566209..42113931e 100644
--- a/data/y-web/Y_Settings_yWeb.yhtm
+++ b/data/y-web/Y_Settings_yWeb.yhtm
@@ -87,7 +87,7 @@ select {
 	width: 220px;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Settings_zapit.yhtm b/data/y-web/Y_Settings_zapit.yhtm
index d001b04ce..c0c59c239 100644
--- a/data/y-web/Y_Settings_zapit.yhtm
+++ b/data/y-web/Y_Settings_zapit.yhtm
@@ -19,7 +19,7 @@ function do_submit()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_StreamInfo.yhtm b/data/y-web/Y_StreamInfo.yhtm
index 616048360..856e680c3 100644
--- a/data/y-web/Y_StreamInfo.yhtm
+++ b/data/y-web/Y_StreamInfo.yhtm
@@ -18,7 +18,7 @@
 	clear:both;
 }
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <br/>
 {=func:get_current_stream_info=}
diff --git a/data/y-web/Y_Timer_Edit.yhtm b/data/y-web/Y_Timer_Edit.yhtm
index ed1d39bc4..382b9092b 100644
--- a/data/y-web/Y_Timer_Edit.yhtm
+++ b/data/y-web/Y_Timer_Edit.yhtm
@@ -73,7 +73,7 @@ function init()
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
diff --git a/data/y-web/Y_Timer_List.yhtm b/data/y-web/Y_Timer_List.yhtm
index 911ec1ec7..52f2e118a 100644
--- a/data/y-web/Y_Timer_List.yhtm
+++ b/data/y-web/Y_Timer_List.yhtm
@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
 <meta http-equiv="cache-control" content="no-cache" />
 <meta http-equiv="expires" content="0" />
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Boxcontrol.yhtm b/data/y-web/Y_Tools_Boxcontrol.yhtm
index 6e7f5a466..d0b38c2b5 100644
--- a/data/y-web/Y_Tools_Boxcontrol.yhtm
+++ b/data/y-web/Y_Tools_Boxcontrol.yhtm
@@ -34,7 +34,7 @@ function init() {
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm
index 270370eba..9f2115ddc 100644
--- a/data/y-web/Y_Tools_Check_Install.yhtm
+++ b/data/y-web/Y_Tools_Check_Install.yhtm
@@ -102,7 +102,7 @@ function do_check(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Cmd.yhtm b/data/y-web/Y_Tools_Cmd.yhtm
index 84e640b20..ab61e00e1 100644
--- a/data/y-web/Y_Tools_Cmd.yhtm
+++ b/data/y-web/Y_Tools_Cmd.yhtm
@@ -40,7 +40,7 @@ function setCaretToEnd(control)
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Info_Menue.yhtm b/data/y-web/Y_Tools_Info_Menue.yhtm
index 19f87acfd..70e81ad36 100644
--- a/data/y-web/Y_Tools_Info_Menue.yhtm
+++ b/data/y-web/Y_Tools_Info_Menue.yhtm
@@ -8,7 +8,7 @@ function goUrl(_url){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box">
 	<div class="work_box_head">
diff --git a/data/y-web/Y_Tools_Installer.yhtm b/data/y-web/Y_Tools_Installer.yhtm
index 25579bd0b..5082b2fc2 100644
--- a/data/y-web/Y_Tools_Installer.yhtm
+++ b/data/y-web/Y_Tools_Installer.yhtm
@@ -34,7 +34,7 @@ function init(){
 }
 //]]>div
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Menue.yhtm b/data/y-web/Y_Tools_Menue.yhtm
index f66b7c1cf..b303ab071 100644
--- a/data/y-web/Y_Tools_Menue.yhtm
+++ b/data/y-web/Y_Tools_Menue.yhtm
@@ -12,7 +12,7 @@ function init(){
 	add_yExtensions('yweb', 'secmenu_yweb');
 }
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=}
 {=var-set:automount={=find-exec:automount=}=}
 {=var-set:ether-wake={=find-exec:ether-wake=}=}
diff --git a/data/y-web/Y_Tools_Rcsim.yhtm b/data/y-web/Y_Tools_Rcsim.yhtm
index 88a48c2ee..126521b3e 100644
--- a/data/y-web/Y_Tools_Rcsim.yhtm
+++ b/data/y-web/Y_Tools_Rcsim.yhtm
@@ -16,7 +16,7 @@ function rcsim(_key)
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm
index beb853865..594ff575a 100644
--- a/data/y-web/Y_Tools_Screenshot.yhtm
+++ b/data/y-web/Y_Tools_Screenshot.yhtm
@@ -117,7 +117,7 @@ function do_reload(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_switchrc_txt(); do_snapshot();">
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
index cb02b4c89..b9173637f 100644
--- a/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
+++ b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
@@ -46,7 +46,7 @@ function do_reload(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_snapshot();">
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
index 4506e05ed..4c256a3c0 100644
--- a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
+++ b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
@@ -16,7 +16,7 @@ function do_reload(){
 }
 //]]>
 </script>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body onload="do_showshot();">
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index d3e1f14a1..728699d3b 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=3.0.6
+version=3.0.7
 date=01.02.2023
 info=NI-Neutrino-Webinterface
diff --git a/data/y-web/Y_Wait.yhtm b/data/y-web/Y_Wait.yhtm
index 570d4ec42..95e8aacf4 100644
--- a/data/y-web/Y_Wait.yhtm
+++ b/data/y-web/Y_Wait.yhtm
@@ -1,6 +1,6 @@
 {=var-set:cancache=yPyes=}
 {=include-block:Y_Blocks.txt;head=}
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 <body>
 <br/>
 <table class="y_wait_box_visible" cellpadding="8">
diff --git a/data/y-web/info/yinfo.yhtm b/data/y-web/info/yinfo.yhtm
index 407adc8e5..916f934f6 100644
--- a/data/y-web/info/yinfo.yhtm
+++ b/data/y-web/info/yinfo.yhtm
@@ -133,7 +133,7 @@ body {
 }
 /*]]>*/
 </style>
-</head>
+{=include-block:Y_Blocks.txt;head_close=}
 
 <body>
 	<div class="yinfo">
diff --git a/data/y-web/lcd4linux/ylcd4linux.yhtm b/data/y-web/lcd4linux/ylcd4linux.yhtm
index 4909a826e..58b29eec3 100644
--- a/data/y-web/lcd4linux/ylcd4linux.yhtm
+++ b/data/y-web/lcd4linux/ylcd4linux.yhtm
@@ -40,8 +40,8 @@ jQuery(document).ready(function() {
 });
 //]]>
 </script>
+{=include-block:Y_Blocks.txt;head_close=}
 
-</head>
 <body>
 	<div class="ylcd4linux">
 		{=if-file-exists:{=var-get:lcd4linux_png=}~