diff --git a/Projects/PhoenixPE/100-ConfigSource.script b/Projects/PhoenixPE/100-ConfigSource.script
index bc36a09..5062299 100644
--- a/Projects/PhoenixPE/100-ConfigSource.script
+++ b/Projects/PhoenixPE/100-ConfigSource.script
@@ -35,8 +35,8 @@ Author=Homes32
 Level=1
 Selected=True
 Mandatory=True
-Version=1.1.2.0
-Date=2023-03-04
+Version=1.1.3.0
+Date=2023-06-21
 
 [Variables]
 
@@ -337,7 +337,7 @@ Set,%FidoURL%,"https://github.com/pbatard/Fido/releases/latest/download/Fido.ps1
 If,QUESTION,"You are about to download and run the open source Fido powershell script. This will allow you to choose which Windows ISO image to download from Microsoft's servers.#$x#$xFor more info please visit [https://github.com/pbatard/Fido].#$x#$xAre you ready to continue?",Begin
   WebGet,%FidoURL%,"%ProjectTemp%\Fido.ps1.lzma"
   7z,"x -y #$q%ProjectTemp%\Fido.ps1.lzma#$q -o#$q%ProjectTemp%#$q"
-  ShellExecuteEx,Open,"powershell.exe","-noexit –ExecutionPolicy Bypass & #$q%ProjectTemp%\Fido.ps1#$q"
+  ShellExecuteEx,Open,"powershell.exe","-noexit –ExecutionPolicy Bypass -File #$q%ProjectTemp%\Fido.ps1#$q"
 End
 
 [#ExtractISO#]
diff --git a/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script b/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script
index 305149a..7d12a6a 100644
--- a/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script
+++ b/Projects/PhoenixPE/Applications/Multimedia/FastStoneViewer.script
@@ -32,9 +32,9 @@
 Title=FastStone Image Viewer
 Author=Homes32
 Level=5
-Version=1.1.0.1
+Version=1.1.1.0
 Description=(v7.7 x86) An image browser, converter and editor that supports all major graphic formats.
-Date=2022-11-13
+Date=2023-06-21
 Selected=False
 Mandatory=False
 
@@ -147,8 +147,8 @@ TXTAddLine,"%TxtDB%","  DarkSkin = %cb_DarkMode%",APPEND
 TXTAddLine,"%TxtDB%","end",APPEND
 
 // Convert to binary file
-ShellExecute,Hide,"%ProjectTemp%\%ProgramFolder%\dfmconvert.exe","--to-binary %TxtDB% --output %ProjectTemp%\%ProgramFolder%\FSSettings.db"
-ShellExecute,Hide,"%Tools%\%HostArch%\binmay.exe","-u %ProjectTemp%\%ProgramFolder%\FSSettings.db -s FF0A005450524F4752414D53455454494E47530030102F000000 -r #$q#$q"
+ShellExecute,Hide,"%ProjectTemp%\%ProgramFolder%\dfmconvert.exe","--to-binary #$q%TxtDB%#$q --output #$q%ProjectTemp%\%ProgramFolder%\FSSettings.db#$q"
+ShellExecute,Hide,"%Tools%\%HostArch%\binmay.exe","-u #$q%ProjectTemp%\%ProgramFolder%\FSSettings.db#$q -s FF0A005450524F4752414D53455454494E47530030102F000000 -r #$q#$q"
 FileCopy,"%ProjectTemp%\%ProgramFolder%\FSSettings.db","%TargetPrograms%\%ProgramFolder%\FSSettings.db"
 
 Set,%TxtDB%,Nil
diff --git a/Projects/PhoenixPE/Core/200-PreFlight.script b/Projects/PhoenixPE/Core/200-PreFlight.script
index d6c69a7..12d00fb 100644
--- a/Projects/PhoenixPE/Core/200-PreFlight.script
+++ b/Projects/PhoenixPE/Core/200-PreFlight.script
@@ -35,8 +35,8 @@ Author=Homes32
 Level=2
 Selected=True
 Mandatory=True
-Version=1.1.2.0
-Date=2022-12-21
+Version=1.1.3.0
+Date=2023-06-21
 
 [Variables]
 // Minimum PEBakery version that has the command/feature set that is compatible with PhoenixPE.
@@ -46,17 +46,17 @@ Date=2022-12-21
 Echo,"Starting Pre-Flight Check..."
 
 Run,%ScriptFile%,CheckEngine
-Run,%ScriptFile%,CheckOutputDir
+Run,%ScriptFile%,CheckPaths
 If,%cb_CheckFreeSpace%,Equal,True,Run,%ScriptFile%,CheckDiskSpace
 Run,%ScriptFile%,CheckTools
 If,%cb_CheckForSupportedBuildVer%,Equal,True,Run,%ScriptFile%,CheckVerifiedBuilds
 Run,%ScriptFile%,CheckWinREVersion
 
-[#CheckOutputDir#]
+[#CheckPaths#]
 // ===============================================================================================================================
-// Name...........: CheckOutputDir
+// Name...........: CheckPaths
 // Description....: Verify that %OutputDir% is not a root drive (ie. d:\). This will cause issues with creating/cleaning up
-//                  the build environment. 
+//                  the build environment.
 // Syntax.........: 
 // Parameters.....: 
 // Return values..: 
@@ -64,11 +64,12 @@ Run,%ScriptFile%,CheckWinREVersion
 // Remarks........: 
 // Related........: Called by [Process]
 // ===============================================================================================================================
-[CheckOutputDir]
+[CheckPaths]
 System,SetLocal
+// Check if output is the root of a drive
 StrFormat,SPLIT,%OutputDir%,"\",0,%NumSplits%
 If,%NumSplits%,Equal,1,Begin
-  Message,"Error: Setting the OutputDir to the root of a drive is not supported.",Error
+  Message,"Setting the OutputDir to the root of a drive is not supported.",Error
   Halt,"Error: Setting the OutputDir to the root of a drive is not supported."
 End
 System,EndLocal
@@ -218,7 +219,7 @@ Halt,"The build cannot continue because [ #1 ] is missing."
 // ===============================================================================================================================
 [GetWaikTools]
 Echo,"Downloading required tools from Windows 10 ADK...#$x#$xThis will only need to be done once."
-ShellExecute,Open,"%Tools%\%HostArch%\GWT.exe","-Win10 -Win10dism -Silent -folder:%ProjectTemp%"
+ShellExecute,Open,"%Tools%\%HostArch%\GWT.exe","-Win10 -Win10dism -Silent -folder:#$q%ProjectTemp%#$q"
 DirCopy,"%ProjectTemp%\ADK_6\x86\*.*","%Tools%\x86"
 DirCopy,"%ProjectTemp%\ADK_6\amd64\*.*","%Tools%\x64"
 If,Not,ExistFile,"%Tools%\x64\Oscdimg\oscdimg.exe",Halt,"Error downloading required Windows 10 ADK tools. The build cannot continue."