diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 8e385ccca..7f247da56 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -88,7 +88,6 @@ install_DATA += Y_NIlib.js \
Y_NI.css \
Y_NI_About.yhtm \
Y_NI_blank.yhtm \
- Y_NI_Blocks.txt \
Y_NI_Camd-control.yhtm \
Y_NI_Infoicons-control.yhtm \
Y_NI_m3uConInfo.yhtm \
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 16aa8c4ba..1000c53ec 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -287,6 +287,39 @@ start-block~frame_iso_head
yWeb
end-block~frame_iso_head
+# ------- Lay-HEAD NI
+start-block~head_ni
+
+
+
+
+
+
+
+yWeb - NI
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-{=include-block:Y_NI_Blocks.txt;include_jquery=}
-end-block~head
-
-# ------- Lay-NI-HEAD
-start-block~include_jquery
-
-
-
-end-block~include_jquery
-
-# ------- NI NetFS
-start-block~netfs_local_dir
-{=var-set:local_dir_{=var-get:nr=}={=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_local_dir_{=var-get:nr=}~open=}=}
-end-block~netfs_local_dir
-
-start-block~netfs_is_mount
-{=var-set:is_mount_{=var-get:nr=}={=script:Y_NI_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=}
-end-block~netfs_is_mount
-
-start-block~netfs_table_row
-
-
- 
- {=var-get:local_dir_{=var-get:nr=}=}
- |
-
-
- 
-
- {=if-equal:{=mount_type=}~0~
- {=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~false~
-
- 
-
- 
- ~
-
-
- 
-
- =}
- ~
- =}
- |
-
-end-block~netfs_table_row
diff --git a/data/y-web/Y_NI_Camd-control.yhtm b/data/y-web/Y_NI_Camd-control.yhtm
index dd35039d5..7902c2c64 100644
--- a/data/y-web/Y_NI_Camd-control.yhtm
+++ b/data/y-web/Y_NI_Camd-control.yhtm
@@ -20,7 +20,7 @@
{=var-set:cccamport={=script:Y_NI_Tools get_cccam_webif_port=}=}
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
-{=include-block:Y_NI_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;head_ni=}