diff --git a/AIO/Files/PartIMG_ROOT.img b/AIO/Files/PartIMG_ROOT.img
index c2b7c65..aa7e0c1 100644
Binary files a/AIO/Files/PartIMG_ROOT.img and b/AIO/Files/PartIMG_ROOT.img differ
diff --git a/AIO/Tools/AIOCreator_x64.exe b/AIO/Tools/AIOCreator_x64.exe
index fb29e0a..29b0089 100644
Binary files a/AIO/Tools/AIOCreator_x64.exe and b/AIO/Tools/AIOCreator_x64.exe differ
diff --git a/AIO/grub/Main.cfg b/AIO/grub/Main.cfg
index af39265..7b868cf 100644
--- a/AIO/grub/Main.cfg
+++ b/AIO/grub/Main.cfg
@@ -4,25 +4,21 @@ source ${menudir}/Main.cfg;
 ### Start InstallWinISO
 GetHotkey
 menuentry "${installwiniso}" --hotkey=${hotkey} {
-	if [ "x${secureboot}" == "xON" ]; then
-		esc 1 "${sbenabledmsg}"
-	else
-		#unset ignore_fs_args
-		#unset ignore_dir_args
-		#export ignore_fs_args="fat procfs pyfs"
-		#export ignore_dir_args="procfs pyfs"
-		unset pim
-		unset fs_args
-		unset file_ext_args
-		unset file_in_loop_args
-		export fs_args="fat ntfs exfat"
-		export file_ext_args="iso"
-		export file_in_loop_args="/sources/install.wim /x64/sources/install.esd /x86/sources/install.esd /sources/install.esd"
-		if [ -n "$pc" ]; then
-			export file_in_loop_args="${file_in_loop_args} /I386/TXTSETUP.SIF /AMD64/TXTSETUP.SIF"
-		fi
-		configfile ${prefix}/FileManager.cfg
+	#unset ignore_fs_args
+	#unset ignore_dir_args
+	#export ignore_fs_args="fat procfs pyfs"
+	#export ignore_dir_args="procfs pyfs"
+	unset pim
+	unset fs_args
+	unset file_ext_args
+	unset file_in_loop_args
+	export fs_args="fat ntfs exfat"
+	export file_ext_args="iso"
+	export file_in_loop_args="/sources/install.wim /x64/sources/install.esd /x86/sources/install.esd /sources/install.esd"
+	if [ -n "$pc" ]; then
+		export file_in_loop_args="${file_in_loop_args} /I386/TXTSETUP.SIF /AMD64/TXTSETUP.SIF"
 	fi
+	configfile ${prefix}/FileManager.cfg
 }
 ### End InstallWinISO
 ### Start ISO & IMG Mapper
diff --git a/AIO/grub/functions.cfg b/AIO/grub/functions.cfg
index 1870e88..29d8961 100644
--- a/AIO/grub/functions.cfg
+++ b/AIO/grub/functions.cfg
@@ -308,10 +308,6 @@ function ntbootcmd {
 		terminal_output console
 		ntboot ${_args} --efi=/AIO/Tools/MS/PXE/bootmgr "${_file}"
 	else
-		if [ "x${secureboot}" == "xON" ]; then
-			esc 1 "${sbenabledmsg}"
-			return 1
-		fi
 		if [ "$_file_ext" == "wim" ]; then
 			if wimtools --is64 "${_file}"; then set wimarch="64"; else set wimarch="32"; fi
 			if [ "$_SPEC_UEFI_ARCH_3" != "$wimarch" ]; then
@@ -346,10 +342,6 @@ function wimbootwinsetup {
 			@:Winpeshl.ini:/AIO/Tools/winsetup/Winpeshl.ini		\
 			@:boot.wim:"${1}"
 	else
-		if [ "x${secureboot}" == "xON" ]; then
-			esc 1 "${sbenabledmsg}"
-			return 1
-		fi
 		if [ "$_SPEC_UEFI_ARCH_3" != "$wimarch" ]; then
 			esc 1 "$efi3264msg"
 			return 1
@@ -886,7 +878,7 @@ function FileProcessing {
 			return 0
 		done
 			
-		set isolinuxroot=(loop)
+		set isolinuxroot="(isoloop)/"
 		for cfg in /boot/grub/grub.cfg /boot/grub2/grub.cfg /efi/boot/grub.cfg /grub/grub.cfg /grub.cfg /boot/grub/grubsrcd.cfg /boot/grub/grub-511.cfg	\
 			/isolinux/isolinux.cfg /syslinux/syslinux.cfg /isolinux/live.cfg /syslinux/live.cfg /boot/isolinux/isolinux.cfg 	\
 			/arch/boot/syslinux/archiso_sys.cfg /slax/boot/syslinux.cfg /isolinux/txt.cfg /boot/syslinux/menu/mesamenu.cfg; do
@@ -924,9 +916,8 @@ function FileProcessing {
 			elif regexp "archisobasedir=" "$cfgtext"; then
 				probe -u -s devuuid ${loopdev}
 				StringReplace "${cfgtext}" "archisobasedir=" "img_loop=${path} img_dev=/dev/disk/by-uuid/${devuuid} archisobasedir="
-				if [ -e (isoloop)/arch ]; then
-					set isolinuxroot=(loop)/arch/
-				fi
+				StringReplace "${NewString}" " boot/" " /arch/boot/"
+				StringReplace "${NewString}" ",boot/" ",/arch/boot/"
 			elif StringReplace "${cfgtext}" "/antiX/vmlinuz " "/antiX/vmlinuz fromiso=${path} from=usb,cd,hd "; then
 				true
 			elif StringReplace "${cfgtext}" "/gentoo " "/gentoo isoboot=${path} "; then
@@ -975,11 +966,11 @@ function FileProcessing {
 				
 				if regexp "isolinux" "$cfg"; then
 					set root=imgloop
-					syslinux_source -i -r ${isolinuxroot} /grub2cfg.cfg
+					syslinux_source -i -r "${isolinuxroot}" /grub2cfg.cfg
 					set root=isoloop
 				elif regexp "syslinux" "$cfg"; then
 					set root=imgloop
-					syslinux_source -s -r ${isolinuxroot} /grub2cfg.cfg
+					syslinux_source -s -r "${isolinuxroot}" /grub2cfg.cfg
 					set root=isoloop
 				else
 					set root=isoloop
@@ -1175,6 +1166,22 @@ function map_and_boot {
 		fi
 		unset _fs
 	else
+		if file --is-x86-linux "${_file}"; then
+			if [ -n "$pc" ]; then
+				linux16		"${_file}"
+			else
+				linuxefi	"${_file}"
+			fi
+			boot
+		elif file --is-x86-multiboot "${_file}"; then
+			set root="${2}"
+			multiboot	"${1}"
+			boot
+		elif file --is-x86-multiboot2 "${_file}"; then
+			set root="${2}"
+			multiboot2	"${1}"
+			boot
+		fi
 		stat -z -s _filesize "${_file}"
 		if [ "$_filesize" != "1474560" ] -a [ "$_filesize" != "2949120" ]; then
 			set param="HD"
@@ -1231,7 +1238,7 @@ function vhdbooting {
 	vhd -d vhd9
 	vhd -p vhd9 "${2}"
 	for _vhd_part in (vhd9,*); do
-		if [ -e "${_vhd_part}/windows/system32/cmd.exe" ] -a [ -e "${_vhd_part}/users/public" ]; then
+		if [ -e "${_vhd_part}/windows/system32/winload.exe" ] -o [ -e "${_vhd_part}/windows/system32/winload.efi" ]; then
 			ntbootcmd "$2" "$3"
 			return 0
 		fi
@@ -1256,14 +1263,22 @@ function vhdbooting {
 }
 
 function wimbooting {
-	if wimtools --exist "${1}" '\windows\system32\winpeshl.exe'; then
+	if [ -n "$efi" ]; then
+		set winload_ext="efi"
+	else
+		set winload_ext="exe"
+	fi
+	if wimtools --exist "${1}" '\windows\system32\boot\winload.'$winload_ext; then
 		ntbootcmd "${1}" "$2"
-	elif [ wimtools --exist "${1}" \\I386\\System32\\cmd.exe ] -a [ -n "$pc" ]; then
-		Grub4dosRoot
-		set opt="root ${g4droot};/AIO/NTBOOT PE1 ${path}"
-		linux16 ${g4d_path}/grub.exe --config-file=${opt}
-		boot
+	elif [ -n "$pc" ]; then
+		if wimtools --exist "${1}" '\i386\system32\cmd.exe'; then
+			Grub4dosRoot
+			set opt="root ${g4droot};/AIO/NTBOOT PE1 ${path}"
+			linux16 ${g4d_path}/grub.exe --config-file=${opt}
+			boot
+		fi
 	fi
+	unset winload_ext
 }
 
 function Refresh {
@@ -1273,4 +1288,4 @@ function Refresh {
 	else
 		multiboot /aio/grub/i386-pc/core.img
 	fi
-}
\ No newline at end of file
+}
diff --git a/AIO/grub/i386-efi/iorw.mod b/AIO/grub/i386-efi/iorw.mod
index 097e94d..ad47970 100644
Binary files a/AIO/grub/i386-efi/iorw.mod and b/AIO/grub/i386-efi/iorw.mod differ
diff --git a/AIO/grub/i386-efi/memrw.mod b/AIO/grub/i386-efi/memrw.mod
index d6f408f..2e8aeff 100644
Binary files a/AIO/grub/i386-efi/memrw.mod and b/AIO/grub/i386-efi/memrw.mod differ
diff --git a/AIO/grub/i386-efi/moddep.lst b/AIO/grub/i386-efi/moddep.lst
index 8c32019..1d0205d 100644
--- a/AIO/grub/i386-efi/moddep.lst
+++ b/AIO/grub/i386-efi/moddep.lst
@@ -172,7 +172,7 @@ strtoull_test: functional_test
 bitmap:
 ntfs: fshelp
 multiboot: net linux video boot relocator mmap
-wimboot: lua map extcmd normal procfs xzio
+wimboot: lua map extcmd normal procfs xzio boot
 tpm: verifiers
 gcry_crc: crypto
 efiload: sbpolicy linuxefi extcmd
@@ -206,7 +206,7 @@ loadenv: disk extcmd
 bitmap_scale: bitmap
 probe: extcmd
 minix3:
-dp: net lua extcmd efinet
+dp: net lua sbpolicy extcmd efinet
 tar: archelp
 loadbios:
 hfs: fshelp
diff --git a/AIO/grub/i386-pc/cpuid.mod b/AIO/grub/i386-pc/cpuid.mod
index 97a007b..94a677f 100644
Binary files a/AIO/grub/i386-pc/cpuid.mod and b/AIO/grub/i386-pc/cpuid.mod differ
diff --git a/AIO/grub/i386-pc/grubfm.mod b/AIO/grub/i386-pc/grubfm.mod
index 3a3aea3..73a33cc 100644
Binary files a/AIO/grub/i386-pc/grubfm.mod and b/AIO/grub/i386-pc/grubfm.mod differ
diff --git a/AIO/grub/i386-pc/iorw.mod b/AIO/grub/i386-pc/iorw.mod
index f75462c..d7bd605 100644
Binary files a/AIO/grub/i386-pc/iorw.mod and b/AIO/grub/i386-pc/iorw.mod differ
diff --git a/AIO/grub/i386-pc/memrw.mod b/AIO/grub/i386-pc/memrw.mod
index c15b604..2868434 100644
Binary files a/AIO/grub/i386-pc/memrw.mod and b/AIO/grub/i386-pc/memrw.mod differ
diff --git a/AIO/grub/i386-pc/moddep.lst b/AIO/grub/i386-pc/moddep.lst
index 946b346..f22a16d 100644
--- a/AIO/grub/i386-pc/moddep.lst
+++ b/AIO/grub/i386-pc/moddep.lst
@@ -280,7 +280,7 @@ linux16: linux video boot relocator mmap
 cat: extcmd
 ahci: ata boot pci
 pgp: crypto verifiers extcmd mpi gcry_sha1
-normal: net terminal crypto verifiers bufio datetime extcmd boot gettext
+normal: net terminal crypto verifiers bufio datetime extcmd boot cpuid gettext
 lzmaio:
 ufs1:
 mdraid09: diskfilter
diff --git a/AIO/grub/i386-pc/normal.mod b/AIO/grub/i386-pc/normal.mod
index b9cb7b0..8dab51f 100644
Binary files a/AIO/grub/i386-pc/normal.mod and b/AIO/grub/i386-pc/normal.mod differ
diff --git a/AIO/grub/i386-pc/ntboot.mod b/AIO/grub/i386-pc/ntboot.mod
index a0da3f7..d2b1617 100644
Binary files a/AIO/grub/i386-pc/ntboot.mod and b/AIO/grub/i386-pc/ntboot.mod differ
diff --git a/AIO/grub/i386-pc/version.mod b/AIO/grub/i386-pc/version.mod
index d26a6cf..b7cb411 100644
Binary files a/AIO/grub/i386-pc/version.mod and b/AIO/grub/i386-pc/version.mod differ
diff --git a/AIO/grub/i386-pc/wimboot.mod b/AIO/grub/i386-pc/wimboot.mod
index 9d35fa0..6737a0a 100644
Binary files a/AIO/grub/i386-pc/wimboot.mod and b/AIO/grub/i386-pc/wimboot.mod differ
diff --git a/AIO/grub/locale/az.cfg b/AIO/grub/locale/az.cfg
index e3585ce..6a73536 100644
--- a/AIO/grub/locale/az.cfg
+++ b/AIO/grub/locale/az.cfg
@@ -1,5 +1,5 @@
 ################################################################
-### Language	:	Azerbaijani
+### Language	:	Azərbaycanca
 ### Credits		:	Tofiq(tofiqrustamov2005@gmail.com)
 ### Date		:	18.09.2020
 ### Info		:	Please translate or edit the text in quotation marks ("") if it is not correct. \n is a newline, ${1} is the variable passed to functions.
@@ -32,13 +32,14 @@ set bootfiles="ISO, WIM, IMG, VHD və IMA fayllarından aç"
 set pewimboot="WimBoot`u WinPE ilə aç"
 #set listfiles="Faylların siyahısını tut"
 set fm="Fayl İdarəedicisi"
-set f6="Avtomatik aşkarla və "F6 SATA/RAID/SCSI Driver"dan istifadə et"
+set f6='Avtomatik aşkarla və "F6 SATA/RAID/SCSI Driver"dan istifadə et'
 set enabled="Aktiv"
 set disabled="Deaktiv"
 set disable="Deaktivləşdir"
 set bootfrom="ISO, WIM & VHD fayllarından aç"
 set installwiniso="Windows'u ISO faylından yüklə"
 set settings="Tənzimləmələr"
+set disablesb=""Bu sessiya üçün Təhlükəsiz Önyükləməni deaktiv edin""
 
 ### Help Menu
 set menu="Menyu"
@@ -116,4 +117,7 @@ set filefs2msg="Fayl sistemi müəyyən edilə bilmədi."
 set backupmbrmsg="MBRın nüsxəsini al..."
 set nobootablemsg="Bu faylı "boot" eləməyi dəstəkləmək olmur!"
 set setdefaultmsg="Növbəti addım üçün hansını standart olaraq təyin etmək istədiyinizi seçin."
-set getkeymsg="Davam etmək üçün [1] düyməsinə basın. Geri qayıtmaq üçün hərhansı bir düyməyə basın."
\ No newline at end of file
+set getkeymsg="Davam etmək üçün [1] düyməsinə basın. Geri qayıtmaq üçün hərhansı bir düyməyə basın."
+set vmmsg="Bu, virtual maşınlarda işləməyi dəstəkləmir. Zəhmət olmasa həqiqi komputerdən istifadə edin."
+set reinstallgrub2msg="Bu xüsusiyyətdən istifadə etmək üçün Grub`u yenidən yüklə.\nAIOCreator.exe -> Bootloaderlar -> Grub2."
+set sbenabledmsg="Bu funksiya Təhlükəsiz Önyükləmə aktivləşdirilmiş vəziyyətdə olarkən işləmir.\nZəhmət olmasa, Təhlükəsiz Önyükləməniyi deaktiv etməyi düşünün və yenidən cəhd edin."
\ No newline at end of file
diff --git a/AIO/grub/x86_64-efi/iorw.mod b/AIO/grub/x86_64-efi/iorw.mod
index 2fa7873..9fa9fad 100644
Binary files a/AIO/grub/x86_64-efi/iorw.mod and b/AIO/grub/x86_64-efi/iorw.mod differ
diff --git a/AIO/grub/x86_64-efi/memrw.mod b/AIO/grub/x86_64-efi/memrw.mod
index 11e3087..b645f6f 100644
Binary files a/AIO/grub/x86_64-efi/memrw.mod and b/AIO/grub/x86_64-efi/memrw.mod differ
diff --git a/AIO/grub/x86_64-efi/moddep.lst b/AIO/grub/x86_64-efi/moddep.lst
index 4da1ee0..092cb41 100644
--- a/AIO/grub/x86_64-efi/moddep.lst
+++ b/AIO/grub/x86_64-efi/moddep.lst
@@ -171,7 +171,7 @@ strtoull_test: functional_test
 bitmap:
 ntfs: fshelp
 multiboot: net linux video boot relocator mmap
-wimboot: lua map extcmd normal procfs xzio
+wimboot: lua map extcmd normal procfs xzio boot
 tpm: verifiers
 gcry_crc: crypto
 efiload: sbpolicy linuxefi extcmd
@@ -205,7 +205,7 @@ loadenv: disk extcmd
 bitmap_scale: bitmap
 probe: extcmd
 minix3:
-dp: net lua extcmd efinet
+dp: net lua sbpolicy extcmd efinet
 tar: archelp
 loadbios:
 hfs: fshelp
diff --git a/AIOCreator.exe b/AIOCreator.exe
index c157329..08a4211 100644
Binary files a/AIOCreator.exe and b/AIOCreator.exe differ
diff --git a/EFI/BOOT/grubia32.efi b/EFI/BOOT/grubia32.efi
index 212c391..d77d9a0 100644
Binary files a/EFI/BOOT/grubia32.efi and b/EFI/BOOT/grubia32.efi differ
diff --git a/EFI/BOOT/grubx64.efi b/EFI/BOOT/grubx64.efi
index 3db1b0b..b3596e3 100644
Binary files a/EFI/BOOT/grubx64.efi and b/EFI/BOOT/grubx64.efi differ