diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd
index faae7867..c606892b 100755
--- a/.bin/Scripts/build-ufd
+++ b/.bin/Scripts/build-ufd
@@ -557,7 +557,9 @@ mount "${WINPE_ISO}" /mnt/WinPE -r >> "${LOG_FILE}" 2>&1
 echo "Copying Linux files..."
 rsync ${RSYNC_ARGS} /mnt/Linux/* /mnt/Dest/ >> "${LOG_FILE}" 2>&1
 sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/EFI/boot/refind.conf
+sed -i "s/#UFD#//" /mnt/Dest/EFI/boot/refind.conf
 sed -i "s/${ISO_LABEL}/${UFD_LABEL}/" /mnt/Dest/arch/boot/syslinux/*cfg
+sed -i "s/#UFD#//" /mnt/Dest/arch/boot/syslinux/*cfg
 
 echo "Copying WinPE files..."
 rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot,bootmgr{,.efi},en-us,sources} /mnt/Dest/ >> "${LOG_FILE}" 2>&1
diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf
index 075f6e46..de83e78c 100644
--- a/.linux_items/include/EFI/boot/refind.conf
+++ b/.linux_items/include/EFI/boot/refind.conf
@@ -32,8 +32,8 @@ menuentry "Linux" {
         add_options "nox"
     }
 }
-menuentry "WindowsPE" {
-    ostype windows
-    icon /EFI/boot/icons/wk_win.png
-    loader /EFI/microsoft/bootx64.efi
-}
+#UFD#menuentry "WindowsPE" {
+#UFD#    ostype windows
+#UFD#    icon /EFI/boot/icons/wk_win.png
+#UFD#    loader /EFI/microsoft/bootx64.efi
+#UFD#}
diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/.linux_items/include/syslinux/wk_pxe.cfg
index d5efabb4..92af00e3 100644
--- a/.linux_items/include/syslinux/wk_pxe.cfg
+++ b/.linux_items/include/syslinux/wk_pxe.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/wk_head.cfg
 MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
-INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 INCLUDE boot/syslinux/wk_pxe_extras_entry.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_pxe_extras.cfg b/.linux_items/include/syslinux/wk_pxe_extras.cfg
index 04cd2ce1..d677b4b0 100644
--- a/.linux_items/include/syslinux/wk_pxe_extras.cfg
+++ b/.linux_items/include/syslinux/wk_pxe_extras.cfg
@@ -3,7 +3,7 @@ MENU BACKGROUND pxelinux.png
 
 INCLUDE boot/syslinux/wk_pxe_linux.cfg
 INCLUDE boot/syslinux/wk_pxe_linux_extras.cfg
-INCLUDE boot/syslinux/wk_pxe_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg
 INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg
index beefb77d..0d375cf3 100644
--- a/.linux_items/include/syslinux/wk_sys.cfg
+++ b/.linux_items/include/syslinux/wk_sys.cfg
@@ -1,7 +1,7 @@
 INCLUDE boot/syslinux/wk_head.cfg
 
 INCLUDE boot/syslinux/wk_sys_linux.cfg
-INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 INCLUDE boot/syslinux/wk_sys_extras_entry.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg
diff --git a/.linux_items/include/syslinux/wk_sys_extras.cfg b/.linux_items/include/syslinux/wk_sys_extras.cfg
index 422bd053..3e5af215 100644
--- a/.linux_items/include/syslinux/wk_sys_extras.cfg
+++ b/.linux_items/include/syslinux/wk_sys_extras.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/wk_head.cfg
 
 INCLUDE boot/syslinux/wk_sys_linux.cfg
 INCLUDE boot/syslinux/wk_sys_linux_extras.cfg
-INCLUDE boot/syslinux/wk_sys_winpe.cfg
+#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg
 INCLUDE boot/syslinux/wk_hdt.cfg
 
 INCLUDE boot/syslinux/wk_tail.cfg