more reorganizing and minor app updates

2025-09-17 02:28:09 +02:00 · 2020-10-21 22:08:47 -05:00
parent 2ff0b17001
commit 11aef7e96a
75 changed files with 5530 additions and 4878 deletions
--- a/Projects/PhoenixPE/Applications/Accessibility/Osk.script
+++ b/Projects/PhoenixPE/Applications/Accessibility/Osk.script
@@ -49,6 +49,8 @@ Echo,"Processing %ScriptTitle%..."
 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

+// The Taskbar keyboard toggle button doesn't work in WinPE, 
+// so we include our program that places an icon in the system tray that allows us to toggle the OSK on/off.
 ExtractAllFiles,%ScriptFile%,%SourceArch%,%TargetSystem32%

 RequireFileEx,Append,\Windows\System32\osk.exe
@@ -86,7 +88,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessibility"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"On Screen Keyboard"
 WriteInterface,Value,%ScriptFile%,Interface,cb_OskTray,True
 System,Cursor,Normal
@@ -139,7 +141,7 @@ cb_DesktopShc=Desktop,1,3,12,64,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,83,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,102,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,121,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessibility
 txt_ShortcutName="Shortcut Name:",1,0,12,203,119,21,"On Screen Keyboard"
 cb_OskTray="Show icon in Notification Area",1,3,152,64,192,18,False,"__Allows you to show/hide the On Screen Keyboard from the System Tray"

@@ -183,6 +185,7 @@ lines=10
 8=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
 9=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
 10=hGcp7jGsB/7wMSJz8Vi8WmYQ5ycqFJ9OWVgrcM9VRyu08dVjqSjmKO+4O/gTWvzFn2aFRW6qsy+2bsIn4eb+jGOwLlH9DslGeGZRA2VXT6PbIfJXToMCvd3BpeE3CKVhn7RWdk9APmpS5WLCkL0cs72RGo77xCa1k8QmxkqTiTlqVpneUnMw/ALYG31RJdFeXzD055/qFBAhIzoJSTnPoakCva2P7WrFUsx7Vcagw3G0HM6UQxpOAVuhU/wcL65Km/SyoYyuVD8cOEpCuINo2pww4j0uTaf2FqoGBa2xCKJjiyvROjD2b8FpTpJ7uHdfyT/idkodR3meNqSiV1no3GZfxeJXNZLznYO36alVXP5Csr8/BHo/wR5hIFw9siAOgxDtlWIlFcpbZ1m0jHuPWacM1Wc8Vt/gHYdjFZkrJUCGPwwkCZFi5aUbcy9sS904N1aVtYcWBp7vix2ww4V/jefHYckNudnAxLpXx4hnF4xmyg6A5EmUZHgHMMScvmQJEjnTkSX7dwA/g0u8Znm+6loFFyY8kAAAAMslWelGZ78kAAHn8gGA1AQ9RFBBscRn+wIAAAAABFlaeJzj9i/ODilKrNRLrUhlGAUjD2gxgqmeSuzSTw9WJDKxAQBMRwgAVXxj1gEAAAACAAAAJwAAAIx5AAAAAAAAAQAAAAAAAAAAAAAA
+
 [EncodedFile-x86-OskTray.exe]
 lines=7
 0=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
@@ -204,4 +207,3 @@ lines=3
 [AuthorEncoded]
 OSK_80.png=9239,12412
 Logo=OSK_80.png
-
--- a/Projects/PhoenixPE/Applications/Backup
+++ b/Projects/PhoenixPE/Applications/Backup
@@ -223,7 +223,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Imaging"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AOMEI Backupper"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [en]"
@@ -285,7 +285,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Imaging"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"AOMEI Backupper"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of AOMEI Backupper in your build."
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
--- a/Projects/PhoenixPE/Applications/Backup
+++ b/Projects/PhoenixPE/Applications/Backup
@@ -123,7 +123,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Imaging"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Fabs AutoBackup7 Pro"
 WriteInterface,Value,%ScriptFile%,Interface,fb_SrcFiles,""
 WriteInterface,Value,%ScriptFile%,Interface,txt_OrderNumber,""
@@ -183,7 +183,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Backup & Imaging"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Fabs AutoBackup7 Pro"
 bvl_Options=Options,1,12,150,212,477,62,8,Bold
 lbl_Language=Language,1,1,159,227,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Productivity/ImgBurn.script
+++ b/Projects/PhoenixPE/Applications/Productivity/ImgBurn.script
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -95,7 +95,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"CD/DVD"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Imaging"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"ImgBurn"
 System,Cursor,Normal

@@ -152,7 +152,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,CD/DVD
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Backup & Imaging"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,ImgBurn

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Backup
+++ b/Projects/PhoenixPE/Applications/Backup
@@ -41,20 +41,22 @@ Date=2020-03-01
 [Variables]
 %ProgramFolder%="ProduKey"
 %ProgramExe%="ProduKey.exe"
-%DownloadURL32%=https://www.nirsoft.net/utils/produkey.zip
-%DownloadURL64%=https://www.nirsoft.net/utils/produkey-x64.zip
+%DownloadURLx86%=https://www.nirsoft.net/utils/produkey.zip
+%DownloadURLx64%=https://www.nirsoft.net/utils/produkey-x64.zip
+%SetupFile%="ProduKey-%SourceArch%.zip"
 %aLangMap%=Arabic|produkey_arabic.zip|Azerbaijani|produkey_azerbaijani.zip|Bahasa Indonesia|produkey_bahasa_indonesia.zip|Belarussian|produkey_belarussian.zip|Bulgarian|produkey_bulgarian.zip|Catalan|produkey_catalan.zip|Chinese (Simplified)|produkey_schinese2.zip|Chinese (Traditional)|produkey_tchinese.zip|Czech|produkey_czech.zip|Danish|produkey_danish.zip|Dutch|produkey_dutch.zip|Estonian|produkey_estonian.zip|Finnish|produkey_finnish.zip|French|produkey_french1.zip|Galician|produkey_galician.zip|German|produkey_german.zip|Greek|produkey_greek.zip|Hangul|produkey_hangul.zip|Hebrew|produkey_hebrew.zip|Hungarian|produkey_hungarian.zip|Italian|produkey_italian.zip|Japanese|produkey_japanese1.zip|Korean|produkey_korean.zip|Latvian|produkey_latvian.zip|Lithuanian|produkey_lithuanian.zip|Mongolian|produkey_mongolian.zip|Norwegian|produkey_norwegian.zip|Persian|produkey_persian.zip|Polish|produkey_polish.zip|Portuguese (Brazil)|produkey_brazilian_portuguese3.zip|Portuguese (Portugal)|produkey_portuguese.zip|Romanian|produkey_romanian.zip|Russian|produkey_russian1.zip|Slovak|produkey_slovak.zip|Slovenian|produkey_slovenian.zip|Spanish|produkey_spanish.zip|Swedish|produkey_swedish1.zip|Taiwanese|produkey_taiwanese.zip|Thai|produkey_thai.zip|Turkish|produkey_turkish1.zip|Ukrainian|produkey_ukrainian.zip|Valencian|produkey_valencian.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,%TargetPrograms%\%ProgramFolder%

 ///////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +103,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip",#1
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1

 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -115,15 +117,29 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip",#1
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\ProduKey-x64.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\ProduKey-x86.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End

 [#LaunchProgram#]
@@ -138,9 +154,10 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\ProduKey-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%\%SourceArch%
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%SourceArch%\%ProgramExe%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
 // ===============================================================================================================================
@@ -251,7 +268,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Recovery"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Imaging"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,ProduKey
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
@@ -300,8 +317,6 @@ lines=0
 lines=0
 0=eJy1UbFKxEAQnVyUDXgQK8HqDivLgB8QP2m7BVe4RYvYBb/AX7BLkSLb2fgRljZC4IqNXLhxJonc3Imdvtm3szPzdmdgASKy5TXQfgTvM4AzALgkLomUHvIMN4Nf4IYFzo2OjQ7ee/KcwWEB4ujYOMXbP8AYLUNVVZUIY0vQoECrMQ6aFMaayg7X4k3eWlszpjiDukH8njbeJKZeXzHGB/OkbjLZILHrvXmyB6cORipCEGFx2+mVEBRPL3MlBOWnfgUhKMPx/F4Iyvb8tH42u7h7vDtJd/okwI2WDUt9kcqBkuBkmQS4Ny+/sA8HfwM8hELcxoh99NF0AAtiOpHPeR9RHRb0FymiI7EnsaekB+ZqIuIb5VqqdaTpSbulO5j/aPcFyEG1mXic4wkoyk8p9U6t1MtMzmcYBSMN/GOC0OqM2OW3vpj1jYENAB6bCQRuFS7cAQAAAAIAAAAoAAAAJwEAAAAAAAABAAAAAAAAAAAAAAA

-
-
 [EncodedFile-InterfaceEncoded-FalsePositives.rtf]
 lines=3
 0=eJztfWmP40aW7fcC6j8I/vK6BygXY2VwjIeHXseeaferZ/vNYAABRjCWFLuopUlmZeUY9d/nXC6SmCmlSGWWxz3TKmeKS8Tljbucey7FlH9aVk1kS+tDLO3mhiVcLe2mLtpfbnfDuOLLW9eNiMmy+1039Sr63K36zXLrVoKpRHe7q2K0mxfdzv4aQgzbMbR7zSqsw/7cfi+G5LDj6uSnZdxumiYvsZEsIdcXi2Wstmu7WUa3slUdGhzfVX/lPy3/Ybmzm20dFgnHP52IRCUSPxxb8tMPxTrUiz+Hu8V3NP2rTxDJ9yLXWx+qhzLZWGYKOVkrm2RKyPzd9rYqQkVSv/r0+hUkCjlHS9Ku05K05STRrvOqsItvbbNqVRTZLB1zSOp0lIPE7abelrZupZXQ6S/bCmLhn5c2aGsAnx9dgb28y1bFkXz+IsbuNc+PJYuX1xy2LzaD/FlhMsP2hyuoz2L7g3y9l1/fFXX9tPzYyh2FpS0LGP9g+4Pk9OU1l+dinQvTSV08mLb43R+6medimJMPT8+8r/plyXNhxDQ7M/mfqhDed1c+FyNM8zOTf7ituqnnnM/S9MzUX30d8irc/bqbr8/OP2euX/2msnnhfj2s/JwTmdFnJPzWlk3huuubs0sX567/r0VoNhYHQ7cGnZwDzsHnbHGE34O/NTs7rXf4g2l7Z2txbubg7fHMg6e1PD+Tn5g5uFmrs/N6P4/njXys9fnJp+zzwME6PTu99/B4+pF3tTm/XHHqyg9dK8zldD4upINvhbmczON5e+cKczmVR1MP3hXmciKPpg7uFeZyEo0mHtlYmMspNJo7NnKPXpNSqKMXe7wUkxJomHTfA5aYlDz9rCOMFJNSp5/XGrZf2qTw7ecdI5OYFLz9xEeRO+Jf5zz0dE1q9R/Jya6rUA/EsHO5MaVWjQSdY2UX6tajhbGzKTetio1knc3BCRXtoayz1fVibXu8xrOVdnqlO6bc7LqgeijlypB61AHw5wTVSNCVQfVQzHNC6vHqnhlUI1nXB9VDSc8NqXadx30WvxxUQy3pg2k0+3Iw7Wf3uHQ8XVwOoWH6IXRGAi6HziDggEMjAZddMwg4cslIwmWXDBIeZfdxWyqeUTJGcq4vGcdizvZGU7J7JOg5JWMk6JklYyTrmdk9kvXMkjGS9QIl4/hexNlm62LJGEl5Tsk4FqSeyUMOgq4vGSMxzy4ZI2nP5yEHWc8qGSNJL1Iyjm8/qefwkIOU63HqWIy+OqQerUs/i4ccxDwTp0aynhNSjxf4XB5ykPQCOHV8x/HotsH4juMxC2lvKh6K3mh+dm7+EQ/p5x94yH56ys5MP+Yh3fQRDzkI4GcF8AcCRjzkIECcE7APmkHAKFhGMuRZGQ+NOMKdkQx1TsYRH+pkjIrYSMa528fHjKjX4wQjOsi5GmdGUp5TvI4Fnb3BNJERHQRdjzMjMc8uXiNpz2dEB1nPwpmRpOfiTLtQty23VZOXXy2r4JPlDbyySZZ5eRuSx4e4UscHsfvU4U4A7Z0Q8eDwg7FnRJy5YCeCcXN8ELtPHU6+ev2KDtP+CSEPDifjgwchJw/vhWS8P4GN9kTGv1q61f0uVGWxeb90TbFpaFGuXllPyzptche3Zbm9C/7S1BOr+USfG/mA4Ngt9p9g1ZwvWve3p3YWp/5aLpZlkSwr/NSWJ/hdcsBVXa5vy4Yt7wrvmnJnq+VdZXeYZXF4aeudLXcrSxub2/UyWnvbbJfW/+W2bqriZtVAILQp6VfR2F2y+LTcbP+K+Nyut01Y/LSsm/sy1KsQmp9+PiXI+U3pVkiami2WNib4gVWWdng4AIo0VTcgGRluuf/4/uhzfXdTFb49sNkdnet2Fst6Ez42EFP/NW6rtW2wtauKbVU098niz3So7BwFbTDMel80xYeAYXVYF6vC+7DBzu0Gm+G2Dv5IAFv8vrPD4p2t7A3sslr8cbtpWoFYZ1Mzhl/V9s4vmyo29b8Vvln9VmBnhwuVLDH9ZnXYjOVwPjb7rXy/VdGWy3cWPsFG7DZyGBjR2703CFWMqj+EqgGAYSuvfDW8l/173r9X/bu/Kfdbw7FV//7hYpBitS8WIQ/io/P/Z48Rxp7weRcoix9sXgZ4F6utmRrZ5HOtvssOdn7l2bI9f82yc4u1bTfJYAHIrgnimH4Y8c19VRfAOGG04BI5/K60BQgAZu2zRx9nz8lFnFb9oAglYKdAq8nWvT918cOlF79D2d1fP33i+uMr35bAdRo/uvCJBessUcawxdcD+A+ZDblm5uXMg8udh5d+vUyalCsDROkq0JES7ZJ3NzvkO2AcG8sCv/oIOqRpTqmafLo8opVHFyWB7QbnmRQy7bbRyGRSEXDTnjGSJ1m7LTOpJThaaysDxpnw5ZHd2u1UqUTobrzBikTajTEZ18x0xzNlssQky+N1L4+d3u/IFHy3E8sEwzB0fO2O4qlIpcY61sD41buqeycwFnK5zqv3v6UM6ze+v8W61zUyuvxjZR22fVHvgOVsuS6/tdVNO7babyGb/9kRxK0pt7/ZwGcNkxJnwAT+VKyxsbHVPbYYNCg2cfvTEnm+2laLf95uoIfd4PgW7rPN+Jirgm2K9fK+oudKluutWPp7s1xVvBXOFMZU4cNoCEswBluriqU0SHAMAtbXBSKLFAgeR2tOczdbFIibULNu+25beWCk7vZa0gqikh3t3tX0cVoncCMzprNPPVv5uC43dRdw7SZbrJpm949v39ZuFda2/nJduGpbb2Pzpduu325jLFx4S1d8i2oh2q11+enTEpwnVHeMcxiw3V4Rz8fKYO6yfYSLtqr2YSva6k2NrbzdurltmlAllGJ1cM2iKz3bO9egtsVmk/9lacPG+61DgbTu/Xr7IdRJt91xABC4G7ZEIoIGrfPg6/uaHvpDYIXyfrv5sC6To7NIuRtvG0vkMEJq+AD3Q+AHdIs4HmANtqxX27tdaV1YbUvfEOVYFjfoF5DkH4N3kI5JlGwfQrFpZ36kq9A0bISq2sIV8MLHEupt78MGqwofd/WqajY4jFpSlfXOLf0GLtjUuc9xFMXFBSwJAEMLa+noElH3H7R2f7Nu4xcbq3YgQ4L5mw9H2xha3FCUweY40++RjWkOVGsPtxtQ5y/Qx2788kMR7t6DZrB2q3a2RLWBK29axhCs7zfjdtuAK5X3zd2m2ARyzX571ayRIPUOiyg3qwb1EMtaAv/KJrflBtVu03GZJabgCg57d+0ONqoGBKXcIJex8gAR2LqrCAxRx+yu2VLZKzYulCUEATtjEUrkrId4VOfd7nbjGizI1oXdSyEYqaDxAEubcAeBhMW3ZY1r3IDFUe2ORUN6bsjezT3MXhZ1g/PQdQN4aeplDKRbKMMHHHYf611DrAGwAO5V39HxQC610SGfSGkb28G3CMtyuWpHkN0aADboBMLQfbCtqRooS5NiRfagAx9s8zH/uHxfbXYVanizdBbZiHgrYcYFBU6BZNwR7Y2hSbpMvkMcx3UTixJ5tOBSJdQYRCDRbRWaVbVtGrh0WZQRrauzjSs3t7s236AP6hOSzi+G9CPqEj4mS5h3swpVaE/TMXKC0Ek3vKNDrmz3RsBetxm7aAvaBmfLD8gmcCVXrelAY6uG9osWdFPA3m4D6LyhsrdpPjZ28WVfDfvJHI6l6VDvqvkCWz64q+ZKbJXTr/zr8Ww1/cr54lefzonRrQEmq/GUqLQVNM0RT8kxL6VQNkUhCvKTklBtKoBTSx/7aP5sNJ6uZUe09Wfj9T896rD5WHbePoYOBgtMqo/pE5VSSnEiHdMEuKgHIQPnIxpxzJ3/aMs6LN5t65Yq1xMv8UDDgVwOwnsiuVe4de3P59RhbTMXccZC32/XYfGbDcxTVLf1W9oCNb2zVVgQnWo3TtgLa3/iYj2lXqzt/Vxbn1Fz4UNDfOs6cYsy3BS0sOawqguSsMCpqtl6YRed+X6otn+xm7e7LTGuAvX/fnG7ubMgYH6xq1DH7Xrxq3f//92vv1z8sAoIzW5ZIM+QAUtH+/oVRexuiNgvF7/fLlBrF/m2QYVbVGG3rYhCLujvRhbNdvFutQ2b4uO7P0DWh1
--- a/Projects/PhoenixPE/Applications/Benchmarking/FurMark.script
+++ b/Projects/PhoenixPE/Applications/Benchmarking/FurMark.script
@@ -148,7 +148,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Benchmarking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"FurMark"
 System,Cursor,Normal

@@ -207,7 +207,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Benchmarking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,FurMark

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Benchmarking/Prime95.script
+++ b/Projects/PhoenixPE/Applications/Benchmarking/Prime95.script
@@ -41,19 +41,21 @@ Date=2020-09-22
 [Variables]
 %ProgramFolder%="Prime95"
 %ProgramExe%="prime95.exe"
-%ProgramIni%="prime.txt"
+%ConfigFile%="prime.txt"
 %DownloadURLx86%=http://www.mersenne.org/ftp_root/gimps/p95v303b6.win32.zip
 %DownloadURLx64%=http://www.mersenne.org/ftp_root/gimps/p95v303b6.win64.zip
-%SetupFile%="prime95_x86.zip"
+%SetupFilex86%="prime95_x86.zip"
+%SetupFilex64%="prime95_x64.zip"

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-Run,%ScriptFile%,CheckArch
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
+
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"

@@ -63,7 +65,7 @@ Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"
 Echo,"Configuring %ScriptTitle%..."

 // Configure Prime95 in stress testing mode.
-TxtAddLine,"%TargetPrograms%\%ProgramFolder%\%ProgramIni%","StressTester=1",Append
+TxtAddLine,"%TargetPrograms%\%ProgramFolder%\%ConfigFile%","StressTester=1",Append

 ///////////////////////////////////////////////////////////////////////////////////
 // Shortcuts
@@ -73,14 +75,6 @@ If,%cb_StartMenuShc%,Equal,True,AddShortcut,StartMenu,%txt_StartMenuFolder%,%txt
 If,%cb_PinToTaskbar%,Equal,True,PinShortcut,Taskbar,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"
 If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"

-[#CheckArch#]
-[CheckArch]
-If,%SourceArch%,Equal,x64,Begin
-  Set,%SetupFile%,"prime95_x64.zip"
-  Set,%DownloadURL%,%DownloadURLx64%
-End
-Else,Set,%DownloadURL%,%DownloadURLx86%
-
 [#ExtractProgram#]
 // ===============================================================================================================================
 // Name...........: ExtractProgram
@@ -109,10 +103,33 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
 // ===============================================================================================================================
 [DownloadProgram]
 Echo,"Downloading %ScriptTitle%..."
-Run,%ScriptFile%,CheckArch
+Run,%ScriptFile%,SetProgramArch
 WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."

+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %SetupFile%      - The x86 or x64 name of the setup file.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%SetupFile%,%SetupFilex64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%SetupFile%,%SetupFilex86%
+End
+
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -126,7 +143,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 // ===============================================================================================================================
 [LaunchProgram]
 Echo,"Launching %ScriptTitle%..."
-Run,%ScriptFile%,CheckArch
+Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
@@ -163,7 +180,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Benchmarking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Prime95"
 System,Cursor,Normal

@@ -222,7 +239,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Benchmarking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Prime95

 [InterfaceEncoded]
@@ -261,11 +278,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
-
-
-
 [EncodedFile-AuthorEncoded-1024px-Prime95_icon_(green).svg.png]
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAABAAAAAQAAgMAAAACc8MQAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACVBMVEUA/wAAAP////97k8/FAAAAAWJLR0QCZgt8ZAAAAAd0SU1FB+MHBBYjJYxA9C8AAAPLSURBVHja7d3RDYAgDEBBlmT/VZzABLAQWu/9ikLv24TWJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEnStfWXRp8DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOpAvK0DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQFiF4PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgHcMMEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUB9gFgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkBfgNwEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJB7j9woTw/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIDCAH2y1fd3nw8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMP7h1XW7AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADEAUSvPw0DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEi4IQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg2HlWN+ofAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsB/i6AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgXoBjf17cek4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgMECWwQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9QcHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKx/IPoChF2Dhp0PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAgSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKmewAfG3zRxunQLwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOS0wNy0wNFQyMjozNTozNyswMDowMP/MPw0AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTktMDctMDRUMjI6MzU6MzcrMDA6MDCOkYexAAAAAElFTkSuQmCCeJxTNjQwMimo0A0oysxNtTSNz0zOz4vXSC9KTc3T1CsuS9cryEtnGAXDFlxnwS//YKn0PEYGAGGnDz9uwIujAQAAAAIAAAA7AAAA1wQAAAAAAAABAAAAAAAAAAAAAAA
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -326,7 +326,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Beyond Compare"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [en]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ShellExt,True
@@ -407,7 +407,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Productivity
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Beyond Compare"
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -35,29 +35,31 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-05-27

 [Variables]
 %ProgramFolder%="Dependencies"
 %ProgramExe%="DependenciesGui.exe"
-%SetupFile%="Dependencies_x86.zip"
-%DownloadURL32%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x86_Release.zip
-%DownloadURL64%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x64_Release.zip
+%SetupFilex86%="Dependencies_x86.zip"
+%SetupFilex64%="Dependencies_x64.zip"
+%DownloadURLx32%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x86_Release.zip
+%DownloadURLx64%=https://github.com/lucasg/Dependencies/releases/latest/download/Dependencies_x64_Release.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%SetupFile%,"Dependencies_x64.zip"
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
-Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%TargetPrograms%\%ProgramFolder%"
+Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"
+FileVersion,"%TargetPrograms%\%ProgramFolder%\%ProgramExe%",%ProgramVer%
+Echo,"Program Version: %ProgramVer%"

 ///////////////////////////////////////////////////////////////////////////////////
 // Settings
@@ -71,6 +73,21 @@ If,%cb_StartMenuShc%,Equal,True,AddShortcut,StartMenu,%txt_StartMenuFolder%,%txt
 If,%cb_PinToTaskbar%,Equal,True,PinShortcut,Taskbar,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"
 If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"

+[#ExtractProgram#]
+// ===============================================================================================================================
+// Name...........: ExtractProgram
+// Description....: Extract program files from script/setup files.
+// Syntax.........: Run,%ScriptFile%,ExtractProgram,<DestDir>
+// Parameters.....: #1 DestDir - The directory where the files will be extracted.
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[ExtractProgram]
+Echo,"Extracting files..."
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
+
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
@@ -83,18 +100,31 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  Set,%SetupFile%,"Dependencies_x64.zip"
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End
-  
+
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -107,9 +137,78 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%SetupFile%,"Dependencies_x64.zip"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
-Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%ProjectTemp%\%ProgramFolder%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"
+
+[#ExtractProgram#]
+// ===============================================================================================================================
+// Name...........: ExtractProgram
+// Description....: Extract program files from script/setup files.
+// Syntax.........: Run,%ScriptFile%,ExtractProgram,<DestDir>
+// Parameters.....: #1 DestDir - The directory where the files will be extracted.
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[ExtractProgram]
+Echo,"Extracting files..."
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
+
+[#DownloadProgram#]
+// ===============================================================================================================================
+// Name...........: DownloadProgram
+// Description....: Download the program files from the author's website.
+// Syntax.........: Run,%ScriptFile%,DownloadProgram
+// Parameters.....: 
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+End
+
+[#LaunchProgram#]
+// ===============================================================================================================================
+// Name...........: LaunchProgram
+// Description....: Unpack and launch the program.
+// Syntax.........: Run,%ScriptFile%,LaunchProgram
+// Parameters.....: 
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: btn_LaunchProgram
+// ===============================================================================================================================
+[LaunchProgram]
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
@@ -145,7 +244,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Dev Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Dependencies"
 System,Cursor,Normal

@@ -205,7 +304,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Dev Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Dependencies
 lbl_RuntimeNote="Note: Dependencies requires the .Net Framework and the latest Visual C++ Runtime.",1,1,5,295,563,16,8,Bold

@@ -225,7 +324,6 @@ Logo=Dependencies_48.png
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAZiS0dEAP4A/gD+6xjUggAAAAlwSFlzAAAASAAAAEgARslrPgAAAAl2cEFnAAAAEAAAABAAXMatwwAAAiJJREFUOMutkz1oU2EUhp/vu3/5ublJappqqDRiIlYXFStKxy4WdCkibhXcXMVRBEGhUB0V3BsFRTqIQnHQRRSnFKzUIuK/TdPGJG2Te2/u/dwq1tIK+k5nOc9wzvPCP0asTUkDFAKlQBOKH/7fU/SRPpS6w4HHA6OHHh25kh/f3ztUGUYUYlvuSgChg8id1SIR/UQqHbnU25+6t/Bgflgv2nrm/K6tAXRCiCu0VSH0VYGtGUd7somJgZHitaTj5E4+PwV95mYABbKDtgraskRf0YkGsXS3nblQLOTvf39aH9YKXXp2tH9jgAoAQmTbwHAj6J6N4TlYHUemI+lj+Z09E0OnB6525eK5My/PQVZfd4NQggLdj2P4DlbHwVRRpBSEmotmddKZ7sTFvQf77k4/LBcOXx789QAAQg0CMIIYMjCpeYtU3Xnqfg2PNioSYjmWSIWZWKfum16ivQ4gFKR3sORWeL+yQKU1jy9diCpkUiANvblcdUufXyxdd0uNOSx+BygRksrsYa45Q0dfhQRoKYHlmEprm9PerBhrlLxJsxhpuTTAXQdAU4SLISIZIJOC+DaLpGU31VejVH/m3aje/vjWiCZYfrP0p4QA0hQ03lXZnbdVtieG3bLL9bI/NnezMpncF28B+K3mxhYDyHqAqs4Ex58MTiUWrS8fpmq3Xo2XZ41YjNrrb5uauFYmM7YdFYZSha7QLSdoNz9t2YP/kp+AfsdFsD8fGgAAAC56VFh0Y3JlYXRlLWRhdGUAAHjaMzIwsNA1sNA1MgkxMLAyMrMyNNY1MLUyMAAAQe0FE0pvDAgAAAAuelRYdG1vZGlmeS1kYXRlAAB42jMyMLDQNbDQNTIIMbSwMrG0MrLQNTC1MjAAAEKCBSOylbeyAAAAInpUWHRTb2Z0d2FyZQAAeNpzTMlPSlXwzE1MTw1KTUypBAAvnAXUrgypTQAAAABJRU5ErkJggnic4ynISazUzcgv0SvIS2cYBSMNeDLjl/9974ElIwMACj8H7bPi5SwBAAAAAgAAACQAAABJAwAAAAAAAAEAAAAAAAAAAAAAAA

-
 [EncodedFile-InterfaceEncoded-Trash.ico]
 lines=0
 0=eJx10/1PEnEcB/DzYT2s7GHNHpYrY2221dbjVlsPs9asNVdtPfsHNEtt+ZRsyXjyNAFBHgQjKQi0YEIiBmJmoM5MwTISrOzB0jSndRToYctPd7Yro/re3vfD9+51973P53sIEkEcixYhxDkeSY1GkKUIgqwjQkwRMz/nyZEYjfw1Dh08MGff3sSYlDOndyQkJAiIyIko/hM5jUbjxsWtXL5t65b5R48cnkU+o1wiijx54jjb5eoEj8cDvT4f4DgOg4ODYLXWQUWFEszmGnj6tBtkMhnQ4uOXZV9Ii5i5DpTFyFKpVFMajQa0Wi1YLBYwGAwgkYgBRQugtFQEarUaOGxWIHHXzsXh36EuZpx67+vGxj68w0IT41goFMI+j41ifZ4n/h5XO9bV0jQdvbT4MW31qiXh3iTnn6d8T2NtsFHKDnVZTcG7gsu4hUfHOx/Yp71NI38VHRm5NNzfEjDyST/U1+u3C/NDtuKcSVetPlgvZOBmNCvUqCkPkP7+7RsDC+bNXRPuDWKuiPQ9TdavzUoejo2M+Mn1v3rWjTVXKoPmwks46R2mqqHYhTEbw3217IqG9B57TcBemP6NWMcX0r/xPcNqWecnbSLmBOlb64wfaSti91wVFP5R/3taeR3ph1+/wF4+dAbc+oqJkcEBrNOkCzq15cF2W42f9O0NltENa+KS5byCP7zluqSNqt/rR86Ag5/5zV1TOd6Apk/aRQycqr/L0fBpx/q1KWU8NJKyrfW1Ea13tL2Ux8cD2AuHNeg26cbbNJKJ7pYmP+XdzfexpO2bzmWnpUZRXlcmnNNpqx74V//7+55jM/tP5tj+3fnJB5NmU76Qw0rj83lTErEYhCUloFQqp/egQqEADocDubk5QKfToaioCMTEPedSU8cOHUiaR3leEcro6HgEPq8XHne5YXh4CIj3Q39/P9TX20ClugY6nRaczU7wenuIf0D6PetC+q+/UaVUbMjIyLgnlUqnyH1ebdCDvqoSblXqpve+Ql4GIqEQTEYjCPh8yM3JloX3nxzE2jfT8/K4N9XqD1U6nYfPK85mMpk3Mi9ezEMLCoxcDvssyuXGhzsW0UlH1D8S8Tus8BDX3xIV/AEUry6xeJzjDClKLM7Qy0zOZxgFIxDUsUBoV2bs8iFCkXoMbAB8oQUybAHR5gEAAAACAAAAJAAAAEUDAAAAAAAAAQAAAAAAAAAAAAAA
@@ -246,8 +344,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
 [EncodedFile-AuthorEncoded-Dependencies_48.png]
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQ5JREFUeNrsmlEKwyAMhrXkHnqHXain2Kv4ulN4oZ3JMdighY0RzR91JC9FKCa/fyIftL7W6lYObwImEaCtwosLyDmrVJ5SEhWwoQuOMZ6e0kHHxb7vUDGlFKyAY4QQlhhi+vXC5XZe36/Ocefl1fdjBGgXpCLAHBgtgOvIUAeeQzuzI4S+p4ey0Ls1ACfspR34tGFFJZWMzS0eJLyfOpZLC3DKWL5OC33DckIk08RyQp8cGstJqwVQWM4RUFGDCHcAdbNoO+CWdYCTqMetFiznOOB75gSF5ZAW0sRymrGvRwpQR26jUaNRo1GjUaNRo9H/pdGWBDPRaAsWGI2yWUL4S706C9m/EiagMx4CDADHS4QlKqWKdgAAAABJRU5ErkJggnicE3ZJLUjNS0nNS85MLY43sdAryEtnGAUjBjQy4pf/+3S2FiMDAByeCkO/E1aoAQAAAAIAAAArAAAAgQEAAAAAAAABAAAAAAAAAAAAAAA
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -35,29 +35,29 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-05-27

 [Variables]
 %ProgramFolder%="Dependency Walker"
 %ProgramExe%="depends.exe"
-%SetupFile%="depends_x86.zip"
-%DownloadURL32%=https://www.dependencywalker.com/depends22_x86.zip
-%DownloadURL64%=https://www.dependencywalker.com/depends22_x64.zip
+%SetupFilex86%="depends_x86.zip"
+%SetupFilex64%="depends_x64.zip"
+%DownloadURLx86%=https://www.dependencywalker.com/depends22_x86.zip
+%DownloadURLx64%=https://www.dependencywalker.com/depends22_x64.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%SetupFile%,"depends_x64.zip"
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
-Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%TargetPrograms%\%ProgramFolder%"
+Run,%ScriptFile%,ExtractProgram,"%TargetPrograms%\%ProgramFolder%"

 ///////////////////////////////////////////////////////////////////////////////////
 // Settings
@@ -71,6 +71,21 @@ If,%cb_StartMenuShc%,Equal,True,AddShortcut,StartMenu,%txt_StartMenuFolder%,%txt
 If,%cb_PinToTaskbar%,Equal,True,PinShortcut,Taskbar,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"
 If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%ProgramFolder%\%ProgramExe%"

+[#ExtractProgram#]
+// ===============================================================================================================================
+// Name...........: ExtractProgram
+// Description....: Extract program files from script/setup files.
+// Syntax.........: Run,%ScriptFile%,ExtractProgram,<DestDir>
+// Parameters.....: #1 DestDir - The directory where the files will be extracted.
+// Return values..: 
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[ExtractProgram]
+Echo,"Extracting files..."
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1
+
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
@@ -83,18 +98,34 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+ 
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %SetupFile%     - The x86 or x64 setup file.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  Set,%SetupFile%,"depends_x64.zip"
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%SetupFile%,%SetupFilex64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%SetupFile%,%SetupFilex86%
 End
-  
+ 
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -107,9 +138,9 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%SetupFile%,"depends_x64.zip"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
-Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%ProjectTemp%\%ProgramFolder%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
@@ -145,7 +176,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Dev Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Dependency Walker"
 System,Cursor,Normal

@@ -205,7 +236,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Dev Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Dependency Walker"

 [InterfaceEncoded]
@@ -224,7 +255,6 @@ Logo=DependencyWalker.ico
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAZiS0dEAP4A/gD+6xjUggAAAAlwSFlzAAAASAAAAEgARslrPgAAAAl2cEFnAAAAEAAAABAAXMatwwAAAiJJREFUOMutkz1oU2EUhp/vu3/5ublJappqqDRiIlYXFStKxy4WdCkibhXcXMVRBEGhUB0V3BsFRTqIQnHQRRSnFKzUIuK/TdPGJG2Te2/u/dwq1tIK+k5nOc9wzvPCP0asTUkDFAKlQBOKH/7fU/SRPpS6w4HHA6OHHh25kh/f3ztUGUYUYlvuSgChg8id1SIR/UQqHbnU25+6t/Bgflgv2nrm/K6tAXRCiCu0VSH0VYGtGUd7somJgZHitaTj5E4+PwV95mYABbKDtgraskRf0YkGsXS3nblQLOTvf39aH9YKXXp2tH9jgAoAQmTbwHAj6J6N4TlYHUemI+lj+Z09E0OnB6525eK5My/PQVZfd4NQggLdj2P4DlbHwVRRpBSEmotmddKZ7sTFvQf77k4/LBcOXx789QAAQg0CMIIYMjCpeYtU3Xnqfg2PNioSYjmWSIWZWKfum16ivQ4gFKR3sORWeL+yQKU1jy9diCpkUiANvblcdUufXyxdd0uNOSx+BygRksrsYa45Q0dfhQRoKYHlmEprm9PerBhrlLxJsxhpuTTAXQdAU4SLISIZIJOC+DaLpGU31VejVH/m3aje/vjWiCZYfrP0p4QA0hQ03lXZnbdVtieG3bLL9bI/NnezMpncF28B+K3mxhYDyHqAqs4Ex58MTiUWrS8fpmq3Xo2XZ41YjNrrb5uauFYmM7YdFYZSha7QLSdoNz9t2YP/kp+AfsdFsD8fGgAAAC56VFh0Y3JlYXRlLWRhdGUAAHjaMzIwsNA1sNA1MgkxMLAyMrMyNNY1MLUyMAAAQe0FE0pvDAgAAAAuelRYdG1vZGlmeS1kYXRlAAB42jMyMLDQNbDQNTIIMbSwMrG0MrLQNTC1MjAAAEKCBSOylbeyAAAAInpUWHRTb2Z0d2FyZQAAeNpzTMlPSlXwzE1MTw1KTUypBAAvnAXUrgypTQAAAABJRU5ErkJggnic4ynISazUzcgv0SvIS2cYBSMNeDLjl/9974ElIwMACj8H7bPi5SwBAAAAAgAAACQAAABJAwAAAAAAAAEAAAAAAAAAAAAAAA

-
 [EncodedFile-InterfaceEncoded-Trash.ico]
 lines=0
 0=eJx10/1PEnEcB/DzYT2s7GHNHpYrY2221dbjVlsPs9asNVdtPfsHNEtt+ZRsyXjyNAFBHgQjKQi0YEIiBmJmoM5MwTISrOzB0jSndRToYctPd7Yro/re3vfD9+51973P53sIEkEcixYhxDkeSY1GkKUIgqwjQkwRMz/nyZEYjfw1Dh08MGff3sSYlDOndyQkJAiIyIko/hM5jUbjxsWtXL5t65b5R48cnkU+o1wiijx54jjb5eoEj8cDvT4f4DgOg4ODYLXWQUWFEszmGnj6tBtkMhnQ4uOXZV9Ii5i5DpTFyFKpVFMajQa0Wi1YLBYwGAwgkYgBRQugtFQEarUaOGxWIHHXzsXh36EuZpx67+vGxj68w0IT41goFMI+j41ifZ4n/h5XO9bV0jQdvbT4MW31qiXh3iTnn6d8T2NtsFHKDnVZTcG7gsu4hUfHOx/Yp71NI38VHRm5NNzfEjDyST/U1+u3C/NDtuKcSVetPlgvZOBmNCvUqCkPkP7+7RsDC+bNXRPuDWKuiPQ9TdavzUoejo2M+Mn1v3rWjTVXKoPmwks46R2mqqHYhTEbw3217IqG9B57TcBemP6NWMcX0r/xPcNqWecnbSLmBOlb64wfaSti91wVFP5R/3taeR3ph1+/wF4+dAbc+oqJkcEBrNOkCzq15cF2W42f9O0NltENa+KS5byCP7zluqSNqt/rR86Ag5/5zV1TOd6Apk/aRQycqr/L0fBpx/q1KWU8NJKyrfW1Ea13tL2Ux8cD2AuHNeg26cbbNJKJ7pYmP+XdzfexpO2bzmWnpUZRXlcmnNNpqx74V//7+55jM/tP5tj+3fnJB5NmU76Qw0rj83lTErEYhCUloFQqp/egQqEADocDubk5QKfToaioCMTEPedSU8cOHUiaR3leEcro6HgEPq8XHne5YXh4CIj3Q39/P9TX20ClugY6nRaczU7wenuIf0D6PetC+q+/UaVUbMjIyLgnlUqnyH1ebdCDvqoSblXqpve+Ql4GIqEQTEYjCPh8yM3JloX3nxzE2jfT8/K4N9XqD1U6nYfPK85mMpk3Mi9ezEMLCoxcDvssyuXGhzsW0UlH1D8S8Tus8BDX3xIV/AEUry6xeJzjDClKLM7Qy0zOZxgFIxDUsUBoV2bs8iFCkXoMbAB8oQUybAHR5gEAAAACAAAAJAAAAEUDAAAAAAAAAQAAAAAAAAAAAAAA
@@ -245,8 +275,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
 [EncodedFile-AuthorEncoded-DependencyWalker.ico]
 lines=0
 0=eJy9jzESgjAQRTcgQ6XpbKH0GB6BI21px5HIASw4gDGUVjmBsm4SGVlGGmf0b96Gvz8zCQCKqz4C9w3cMoA9AByYmuFxnEdlsCKMCxDTFoo/jDG8hwnFBURpCxVGof1QRSF90zci3lqZW9vPrbaL/NFLr0M7ReHi6rc/B5mvfHx/8un9QzPPi52X570f5l77RT4O0utP9/9ZJOWYlimJTE50mWB/1RxXRrkOlaMXjmmZkn8gR3WfKFGNGhVVTIc5reoJ+S++V3icE3FJLUjNS0nNS64MT8zJTi3Sy0zOZxgFIwX8Y4LQx3HIh7aFbmVgAwDmEAuV7mdk9AEAAAACAAAALwAAAMcAAAAAAAAAAQAAAAAAAAAAAAAA
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -137,7 +137,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Dev Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"NSudo"
 System,Cursor,Normal

@@ -196,7 +196,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Dev Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,NSudo
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 cb_EnableContextMenu="Enable Context Menu",1,3,157,104,181,18,True,"__Add 'Run As System' and 'Run as TrustedInstaller' to Explorer's context menu."
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -35,22 +35,22 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-03-01

 [Variables]
 %ProgramFolder%="Procexp"
-%ProgramExe%="Procexp.exe"
-%DownloadURL32%=https://live.sysinternals.com/Procexp.exe
-%DownloadURL64%=https://live.sysinternals.com/Procexp64.exe
+%ProgramExex86%="Procexp.exe"
+%ProgramExex64%="Procexp64.exe"
+%DownloadURLx32%=https://live.sysinternals.com/Procexp.exe
+%DownloadURLx64%=https://live.sysinternals.com/Procexp64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/procexp.chm

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"Procexp64.exe"
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
@@ -87,21 +87,38 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
-If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\Procexp64.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
-Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\Procexp.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."

 Echo,"Downloading %ScriptTitle% Help files..."
 WebGet,%DownloadURLCHM%,"%ProgramsCache%\%ProgramFolder%\Procexp.chm",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
  
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %ProgramExe%     - The x86 or x64 program name.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%ProgramExe%,%ProgramExex64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%ProgramExe%,%ProgramExex86%
+End
+ 
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -114,7 +131,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%ProgramExe%,"Procexp64.exe"
+Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
 ShellExecuteEx,Open,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%"

@@ -151,7 +168,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Process Explorer"
 System,Cursor,Normal

@@ -211,7 +228,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Process Explorer"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -35,22 +35,22 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-03-01

 [Variables]
 %ProgramFolder%="Procmon"
-%ProgramExe%="Procmon.exe"
-%DownloadURL32%=https://live.sysinternals.com/Procmon.exe
-%DownloadURL64%=https://live.sysinternals.com/Procmon64.exe
+%ProgramExex86%="Procmon.exe"
+%ProgramExex64%="Procmon64.exe"
+%DownloadURLx32%=https://live.sysinternals.com/Procmon.exe
+%DownloadURLx64%=https://live.sysinternals.com/Procmon64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/procmon.chm

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"Procmon64.exe"
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
@@ -114,21 +114,38 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
-If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\Procmon64.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
-Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\Procmon.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."

 Echo,"Downloading %ScriptTitle% Help files..."
 WebGet,%DownloadURLCHM%,"%ProgramsCache%\%ProgramFolder%\Procmon.chm",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
  
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %ProgramExe%     - The x86 or x64 program name.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%ProgramExe%,%ProgramExex64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%ProgramExe%,%ProgramExex86%
+End
+ 
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -141,7 +158,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%ProgramExe%,"Procmon64.exe"
+Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
 ShellExecuteEx,Open,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%"

@@ -178,7 +195,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Process Monitor"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AutoRunProcMon,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_EnableBootLogging,False
@@ -249,7 +266,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Process Monitor"
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 cb_AutoRunProcMon="Launch Process Monitor at boot",1,3,157,104,181,18,False,"__Select this option to automatically launch ProcMon when your PE boots.#$x#$xUseful for developers."
@@ -271,7 +288,6 @@ Logo=ProcMon_80.png
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAZiS0dEAP4A/gD+6xjUggAAAAlwSFlzAAAASAAAAEgARslrPgAAAAl2cEFnAAAAEAAAABAAXMatwwAAAiJJREFUOMutkz1oU2EUhp/vu3/5ublJappqqDRiIlYXFStKxy4WdCkibhXcXMVRBEGhUB0V3BsFRTqIQnHQRRSnFKzUIuK/TdPGJG2Te2/u/dwq1tIK+k5nOc9wzvPCP0asTUkDFAKlQBOKH/7fU/SRPpS6w4HHA6OHHh25kh/f3ztUGUYUYlvuSgChg8id1SIR/UQqHbnU25+6t/Bgflgv2nrm/K6tAXRCiCu0VSH0VYGtGUd7somJgZHitaTj5E4+PwV95mYABbKDtgraskRf0YkGsXS3nblQLOTvf39aH9YKXXp2tH9jgAoAQmTbwHAj6J6N4TlYHUemI+lj+Z09E0OnB6525eK5My/PQVZfd4NQggLdj2P4DlbHwVRRpBSEmotmddKZ7sTFvQf77k4/LBcOXx789QAAQg0CMIIYMjCpeYtU3Xnqfg2PNioSYjmWSIWZWKfum16ivQ4gFKR3sORWeL+yQKU1jy9diCpkUiANvblcdUufXyxdd0uNOSx+BygRksrsYa45Q0dfhQRoKYHlmEprm9PerBhrlLxJsxhpuTTAXQdAU4SLISIZIJOC+DaLpGU31VejVH/m3aje/vjWiCZYfrP0p4QA0hQ03lXZnbdVtieG3bLL9bI/NnezMpncF28B+K3mxhYDyHqAqs4Ex58MTiUWrS8fpmq3Xo2XZ41YjNrrb5uauFYmM7YdFYZSha7QLSdoNz9t2YP/kp+AfsdFsD8fGgAAAC56VFh0Y3JlYXRlLWRhdGUAAHjaMzIwsNA1sNA1MgkxMLAyMrMyNNY1MLUyMAAAQe0FE0pvDAgAAAAuelRYdG1vZGlmeS1kYXRlAAB42jMyMLDQNbDQNTIIMbSwMrG0MrLQNTC1MjAAAEKCBSOylbeyAAAAInpUWHRTb2Z0d2FyZQAAeNpzTMlPSlXwzE1MTw1KTUypBAAvnAXUrgypTQAAAABJRU5ErkJggnic4ynISazUzcgv0SvIS2cYBSMNeDLjl/9974ElIwMACj8H7bPi5SwBAAAAAgAAACQAAABJAwAAAAAAAAEAAAAAAAAAAAAAAA

-
 [EncodedFile-InterfaceEncoded-Trash.ico]
 lines=0
 0=eJx10/1PEnEcB/DzYT2s7GHNHpYrY2221dbjVlsPs9asNVdtPfsHNEtt+ZRsyXjyNAFBHgQjKQi0YEIiBmJmoM5MwTISrOzB0jSndRToYctPd7Yro/re3vfD9+51973P53sIEkEcixYhxDkeSY1GkKUIgqwjQkwRMz/nyZEYjfw1Dh08MGff3sSYlDOndyQkJAiIyIko/hM5jUbjxsWtXL5t65b5R48cnkU+o1wiijx54jjb5eoEj8cDvT4f4DgOg4ODYLXWQUWFEszmGnj6tBtkMhnQ4uOXZV9Ii5i5DpTFyFKpVFMajQa0Wi1YLBYwGAwgkYgBRQugtFQEarUaOGxWIHHXzsXh36EuZpx67+vGxj68w0IT41goFMI+j41ifZ4n/h5XO9bV0jQdvbT4MW31qiXh3iTnn6d8T2NtsFHKDnVZTcG7gsu4hUfHOx/Yp71NI38VHRm5NNzfEjDyST/U1+u3C/NDtuKcSVetPlgvZOBmNCvUqCkPkP7+7RsDC+bNXRPuDWKuiPQ9TdavzUoejo2M+Mn1v3rWjTVXKoPmwks46R2mqqHYhTEbw3217IqG9B57TcBemP6NWMcX0r/xPcNqWecnbSLmBOlb64wfaSti91wVFP5R/3taeR3ph1+/wF4+dAbc+oqJkcEBrNOkCzq15cF2W42f9O0NltENa+KS5byCP7zluqSNqt/rR86Ag5/5zV1TOd6Apk/aRQycqr/L0fBpx/q1KWU8NJKyrfW1Ea13tL2Ux8cD2AuHNeg26cbbNJKJ7pYmP+XdzfexpO2bzmWnpUZRXlcmnNNpqx74V//7+55jM/tP5tj+3fnJB5NmU76Qw0rj83lTErEYhCUloFQqp/egQqEADocDubk5QKfToaioCMTEPedSU8cOHUiaR3leEcro6HgEPq8XHne5YXh4CIj3Q39/P9TX20ClugY6nRaczU7wenuIf0D6PetC+q+/UaVUbMjIyLgnlUqnyH1ebdCDvqoSblXqpve+Ql4GIqEQTEYjCPh8yM3JloX3nxzE2jfT8/K4N9XqD1U6nYfPK85mMpk3Mi9ezEMLCoxcDvssyuXGhzsW0UlH1D8S8Tus8BDX3xIV/AEUry6xeJzjDClKLM7Qy0zOZxgFIxDUsUBoV2bs8iFCkXoMbAB8oQUybAHR5gEAAAACAAAAJAAAAEUDAAAAAAAAAQAAAAAAAAAAAAAA
@@ -292,8 +308,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
 [EncodedFile-AuthorEncoded-ProcMon_80.png]
 lines=3
 0=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
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -86,7 +86,6 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [LaunchProgram]
 ExtractAllFiles,%ScriptFile%,Bin,"%ProjectTemp%\%ProgramFolder%"
-System,GetEnv,PROCESSOR_ARCHITECTURE,%HostArch%
 If,%HostArch%,Equal,x86,ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\Regshot.exe"
 Else,ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\Regshot64.exe"

@@ -108,7 +107,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Regedit (Runscanner)"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [English]"
 System,Cursor,Normal
@@ -164,7 +163,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,RegShot2
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -35,26 +35,28 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-03-23

 [Variables]
 %ProgramFolder%="RegistryChangesView"
 %ProgramExe%="RegistryChangesView.exe"
-%DownloadURL32%=https://www.nirsoft.net/utils/registrychangesview.zip
-%DownloadURL64%=https://www.nirsoft.net/utils/registrychangesview-x64.zip
+%DownloadURLx86%=https://www.nirsoft.net/utils/registrychangesview.zip
+%DownloadURLx64%=https://www.nirsoft.net/utils/registrychangesview-x64.zip
+%SetupFile%="RegistryChangesView-%SourceArch%.zip"
 %aLangMap%=Arabic|registrychangesview_arabic.zip|Czech|registrychangesview_czech.zip|Dutch|registrychangesview_dutch.zip|French|registrychangesview_french.zip|German|registrychangesview_german.zip|Greek|registrychangesview_greek.zip|Hungarian|registrychangesview_hungarian.zip|Italian|registrychangesview_italian.zip|Japanese|registrychangesview_japanese.zip|Polish|registrychangesview_polish.zip|Russian|registrychangesview_russian.zip|Chinese (Simplified)|registrychangesview_schinese1.zip|Slovak|registrychangesview_slovak.zip|Spanish|registrychangesview_spanish.zip|Ukrainian|registrychangesview_ukrainian.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,%TargetPrograms%\%ProgramFolder%

 ///////////////////////////////////////////////////////////////////////////////////
@@ -97,7 +99,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip",#1
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1

 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -111,15 +113,29 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-x64.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-x86.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End

 [#LaunchProgram#]
@@ -134,9 +150,10 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\RegistryChangesView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%\%SourceArch%
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%SourceArch%\%ProgramExe%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
 // ===============================================================================================================================
@@ -185,7 +202,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"RegistryChangesView"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 Run,%ScriptFile%,DeleteCachedLangFile
@@ -247,11 +264,11 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,RegistryChangesView
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
-cmb_Language=Arabic,1,4,160,126,150,21,Arabic,"Chinese (Simplified)",Czech,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Polish,Russian,Slovak,Spanish,Ukrainian,_DeleteCachedLangFile_,True
+cmb_Language=English,1,4,160,126,150,21,Arabic,"Chinese (Simplified)",Czech,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Polish,Russian,Slovak,Spanish,Ukrainian,_DeleteCachedLangFile_,True

 [InterfaceEncoded]
 play-hot.png=841,1220
@@ -290,10 +307,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
-
-
 [EncodedFile-AuthorEncoded-Icon2.ico]
 lines=0
 0=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
--- a/Projects/PhoenixPE/Applications/Developer
+++ b/Projects/PhoenixPE/Applications/Developer
@@ -149,7 +149,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Dev Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Developer Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"x64dbg"
 System,Cursor,Normal

@@ -209,7 +209,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Dev Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Developer Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,x64dbg

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -41,20 +41,22 @@ Date=2020-03-01
 [Variables]
 %ProgramFolder%="BlueScreenView"
 %ProgramExe%="BlueScreenView.exe"
-%DownloadURL32%=https://www.nirsoft.net/utils/bluescreenview.zip
-%DownloadURL64%=https://www.nirsoft.net/utils/bluescreenview-x64.zip
+%DownloadURLx86%=https://www.nirsoft.net/utils/bluescreenview.zip
+%DownloadURLx64%=https://www.nirsoft.net/utils/bluescreenview-x64.zip
+%SetupFile%="BlueScreenView-%SourceArch%.zip"
 %aLangMap%=Arabic|bluescreenview_arabic.zip|Bulgarian|bluescreenview_bulgarian.zip|Chinese (Simplified)|bluescreenview_schinese2.zip|Chinese (Traditional)|bluescreenview_tchinese1.zip|Czech|bluescreenview_czech.zip|Danish|bluescreenview_danish.zip|Dutch|bluescreenview_dutch.zip|Farsi|bluescreenview_farsi.zip|Finnish|bluescreenview_finnish.zip|French|bluescreenview_french.zip|German|bluescreenview_german.zip|Greek|bluescreenview_greek.zip|Hungarian|bluescreenview_hungarian.zip|Italian|bluescreenview_italian.zip|Japanese|bluescreenview_japanese.zip|Korean|bluescreenview_korean.zip|Latvian|bluescreenview_latvian.zip|Polish|bluescreenview_polish.zip|Portuguese (Brazil)|bluescreenview_brazilian_portuguese.zip|Romanian|bluescreenview_romanian.zip|Russian|bluescreenview_russian.zip|Slovak|bluescreenview_slovak.zip|Slovenian|bluescreenview_slovenian.zip|Swedish|bluescreenview_swedish.zip|Turkish|bluescreenview_turkish1.zip|Ukrainian|bluescreenview_ukrainian.zip|Valencian|bluescreenview_valencian.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,%TargetPrograms%\%ProgramFolder%

 ///////////////////////////////////////////////////////////////////////////////////
@@ -97,7 +99,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip",#1
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1

 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -111,15 +113,29 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip",#1
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-x64.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-x86.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End

 [#LaunchProgram#]
@@ -134,9 +150,10 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\BlueScreenView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%\%SourceArch%
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%SourceArch%\%ProgramExe%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
 // ===============================================================================================================================
@@ -185,7 +202,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"BlueScreenView"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 Run,%ScriptFile%,DeleteCachedLangFile
@@ -247,7 +264,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,Diagnostics
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,BlueScreenView
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -72,8 +72,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-System,GetEnv,PROCESSOR_ARCHITECTURE,%HostArch%
-If,%HostArch%,Equal,"AMD64",ExtractAllFiles,%ScriptFile%,x64,"%ProjectTemp%\%ProgramFolder%"
+If,%HostArch%,Equal,"x64",ExtractAllFiles,%ScriptFile%,x64,"%ProjectTemp%\%ProgramFolder%"
 Else,ExtractAllFiles,%ScriptFile%,x86,"%ProjectTemp%\%ProgramFolder%"
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

@@ -95,7 +94,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"CheckDisk"
 System,Cursor,Normal

@@ -150,7 +149,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,CheckDisk

 [AuthorEncoded]
@@ -177,7 +176,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHAWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgKFdpbmRvd3MpIiB4bXA6Q3JlYXRlRGF0ZT0iMjAxOC0wMi0yMlQxNjo1OTo1MC0wNjowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTktMTItMDJUMjE6NTM6MDQtMDY6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTktMTItMDJUMjE6NTM6MDQtMDY6MDAiIGRjOmZvcm1hdD0iaW1hZ2UvcG5nIiBwaG90b3Nob3A6Q29sb3JNb2RlPSIzIiBwaG90b3Nob3A6SUNDUHJvZmlsZT0ic1JHQiBJRUM2MTk2Ni0yLjEiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6YWQ2OTFmMzItY2FiZC1hZTQzLTlmNjAtMzk5YjQyOTBlMTNiIiB4bXBNTTpEb2N1bWVudElEPSJhZG9iZTpkb2NpZDpwaG90b3Nob3A6OTBjZmFlNjAtYWJhZS1iNTQ3LWIyODEtOWYxNzg2YzM1NjQ2IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MzUwYTZiYzMtZDFiMi03MjRjLTlmZWQtY2RmYTM4YzhjM2FkIj4gPGRjOmNyZWF0b3I+IDxyZGY6U2VxPiA8cmRmOmxpPkhvbWVzMzI8L3JkZjpsaT4gPC9yZGY6U2VxPiA8L2RjOmNyZWF0b3I+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249ImNyZWF0ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6MzUwYTZiYzMtZDFiMi03MjRjLTlmZWQtY2RmYTM4YzhjM2FkIiBzdEV2dDp3aGVuPSIyMDE4LTAyLTIyVDE2OjU5OjUwLTA2OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo4MmNhNWFiYy05Mzg0LWUwNGYtOGE5NC0yMTk1NjY1NjY1YTUiIHN0RXZ0OndoZW49IjIwMTgtMDItMjJUMTc6MTA6MDUtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmFkNjkxZjMyLWNhYmQtYWU0My05ZjYwLTM5OWI0MjkwZTEzYiIgc3RFdnQ6d2hlbj0iMjAxOS0xMi0wMlQyMTo1MzowNC0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiBzdEV2dDpjaGFuZ2VkPSIvIi8+IDwvcmRmOlNlcT4gPC94bXBNTTpIaXN0b3J5PiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PozE0ngAAAOzSURBVDgRBcF9TJR1AMDx7/N7nnuOez/kxUJe4q2pWEgoykxLpqkzx6bhlszN/soZ/dE0W9bWZrVZ2WYt/ypn5VrmzDkZZk2INoRyNJEUUDg4TuC4g7vjjrvjHu7uefp8pJljb2KymMlr2g5rq5H0ZQj6V+mzwYOh4qrGbDyadqN1GfOhK7Hp2cV4VQWRE5+SF42QUVUUAEOSkDJZsMvuQEg68/OgfOBPjzvf4xnDpArW1xQe2rxS/XB/Q8kPzlnv6blYXJeEAEB+Z8MGTOllrE0b13V4uXXk3NDuS3/4rYmoTnGeDUk30f1PkNvDmntQz3/5mecKm2o8//6WGByNY7ehmI0Mec9Xlvw6rf51+Mv7K3IzBmff2sgbB2rJdZpJpZa5NzzJR+fv0dMxwqPZqq0XT37cvqbo/JapvpFl+fPtGxhv2PHjkauxuqJMFpdL5qtTO3A7ZMa8fnJtBmUlKissaR75UmgzER66K4qa1ttVqafvttBLi9d868lpTvkXWVloxunI4cLVfg6/e43GQ9c4e3GAWCDECjVJYikBqsTd30e4mSw9aq0tt4ontvx9vZ4lCi0SmayO2ST45dYYfQNR5r0ZkokkTruG50mYwcdRYnGNwHiQjmHdpW3b2iYixZV74sFFTMJAUWQkIZHSdHwTi5w8VsXpo2WMjgU5ezmA1e7G5bCQ67IyN7FApm7TdpFWFIvIGiiKjCwkxn0R7g/O09pSzmfHy+m6M8He40MMzTgoL3ZiiBzUHDsm1YJsMUtCHfmvU813oMiCJ/4Y4WgKcszUP2sFC1zuijA6qlJT5ULHhGq2ogsHT6+uQNztva8UxWba66rrT10fnkMsazhtKkIxOPeTB99kmP5HOgWVuUjChCzMWK0qWtLOltUWTe3u/VoUKNm/D1Yu9U9rglQ8jWwSxGMp9r5Uxqu7XqTt8CYcFkEqo+ByWPEFFNbWV/Oa5cHV2FR4WgQmw2yd6Gl7v7WIuTmZQDBJPLFMy+5KtjWWcGRfAZKRQVWt+OYkYvYyPtm1EOHCF+8FH3iR366vRQuEppsb3SPyuqr9XQNLUjaR5nr3FOGFBT74ZoBRv5m47iSvZBXfn3DP1E5d2TP43Y3Hsm4gH9/8AlmbHWMp9XBnafbOtj01lSa7rdQbynDrxgQR3DQ0VvB6UwFndgban5q82eqZiD6QRscR2SwKgGToaLKKP5Tu3Gib7Fxd4Ws5+Upd82JuwypTNqMXJANeOTxwCd9i91g4jaSawTAA+B9saZuyCHkkigAAAABJRU5ErkJggnic4/ZIzSmINzTTK8hLZxgFIw7wceOXd9V7kMTIAAAhOQWdbDOZ9gEAAAACAAAAIwAAAA4LAAAAAAAAAQAAAAAAAAAAAAAA

-
 [EncodedFolders]
 x64
 x86
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -41,20 +41,22 @@ Date=2020-03-01
 [Variables]
 %ProgramFolder%="FullEventLogView"
 %ProgramExe%="FullEventLogView.exe"
-%DownloadURL32%=https://www.nirsoft.net/utils/fulleventlogview.zip
-%DownloadURL64%=https://www.nirsoft.net/utils/fulleventlogview-x64.zip
+%DownloadURLx86%=https://www.nirsoft.net/utils/fulleventlogview.zip
+%DownloadURLx64%=https://www.nirsoft.net/utils/fulleventlogview-x64.zip
+%SetupFile%="FullEventLogView-%SourceArch%.zip"
 %aLangMap%=Bulgarian|fulleventlogview_bulgarian.zip|Chinese (Simplified)|fulleventlogview_schinese.zip|Chinese (Traditional)|fulleventlogview_tchinese.zip|Dutch|fulleventlogview_dutch.zip|French|fulleventlogview_french.zip|German|fulleventlogview_german.zip|Greek|fulleventlogview_greek.zip|Hindi|fulleventlogview_hindi.zip|Polish|fulleventlogview_polish.zip|Portuguese (Brazil)|fulleventlogview_brazilian_portuguese1.zip|Russian|fulleventlogview_russian.zip|Slovak|fulleventlogview_slovak.zip|Spanish|fulleventlogview_spanish.zip|Swedish|fulleventlogview_swedish.zip|Turkish|fulleventlogview_turkish.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,%TargetPrograms%\%ProgramFolder%

 ///////////////////////////////////////////////////////////////////////////////////
@@ -102,7 +104,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip",#1
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1

 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -116,15 +118,29 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip",#
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-x64.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-x86.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End

 [#LaunchProgram#]
@@ -139,9 +155,10 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\FullEventLogView-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%\%SourceArch%
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%SourceArch%\%ProgramExe%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
 // ===============================================================================================================================
@@ -190,7 +207,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"FullEventLogView"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 Run,%ScriptFile%,DeleteCachedLangFile
@@ -236,7 +253,7 @@ Message,"FullEventLogView allows you to view Windows even logs from a local or r
 // Related........:
 // ===============================================================================================================================
 [Interface]
-btn_LaunchProgram="Launch FullEventLogView",1,8,5,5,144,25,LaunchProgram,play-hot.png,False
+btn_LaunchProgram="Launch Program",1,8,5,5,144,25,LaunchProgram,play-hot.png,False
 bvl_Homepage=bvl_Homepage,1,12,367,5,72,25
 web_Homepage=Homepage,1,10,377,9,60,18,https://www.nirsoft.net/utils/full_event_log_view.html
 btn_DownloadProgram=,1,8,448,5,25,25,DownloadProgram,VistalcoDownload_16.png,False,"__Download the program."
@@ -252,7 +269,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,Diagnostics
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,FullEventLogView
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -93,7 +93,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Hardware Diag"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Keyboard Test Utility"
 System,Cursor,Normal

@@ -150,7 +150,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Hardware Diag"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Keyboard Test Utility"

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -89,7 +89,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Offline SFC Scan"
 System,Cursor,Normal

@@ -143,7 +143,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,Diagnostics
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Offline SFC Scan"

 [InterfaceEncoded]
@@ -207,4 +207,3 @@ lines=10
 [AuthorEncoded]
 OfflineSFC.ico=227298,41204
 Logo=OfflineSFC.ico
-
--- a/Projects/PhoenixPE/Applications/Diagnostics
+++ b/Projects/PhoenixPE/Applications/Diagnostics
@@ -132,7 +132,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Diagnostics & Repair"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Victoria"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [1]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_NoWrite,False
@@ -192,7 +192,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Diagnostics & Repair"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Victoria
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Management/AOMI-PartitionAssistant.script
+++ b/Management/AOMI-PartitionAssistant.script
@@ -292,7 +292,7 @@ InnoUnpack,"%ProgramsCache%\%ProgramFolder%\%SetupFile%","%ProjectTemp%\%Program
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -351,13 +351,13 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AOMEI Partition Assistant"
 WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc2,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc2,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar2,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu2,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder2,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder2,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName2,"AOMEI Dynamic Disk Manager"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
@@ -420,7 +420,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"AOMEI Partition Assistant"
 bvl_Shortcuts2="Dynamic Disk Mgr",1,12,145,90,133,184,8,Bold
 cb_DesktopShc2=Desktop,1,3,152,104,122,18,False
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -161,7 +161,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,""
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"BleachBit"
 System,Cursor,Normal

@@ -220,7 +220,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,BleachBit
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 cb_DarkMode="Dark Mode",1,3,157,104,181,18,False,"__Use a dark color scheme."
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -93,7 +93,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"BOOTICE"
 System,Cursor,Normal

@@ -148,7 +148,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,BOOTICE

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -173,7 +173,7 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code r
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -236,7 +236,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Defraggler"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [1033]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ShellExt,True
@@ -297,7 +297,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Defraggler
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Management/DiskInternals-LinuxReader.script
+++ b/Management/DiskInternals-LinuxReader.script
@@ -145,7 +145,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Linux Reader"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False

@@ -204,7 +204,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Linux Reader"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of LinuxReader in your build."

--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -142,7 +142,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Ext2Mgr"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AutoStart,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_AutoMount,False
@@ -202,7 +202,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Ext2Mgr
 bvl_Options=Options,1,12,150,90,244,184,8,Bold
 cb_AutoStart="Start Ext2Fsd on boot",1,3,157,104,181,18,True,"__Start the Ext2 file system driver on boot."
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -93,7 +93,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Ext2Explore"
 System,Cursor,Normal

@@ -150,7 +150,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Ext2Explore

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -172,7 +172,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"WinDirStat"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [1033]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ContextMenu,True
@@ -233,7 +233,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,WinDirStat
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of WinDirStat in your build."
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
--- a/Projects/PhoenixPE/Applications/Disk
+++ b/Projects/PhoenixPE/Applications/Disk
@@ -177,7 +177,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Management"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"WizTree"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [en]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ContextMenu,True
@@ -238,7 +238,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Disk Management"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,WizTree
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Encryption/VeraCrypt.script
+++ b/Projects/PhoenixPE/Applications/Encryption/VeraCrypt.script
--- a/Projects/PhoenixPE/Applications/File
+++ b/Projects/PhoenixPE/Applications/File
@@ -179,7 +179,7 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [%SetupFile%]. The error code r
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -241,7 +241,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"File Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Recuva"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [1033]"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_ViewMode,"0 - List View"
@@ -304,7 +304,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Recovery
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"File Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Recuva
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/File
+++ b/Projects/PhoenixPE/Applications/File
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -101,7 +101,7 @@ If,Not,#r,Equal,0,Halt,"Error: Failed to extract [TestDisk-%SourceArch%.zip]. Th
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -181,13 +181,13 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"File Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"TestDisk"
 WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc2,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc2,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar2,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu2,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder2,"Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder2,"File Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName2,"PhotoRec"
 System,Cursor,Normal

@@ -247,14 +247,14 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Recovery
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"File Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,TestDisk
 bvl_Shortcuts2="PhotoRec Shortcuts",1,12,145,90,133,184,8,Bold
 cb_DesktopShc2=Desktop,1,3,152,104,122,18,False
 cb_StartMenuShc2="Start Menu",1,3,152,123,122,18,True
 cb_PinToTaskbar2="Pin to Taskbar",1,3,152,142,122,18,False
 cb_PinToStartMenu2="Pin to Start Menu",1,3,152,161,122,18,False
-txt_StartMenuFolder2="Start Menu Folder:",1,0,152,201,119,21,Recovery
+txt_StartMenuFolder2="Start Menu Folder:",1,0,152,201,119,21,"File Recovery"
 txt_ShortcutName2="Shortcut Name:",1,0,152,243,119,21,PhotoRec

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/File
+++ b/Projects/PhoenixPE/Applications/File
@@ -107,7 +107,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Disk Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"File Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Unstoppable Copier"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [00]"

@@ -163,7 +163,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Recovery
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"File Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Unstoppable Copier"
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -240,7 +240,7 @@ InnoUnpack,"%ProgramsCache%\%ProgramFolder%\AgentRansack-%SourceArch%.exe",#1
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -303,7 +303,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"."
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Forensic Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AgentRansack"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [en]"
@@ -375,7 +375,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,.
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Forensic Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,AgentRansack
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of AgentRansack in your build."
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -154,7 +154,7 @@ End
 [LaunchProgram]
 Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+Run,%ScriptFile%,ExtractProgram,"%ProjectTemp%\%ProgramFolder%"
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -141,7 +141,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Forensic Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Internet History Browser"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False

@@ -200,7 +200,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Recovery"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Forensic Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Internet History Browser"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of Internet History Browser in your build."

--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -141,7 +141,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Forensic Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Mail Viewer"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False

@@ -200,7 +200,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Recovery"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Forensic Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Mail Viewer"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of Mail Viewer in your build."

--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -141,7 +141,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Forensic Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Windows Registry Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False

@@ -200,7 +200,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Recovery"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Forensic Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Windows Registry Recovery"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of WRR in your build."

--- a/Projects/PhoenixPE/Applications/Forensic
+++ b/Projects/PhoenixPE/Applications/Forensic
@@ -141,7 +141,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Forensic Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Windows File Analyzer"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False

@@ -200,7 +200,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Backup & Recovery"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Forensic Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Windows File Analyzer"
 cb_AlwaysDownload="Always download latest version",1,3,155,54,177,18,False,"__Enable this option to ensure you always included the latest version of Windows File Analyzer in your build."

--- a/Projects/PhoenixPE/Applications/Malware
+++ b/Projects/PhoenixPE/Applications/Malware
@@ -127,7 +127,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Anti-Malware"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Malware Removal"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AVZ"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 System,Cursor,Normal
@@ -188,7 +188,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Anti-Malware
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Malware Removal"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,AVZ

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Malware
+++ b/Projects/PhoenixPE/Applications/Malware
@@ -35,22 +35,22 @@ Author=Homes32
 Level=5
 Selected=False
 Mandatory=False
-Version=1.0.0.0
+Version=1.1.0.0
 Date=2020-03-01

 [Variables]
 %ProgramFolder%="AutoRuns"
-%ProgramExe%="AutoRuns.exe"
-%DownloadURL32%=https://live.sysinternals.com/Autoruns.exe
-%DownloadURL64%=https://live.sysinternals.com/Autoruns64.exe
+%ProgramExex86%="AutoRuns.exe"
+%ProgramExex64%="AutoRuns64.exe"
+%DownloadURLx86%=https://live.sysinternals.com/Autoruns.exe
+%DownloadURLx64%=https://live.sysinternals.com/Autoruns64.exe
 %DownloadURLCHM%=https://live.sysinternals.com/autoruns.chm

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
-
-If,%SourceArch%,Equal,x64,Set,%ProgramExe%,"AutoRuns64.exe"
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract
@@ -87,21 +87,38 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
-If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\AutoRuns64.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
-Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\AutoRuns.exe",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."

 Echo,"Downloading %ScriptTitle% Help files..."
 WebGet,%DownloadURLCHM%,"%ProgramsCache%\%ProgramFolder%\AutoRuns.chm",NOERR
 If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-  
+ 
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+//                  %ProgramExe%     - The x86 or x64 program name.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
+If,%SourceArch%,Equal,x64,Begin
+  Set,%DownloadURL%,%DownloadURLx64%
+  Set,%ProgramExe%,%ProgramExex64%
+End  
+Else,Begin
+  Set,%DownloadURL%,%DownloadURLx86%
+  Set,%ProgramExe%,%ProgramExex86%
+End
+ 
 [#LaunchProgram#]
 // ===============================================================================================================================
 // Name...........: LaunchProgram
@@ -114,7 +131,7 @@ If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,%HostArch%,Equal,x64,Set,%ProgramExe%,"AutoRuns64.exe"
+Run,%ScriptFile%,SetProgramArch
 If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%",Run,%ScriptFile%,DownloadProgram
 ShellExecuteEx,Open,"%ProgramsCache%\%ProgramFolder%\%ProgramExe%"

@@ -151,7 +168,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Malware Removal"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AutoRuns"
 System,Cursor,Normal

@@ -211,7 +228,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools"
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"Malware Removal"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,AutoRuns

 [InterfaceEncoded]
@@ -230,7 +247,6 @@ Logo=Autoruns_80.png
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAAAZiS0dEAP4A/gD+6xjUggAAAAlwSFlzAAAASAAAAEgARslrPgAAAAl2cEFnAAAAEAAAABAAXMatwwAAAiJJREFUOMutkz1oU2EUhp/vu3/5ublJappqqDRiIlYXFStKxy4WdCkibhXcXMVRBEGhUB0V3BsFRTqIQnHQRRSnFKzUIuK/TdPGJG2Te2/u/dwq1tIK+k5nOc9wzvPCP0asTUkDFAKlQBOKH/7fU/SRPpS6w4HHA6OHHh25kh/f3ztUGUYUYlvuSgChg8id1SIR/UQqHbnU25+6t/Bgflgv2nrm/K6tAXRCiCu0VSH0VYGtGUd7somJgZHitaTj5E4+PwV95mYABbKDtgraskRf0YkGsXS3nblQLOTvf39aH9YKXXp2tH9jgAoAQmTbwHAj6J6N4TlYHUemI+lj+Z09E0OnB6525eK5My/PQVZfd4NQggLdj2P4DlbHwVRRpBSEmotmddKZ7sTFvQf77k4/LBcOXx789QAAQg0CMIIYMjCpeYtU3Xnqfg2PNioSYjmWSIWZWKfum16ivQ4gFKR3sORWeL+yQKU1jy9diCpkUiANvblcdUufXyxdd0uNOSx+BygRksrsYa45Q0dfhQRoKYHlmEprm9PerBhrlLxJsxhpuTTAXQdAU4SLISIZIJOC+DaLpGU31VejVH/m3aje/vjWiCZYfrP0p4QA0hQ03lXZnbdVtieG3bLL9bI/NnezMpncF28B+K3mxhYDyHqAqs4Ex58MTiUWrS8fpmq3Xo2XZ41YjNrrb5uauFYmM7YdFYZSha7QLSdoNz9t2YP/kp+AfsdFsD8fGgAAAC56VFh0Y3JlYXRlLWRhdGUAAHjaMzIwsNA1sNA1MgkxMLAyMrMyNNY1MLUyMAAAQe0FE0pvDAgAAAAuelRYdG1vZGlmeS1kYXRlAAB42jMyMLDQNbDQNTIIMbSwMrG0MrLQNTC1MjAAAEKCBSOylbeyAAAAInpUWHRTb2Z0d2FyZQAAeNpzTMlPSlXwzE1MTw1KTUypBAAvnAXUrgypTQAAAABJRU5ErkJggnic4ynISazUzcgv0SvIS2cYBSMNeDLjl/9974ElIwMACj8H7bPi5SwBAAAAAgAAACQAAABJAwAAAAAAAAEAAAAAAAAAAAAAAA

-
 [EncodedFile-InterfaceEncoded-Trash.ico]
 lines=0
 0=eJx10/1PEnEcB/DzYT2s7GHNHpYrY2221dbjVlsPs9asNVdtPfsHNEtt+ZRsyXjyNAFBHgQjKQi0YEIiBmJmoM5MwTISrOzB0jSndRToYctPd7Yro/re3vfD9+51973P53sIEkEcixYhxDkeSY1GkKUIgqwjQkwRMz/nyZEYjfw1Dh08MGff3sSYlDOndyQkJAiIyIko/hM5jUbjxsWtXL5t65b5R48cnkU+o1wiijx54jjb5eoEj8cDvT4f4DgOg4ODYLXWQUWFEszmGnj6tBtkMhnQ4uOXZV9Ii5i5DpTFyFKpVFMajQa0Wi1YLBYwGAwgkYgBRQugtFQEarUaOGxWIHHXzsXh36EuZpx67+vGxj68w0IT41goFMI+j41ifZ4n/h5XO9bV0jQdvbT4MW31qiXh3iTnn6d8T2NtsFHKDnVZTcG7gsu4hUfHOx/Yp71NI38VHRm5NNzfEjDyST/U1+u3C/NDtuKcSVetPlgvZOBmNCvUqCkPkP7+7RsDC+bNXRPuDWKuiPQ9TdavzUoejo2M+Mn1v3rWjTVXKoPmwks46R2mqqHYhTEbw3217IqG9B57TcBemP6NWMcX0r/xPcNqWecnbSLmBOlb64wfaSti91wVFP5R/3taeR3ph1+/wF4+dAbc+oqJkcEBrNOkCzq15cF2W42f9O0NltENa+KS5byCP7zluqSNqt/rR86Ag5/5zV1TOd6Apk/aRQycqr/L0fBpx/q1KWU8NJKyrfW1Ea13tL2Ux8cD2AuHNeg26cbbNJKJ7pYmP+XdzfexpO2bzmWnpUZRXlcmnNNpqx74V//7+55jM/tP5tj+3fnJB5NmU76Qw0rj83lTErEYhCUloFQqp/egQqEADocDubk5QKfToaioCMTEPedSU8cOHUiaR3leEcro6HgEPq8XHne5YXh4CIj3Q39/P9TX20ClugY6nRaczU7wenuIf0D6PetC+q+/UaVUbMjIyLgnlUqnyH1ebdCDvqoSblXqpve+Ql4GIqEQTEYjCPh8yM3JloX3nxzE2jfT8/K4N9XqD1U6nYfPK85mMpk3Mi9ezEMLCoxcDvssyuXGhzsW0UlH1D8S8Tus8BDX3xIV/AEUry6xeJzjDClKLM7Qy0zOZxgFIxDUsUBoV2bs8iFCkXoMbAB8oQUybAHR5gEAAAACAAAAJAAAAEUDAAAAAAAAAQAAAAAAAAAAAAAA
@@ -251,8 +267,6 @@ lines=0
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA

-
-
 [EncodedFile-AuthorEncoded-Autoruns_80.png]
 lines=2
 0=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
--- a/Projects/PhoenixPE/Applications/Malware
+++ b/Projects/PhoenixPE/Applications/Malware
@@ -131,7 +131,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Anti-Malware"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Malware Removal"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"ESET Online Scanner"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [enu]"
@@ -193,7 +193,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Anti-Malware
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Malware Removal"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"ESET Online Scanner"
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Malware
+++ b/Projects/PhoenixPE/Applications/Malware
@@ -127,7 +127,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Anti-Malware"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Malware Removal"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Kaspersky Virus Removal Tool"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 System,Cursor,Normal
@@ -188,7 +188,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Anti-Malware
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Malware Removal"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"Kaspersky Virus Removal Tool"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Malware
+++ b/Projects/PhoenixPE/Applications/Malware
@@ -132,7 +132,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Anti-Malware"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Malware Removal"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"McAfee Stinger"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AlwaysDownload,False
 System,Cursor,Normal
@@ -193,7 +193,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Anti-Malware
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Malware Removal"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"McAfee Stinger"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script
+++ b/Projects/PhoenixPE/Applications/Multimedia/IrfanView.script
--- a/Projects/PhoenixPE/Applications/Multimedia/MSPaint.script
+++ b/Projects/PhoenixPE/Applications/Multimedia/MSPaint.script
@@ -78,7 +78,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Multimedia"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Paint"
 System,Cursor,Normal

@@ -130,7 +130,7 @@ cb_DesktopShc=Desktop,1,3,12,64,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,83,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,102,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,121,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Multimedia
 txt_ShortcutName="Shortcut Name:",1,0,12,203,119,21,Paint

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Networking/AnyDesk.script
+++ b/Projects/PhoenixPE/Applications/Networking/AnyDesk.script
@@ -138,9 +138,8 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Backup & Recovery"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Networking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AnyDesk"
-WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 System,Cursor,Normal

 [#ToggleAdvancedOptions#]
@@ -199,7 +198,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,Productivity
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,Networking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,AnyDesk
 bvl_Options=Options,0,12,150,90,197,184,8,Bold

--- a/Projects/PhoenixPE/Applications/Networking/Chrome.script
+++ b/Projects/PhoenixPE/Applications/Networking/Chrome.script
@@ -314,7 +314,7 @@ RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows\Shell\Associations\UrlAssociat
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -364,7 +364,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,True
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Network"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Networking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Chrome"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English (US) [en-US]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_SetAsDefaultBrowser,False
@@ -456,7 +456,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,True
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,True
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,True
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Network
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Networking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Chrome
 bvl_Options=Options,1,12,150,90,475,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Networking/Firefox.script
+++ b/Projects/PhoenixPE/Applications/Networking/Firefox.script
@@ -355,7 +355,7 @@ RegWrite,HKLM,0x1,"Tmp_Software\Microsoft\Windows\Shell\Associations\UrlAssociat
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -400,7 +400,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,True
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Network"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Networking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Firefox"
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_GA,True
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_Dev,False
@@ -496,7 +496,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,True
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,True
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,True
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Network
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Networking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Firefox
 bvl_DownloadRelease=,1,12,150,50,198,25
 lbl_Release=Release:,1,1,157,58,48,16,8,Bold
--- a/Projects/PhoenixPE/Applications/Networking/PuTTY.script
+++ b/Projects/PhoenixPE/Applications/Networking/PuTTY.script
@@ -154,7 +154,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Networking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"PuTTY"
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_puttyOnly,True
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_puttySuite,False
@@ -226,7 +226,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Productivity
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Networking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PuTTY
 bvl_DownloadRelease=,1,12,150,50,208,25
 lbl_Release=Release:,1,1,157,58,48,16,8,Bold
--- a/Projects/PhoenixPE/Applications/Networking/WinSCP.script
+++ b/Projects/PhoenixPE/Applications/Networking/WinSCP.script
@@ -235,7 +235,7 @@ InnoUnpack,"%ProgramsCache%\%ProgramFolder%\%SetupExe%","%ProjectTemp%\%ProgramF
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -294,7 +294,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Networking"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"WinSCP"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English (United States) [1033]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ShellIntergration,True
@@ -376,7 +376,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Productivity
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Networking
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,WinSCP
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/Password
+++ b/Projects/PhoenixPE/Applications/Password
@@ -97,7 +97,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Security"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Password Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"NTPWEdit"
 System,Cursor,Normal

@@ -154,7 +154,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Security
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Password Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,NTPWEdit

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Password
+++ b/Projects/PhoenixPE/Applications/Password
@@ -151,7 +151,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Security
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Password Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PEPassPass

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Password
+++ b/Projects/PhoenixPE/Applications/Password
@@ -95,7 +95,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Security"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Password Recovery"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"PassReset"
 System,Cursor,Normal

@@ -152,7 +152,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Security
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Password Recovery"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PassReset

 [AuthorEncoded]
--- a/Projects/PhoenixPE/Applications/Password
+++ b/Projects/PhoenixPE/Applications/Password
@@ -72,8 +72,7 @@ If,%cb_PinToStartMenu%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Prog
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-System,GetEnv,PROCESSOR_ARCHITECTURE,%HostArch%
-If,%HostArch%,Equal,"AMD64",ExtractAllFiles,%ScriptFile%,x64,"%ProjectTemp%\%ProgramFolder%"
+If,%HostArch%,Equal,"x64",ExtractAllFiles,%ScriptFile%,x64,"%ProjectTemp%\%ProgramFolder%"
 Else,ExtractAllFiles,%ScriptFile%,x86,"%ProjectTemp%\%ProgramFolder%"
 ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

--- a/Projects/PhoenixPE/Applications/Productivity/7Zip.script
+++ b/Projects/PhoenixPE/Applications/Productivity/7Zip.script
@@ -396,7 +396,7 @@ End
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
@@ -467,7 +467,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"7-Zip File Manager"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English (US) [en]"
 WriteInterface,Value,%ScriptFile%,Interface,cb_AddShellContextMenu,True
@@ -574,7 +574,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,Productivity
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"7-Zip File Manager"
 bvl_Options=Options,1,12,150,90,477,322,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
@@ -666,7 +666,6 @@ lines=1
 0=iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAAAsTAAALEwEAmpwYAAAF8WlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDggNzkuMTY0MDM2LCAyMDE5LzA4LzEzLTAxOjA2OjU3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjEuMCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDEwLTAxLTE4VDE4OjMxOjU1LTA2OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0xMi0wNlQyMDoxNjozNS0wNjowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0xMi0wNlQyMDoxNjozNS0wNjowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpkN2ZiNmQ3YS0zYTUwLTQ4NGItODQ2Zi1jMmZhZWQxMTEwMzciIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDozMjRmNzIyZi1hYWNlLTk5NDAtOTAyNi01ZTVmZWNjM2I1NWEiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1NDIyM2RlMy0wYjBjLWRjNDQtYWM0NC0xNTQ1ODgwNTJmZmYiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjU0MjIzZGUzLTBiMGMtZGM0NC1hYzQ0LTE1NDU4ODA1MmZmZiIgc3RFdnQ6d2hlbj0iMjAxMC0wMS0xOFQxODozMTo1NS0wNjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDpkN2ZiNmQ3YS0zYTUwLTQ4NGItODQ2Zi1jMmZhZWQxMTEwMzciIHN0RXZ0OndoZW49IjIwMTktMTItMDZUMjA6MTY6MzUtMDY6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCAyMS4wIChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7RqViWAAAMI0lEQVR42u1cZ2hUTReebDaJicYaY40FDTF2CYqK2LtiR1QEC2JBgwh2UVA0NvTHp6L+EFGUqFixYUV5I0FBsBAUMfZeoiYxyW7ae55xz76zk71bYtTINweGe+/MvbMzz5w+k4SUlpYKQ+Unm4HAAGgANAAaAA0ZAA2ABkADoCEDoAHQAGgANGQANAAaAP9vyJ6SklI7MjKyh91ur0PPVT9//hxZWFhYMzo6OsLpdFalEh0SEhJOJZTqI7iUlJSEukpIcXGxUEtRUZEs1IbnYuq3kC5O+i6f6vDsoJJXWlr6vV69etkxMTFfX758ifuP9N51avugDxSJ3+/fv4uGDRuKdevWifDwcPHq1SvhcDhE1apVRd26dUVoaKj7/S9fvgiaiwgLC/PoB+/k5uYKmpdo1KiR+PTpk3jx4oV48uSJePbsmbh79644f/68fHfbtm2iV69e4sqVK+LSpUuyfcSIEXKO79+/F4SbsFerVm0eDWY1TU5Ounbt2nLi+fn5wmazyYEyIJgEASkHgauazcY9F7ShMOFb/KgLUHd/uCfgxMePH0XLli1FnTp1BC3k/6h+vjpp7g+DHj58uBxTpeFAAqkuVoMnhBVVOUnnLoDA3OWt3de3KogoWCA8g0sAEBaRwKn3g2n/Aw8EbkKfALlSiTCJRViVKlW8Tliv8weav2/1egAHUcOiAUzUEWCROniZmZli0qRJUvS+fftWuYxITk5OdRYzcIBeWNy4XX3W26y+U9tV8QVwWVlZUuwBsEv8o3Tw+vXrJ6ZNmyZ1XXZ2duXiwIiIiGgoZ3ViKJgsJgjxRsGzeq+DqnIXcxuuKjeBy8B1AIp0nVTgeAf3uLrej+T3oR/79u0rli5dKvuAriRDU7kApMlEMQiYGECDsoahIHBliYqKks8AgK8oqqFQRZy5DYYIi4MCzgG3weKhv1q1aol37955GCF8D4sPQMF57du3F8uWLfOwoJXOjSkoKIjGgDFx5riJEyeKpk2bipo1awqy0pJrYPnwXnkIfefl5Ul99+DBA7FhwwZx69Yt+Vsg5j4XZ0bAXWjQoIFYtGhR5fcDaeARzDGwdK1atRJDhw6t2B8h4KtXry4LFubNmzfi+vXr7nZwJ8QTXEmGIhSu1KZNm6RvB2DB7SzCKheyWoGU6AcEIBFo0+sxFjAKexu4wjhBOiARWDymr1+/ynfQDmxwhe8HyWL1BBG2YyCoAJdg0L+amjVr5vEMLm/durVISEjAffVZs2b1oHFUoSYYlAgq8IbDBg0aFEaGBAhCFMJJQsKJu+0kHYSxjfUJrqGkJmzUh00XeywGtZUQMCXUV3FsbGwpQCX3qDQxMbEkKSnJkZGRkU/tRR07diwileKIi4tztmnTJp9UUR6BnE1BRjZ9kwnhstMqRWCVeMVUvfarSJ/UhQsXRPfu3fkxjso/6oSZYFBUAsdaEfQsij+CZa9fv75lO3Dp0KGDmDJlirhz544YN26cXOj4+PinxIlJNuK+cLagLMq/mmBUmKBnFfAqHamLTRwpIzUYWWK05lQVb4MIMHAA8nc4qnv37nXf16hRQ/xNB5wQCUFSXU5/TTvd2Nlvg7WF+/Arafbs2eLo0aPuZyjl36E2KopI/0nD41r0anbiQBv7b1Dmb9++FStWrHAbE92BhgUi10deuSOwNHTJgQMHpEhaUXJysti9e7dHHcLIv4mgV9noQgNJANV4FRbp8uXL0iKrkYkaXShRgwQSbsjKlSvl6lgR2rdv316mHhz4NxHGq2SmagFAux7kQ87BSf6SBKD79++LhQsXijVr1lj+6J49e8TatWu9tqkciFzc6dOnpb/HOTv2uTh9hitHSPgWlhhWFHk6uEcYDxzwR48eSZUE67l8+XLZP6IgLCR8PTAI+oeVRz/oDxKI/mJiYgS5LWLUqFHyXiUEFEq2KBoAlvpLXXkDEhPBYHv06CE2b95sCd7NmzfFjB
 1=kzLNvVhOeYMWNkYrM8dPv2bbFv3z65WHCLmHbt2iXDQYz32LFjYv/+/QH3uWTJErF+/Xoxc+ZMD0dcCTulDizDWd5STzqwSASAnVNTUy0HAC4aPXp0wG6CGgUES+BUUE5Ojkc9JImjFXB2MITohJx6qfPmzp3rHi+rLwKwip3dFyUF7zfPh/cwmJ07d4rGjRtbDgArB6PkL8xjgio4d+6cVNQQK4gU9CoMFO5xhXqBLtXBnjBhgnvSKnGyGAB6c9EgQZ06dZLMAA8E6XyIt0rz5s0TgwcPFi1atPAAEFGSPZisMgf8z58/F507d5YuiRUBCF/c6Q3AjRs3yuKPtmzZ4vG8YMECKf4gffLMILxPohJi/rNnz3rUIR5GX+np6R71EP3Vq1e7txNcbkyETc0DWiVL1YIBYlDY2LEitM+ZMyewjK7NFpSYYlNJ5WrskWzdutUj86OPhet0cJEu0wkGCXpUJxg4tsK89wOJ9uBAK25EPZQwOPD169cyNhwwYIDlRHfs2CEtXkUDOHDgQA/w2rZtK06dOlUmdabHsixy8Ft1cL1RkyZNLHWsFsfbvRoRHTxMErrkw4cfu41gZSvCKgciht5E2BdNnTpVpKWluZ8Rk168eLHMAqhZcAaQRZjzj2oazRsdPHiwTB10sJf+w3wCyOABfYCHZyQ6R44caTlR6D0101wRlJKSIl0UlaC7MBZ/hHlwrK3u9nEW6Nq1azK7AncK3H38+HGvDMIJD7U/kkqZCwzRLawqtuAohGr80fTp0wNOFFQEgRsQWup1Xbt2DShVpuirMgBCzfTp00caBgCoZolUgjPN89Y5HBxY5I0DAR5iXhU80OTJky0nC8f6xo0bFQYeRFb/vVWrVsktzkBVghp26vpRdXV08Vb14cmTJ61yjyFeAWQFC7FVwQOrI+VvRdBJFUVwlfr37+9RB/fCl/612njiOeht8CsR6sGyQ9KgE1HgjMNv7NKli4yi1BifJdPVb7EUYTVkY1+PtxxVGjJkiM/B675TeQnjwJkU1Wpi4Y4cOeL3W/0sjC/uTExMlB7DT5ATHFioii4IHrs3E9+zZ0/LniDuGRkZFQIgvH5woArKmTNnAtrWBOfobhJbav173sYI5qyNnvyFI12onqaCxWWfRydEH1YEhYyN8GBJT6Yic4J0miqSJ06ckGFUIKTnF9X9ax1ciCri9WClQzk8VejBgQBQD8aZcHrKV9wLF8DKivkiVbEjc4Psh642hg0b5uZyXmD8Fj9jMhBx6Cp9Iwliyxyogwt9BwDhU5YTQKfbiDD36XqPCduOvqi8Z1ZU1+LQoUNe02Hx8fESaM6Go+hRBc7PgHN131A9EKBny7EIengXKICqDnSy+FqZcpA/EfL1baA6BUlQnZD1CSQNdfXqVbfPpospZ711VwQAYvM8GOLkrivB64QVdjB4vnbH4uLignYfghVhxLoPHz50cxo79WzQ1EOdMCz4TVzhjowdO9adIIAYg7PQBhXAAHbr1s0yRAtmvAoH5oMDC9gP9EVJSUk+2+FLlYdUaz9//nxZ1FS+CqDurjCAKgi9e/cWT58+lQEAOE7V29gUP3z4sLh37548ZoJ3kZAIFkA2TLSYeQAwXw9xrFLz7dq1c4sBJgjxQNz7+PHjoFLlvrInrLd+5hhvbGysLN5o/PjxspTb8aPFVY4450oAA/lw8eLFMgcIALECsF58dO1n6HechKhIgvFidUUA5sA8BewIwcGu6JML0HV/E2G8sOouPZgNB+n7nxzQz3Lw7yaoLj4Uj0cAWPCnB/S3EP+tCvQz1BiMyB8HELo0ECNWGQheAQBESOjiwBwA+OlPDgpWXN8tq6wE/c/ngFwAvoERwRYUdmoaIdpBmoxKDfiYVCJdf3YQTuwKsOHFytOifODctdlUiII6KFiqLyU9UURXB7XnU52TnFsnRQn5CQkJeWlpaY6srCwnWXT551+pqam5ycnJMG11XL8b7SpR1K8s9h/xWChxK44kow5nekJdPmEI/VYIH4BiP83lQ+IEajFOYPCfmbmO80kq+kGFZF0dFI46iMMwtgKKUArgoZBj7iBH3JmZmelIT08voLAyr3nz5rlkTLBr9ibE/POxnyPz15oGQAOgAdAAaMgAaAA0ABoADRkADYAGQAOgIQOgAdAAaAA0ZAD8PfQv6Mo5dltYcs4AAAAASUVORK5CYIJ4nOMx143KLIi3MNAryEtnGAUjDeQJ4Zf/ffpOACMDAFZUB1HKtctOAQAAAAIAAAAkAAAAbhIAAAAAAAABAAAAAAAAAAAAAAA

-
 [EncodedFile-InterfaceEncoded-VistalcoDownload_16.png]
 lines=0
 0=iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADZklEQVQ4jUWT3WubdRTHP89L3p8mTfpim7ZL37ZZp6UTV1F0g00dXky9myAiXhf8A0QRvFCGF96o4IViJ0Mm4lSUIbIqdVs6W+3W1da+LW3SpC9Jm6TJ8+RJ+uT5SdLBDpzD4cD3e76Hc470zIUTHJiMU4szP3Yav+stXr00PVQqNL4SG1ea/ltYW29wp8Y2/roxuTF2CzOhANU6StVLe/VEkqBg5sHv8vf2D38b+Hv4bJdS5chRgcdUuZ28hud4elr+ff1lSCbud0UtapkaHCFnMLNPhc8+/8XsyEsEIxK4VYVCBXo98PP8Ga7eOnbc8l2/pzg/HHD1xJaNhSxq/+N9gI1pO/CrI9+c7yM46AMnIGqDqTCgQjoCi3EX0ptBVaRPfR/76Z/BuoL9vIGo6pjejhcOO7wnxVacsd0k4YYAgz2P4LEhU3PHCk88d4Ngbpu07H4sfT1y3mTtspqYy2OXDfTW1tOPhsfJKVPMbW7QUI4Q7nqPlKgwkbvJkrFNceMQvt4Z8EPjcNuZTHTtslpKeqESIG/FO2NCojtwglTvDI41ia/iP5DyXqNs5PFrTSwsj5CdPYe76Qr5lcZwfYT8TQ+KpWNFAtmELfGj8TUxLUdDeYaN6hKhUBiqMgV1hsaBL1m68ixWIUOlulhfn6IdbaVcbqN8+x2s0OJrpcN3kHRw52t1F3ljmb29KusJnYr0L67QFLolMKaXPy8nzEm19ekZ2WpWPFu/Vv5wO1djzYfoqcjgmHuIwuIHbGkfoYWmEXYDOztFKGqUk3rJuJO9VFdguhGyJd7vPJe46n+4YPs68HqCkDO20AJRukIa89FtbKuCpNrsb/vIfLf1hlXMT9UJnL1QXCLqj8ivt58S7e2tENLADkK3v8zUxR2yq1k8ARV5p43cpPPdStb3mRLqROgpVFcASXFhbE+IC76I8qnvySpeDY41aUx+coS9TRdDJ1swkyqbt/QdW6/OSk1VkOSDUxZVhOIkZGaFvjshVoVX7u4fcpP8s2Iu3M381tf34oqc6rJ25+Y3S/vpFcknTUv79sHz1Ajq0WbX6WfU3LOFdU8dLewL7o5XPqYl/vZc9Beqqx0QEjg0LzIC6T74AYF0QFjc5KJtWslk1Oos5Rn1toDd7MDINSK7aydvI+QHYID/Ab48jqdfCQxIAAAAAElFTkSuQmCCeJwTD8ssLknMSc53yS/Py8lPTIk3NNMryEtnGAUjAsxnxi+fwnL8OSMDAKdDC4fwuePJAQAAAAIAAAAvAAAAnwMAAAAAAAABAAAAAAAAAAAAAAA
--- a/Projects/PhoenixPE/Applications/Productivity/Notepad++.script
+++ b/Projects/PhoenixPE/Applications/Productivity/Notepad++.script
@@ -168,7 +168,7 @@ RegHiveUnLoad,Tmp_Software
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
--- a/Projects/PhoenixPE/Applications/Productivity/Notepad3.script
+++ b/Projects/PhoenixPE/Applications/Productivity/Notepad3.script
@@ -130,7 +130,7 @@ Decompress,"%ProjectTemp%\%ProgramFolder%\%InnerSetupFile%",#1
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
--- a/Projects/PhoenixPE/Applications/Productivity/SnippingTool.script
+++ b/Projects/PhoenixPE/Applications/Productivity/SnippingTool.script
@@ -89,7 +89,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Snipping Tool"
 System,Cursor,Normal

@@ -141,7 +141,7 @@ cb_DesktopShc=Desktop,1,3,12,64,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,83,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,102,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,121,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Productivity
 txt_ShortcutName="Shortcut Name:",1,0,12,203,119,21,"Snipping Tool"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Productivity/StepsRecorder.script
+++ b/Projects/PhoenixPE/Applications/Productivity/StepsRecorder.script
@@ -83,7 +83,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Steps Recorder"
 System,Cursor,Normal

@@ -135,7 +135,7 @@ cb_DesktopShc=Desktop,1,3,12,64,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,83,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,102,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,121,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Productivity
 txt_ShortcutName="Shortcut Name:",1,0,12,203,119,21,"Steps Recorder"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script
+++ b/Projects/PhoenixPE/Applications/Productivity/SumatraPDF.script
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/Projects/PhoenixPE/Applications/Productivity/Wordpad.script
+++ b/Projects/PhoenixPE/Applications/Productivity/Wordpad.script
@@ -100,7 +100,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Accessories"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Productivity"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Wordpad"
 WriteInterface,Value,%ScriptFile%,Interface,cb_RegFileExt,True
 System,Cursor,Normal
@@ -153,7 +153,7 @@ cb_DesktopShc=Desktop,1,3,12,64,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,83,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,102,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,121,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Accessories
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,161,119,21,Productivity
 txt_ShortcutName="Shortcut Name:",1,0,12,203,119,21,Wordpad
 bvl_Options=Options,1,12,145,50,160,184,8,Bold
 cb_RegFileExt="Register file extensions",1,3,152,64,192,18,True
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -166,7 +166,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"AIDA64"
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_Extreme,True
 WriteInterface,Value,%ScriptFile%,Interface,rbtn_Engineer,False
@@ -229,7 +229,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,AIDA64
 bvl_DownloadRelease=,1,12,150,50,197,25
 lbl_Release=Release:,1,1,157,58,48,16,8,Bold
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -162,7 +162,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"CPU-Z"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English"
 System,Cursor,Normal
@@ -222,7 +222,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,CPU-Z
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -144,7 +144,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"GPU-Z"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English (United States)"
 System,Cursor,Normal
@@ -204,7 +204,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,GPU-Z
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -160,7 +160,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"HWinfo"
 WriteInterface,Value,%ScriptFile%,Interface,cb_ShowSummaryOnStartup,True
 System,Cursor,Normal
@@ -220,7 +220,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,HWinfo
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 cb_ShowSummaryOnStartup="Show Summary on Startup",1,3,157,104,180,18,True
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -75,7 +75,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"Windows Administrative Tools"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"System Information"
 System,Cursor,Normal

@@ -127,7 +127,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"Windows Administrative Tools"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,"System Information"

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -151,7 +151,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"PCI-Z"
 System,Cursor,Normal

@@ -211,7 +211,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PCI-Z

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -161,7 +161,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Info"
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Information"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"Speccy"
 WriteInterface,Value,%ScriptFile%,Interface,cmb_Language,"English [1033]"
 System,Cursor,Normal
@@ -221,7 +221,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Info"
+txt_StartMenuFolder="Start Menu Folder:",1,0,12,201,119,21,"System Information"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,Speccy
 bvl_Options=Options,1,12,150,90,197,184,8,Bold
 lbl_Language=Language,1,1,159,110,153,16,8,Normal
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -103,7 +103,7 @@ System,EndLocal
 [#DownloadProgram#]
 // ===============================================================================================================================
 // Name...........: DownloadProgram
-// Description....: Download the program files from the author's website and encode them into our script.
+// Description....: Download the program files from the author's website.
 // Syntax.........: Run,%ScriptFile%,DownloadProgram
 // Parameters.....: 
 // Return values..: 
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -128,7 +128,7 @@ WriteInterface,Value,%ScriptFile%,Interface,cb_DesktopShc,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_StartMenuShc,True
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToTaskbar,False
 WriteInterface,Value,%ScriptFile%,Interface,cb_PinToStartMenu,False
-WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,""
+WriteInterface,Value,%ScriptFile%,Interface,txt_StartMenuFolder,"System Tools"
 WriteInterface,Value,%ScriptFile%,Interface,txt_ShortcutName,"PowerShell"
 System,Cursor,Normal

@@ -187,7 +187,7 @@ cb_DesktopShc=Desktop,1,3,12,104,122,18,False
 cb_StartMenuShc="Start Menu",1,3,12,123,122,18,True
 cb_PinToTaskbar="Pin to Taskbar",1,3,12,142,122,18,False
 cb_PinToStartMenu="Pin to Start Menu",1,3,12,161,122,18,False
-txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,
+txt_StartMenuFolder="Start Menu folder:",1,0,12,201,119,21,"System Tools"
 txt_ShortcutName="Shortcut Name:",1,0,12,243,119,21,PowerShell

 [InterfaceEncoded]
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -6,7 +6,7 @@
 // Additional 3rd party tools, encoded files, and programs used by the project are the property
 // of their respective authors and may be subject to their own license agreement.
 //
-// Copyright (c) 2014-2019 Jonathan Holmgren (Homes32)
+// Copyright (c) 2014-2020 Jonathan Holmgren (Homes32)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
--- a/Projects/PhoenixPE/Applications/System
+++ b/Projects/PhoenixPE/Applications/System
@@ -41,20 +41,22 @@ Date=2020-03-01
 [Variables]
 %ProgramFolder%="ServiWin"
 %ProgramExe%="ServiWin.exe"
-%DownloadURL32%=https://www.nirsoft.net/utils/serviwin.zip
-%DownloadURL64%=https://www.nirsoft.net/utils/serviwin-x64.zip
-%aLangMap%=Arabic|serviwin_arabic1.zip|"Chinese (Simplified)"|serviwin_schinese.zip|"Chinese (Traditional)"|serviwin_tchinese.zip|Czech|serviwin_czech.zip|Dutch|serviwin_dutch.zip|French|serviwin_french.zip|Galician|serviwin_galician.zip|German|serviwin_german.zip|Greek|serviwin_greek.zip|Hebrew|serviwin_hebrew.zip|Italian|serviwin_italian.zip|Japanese|serviwin_japanese.zip|Polish|serviwin_polish.zip|"Portuguese (Brazil)"|serviwin_portuguese_brazil.zip|Romanian|serviwin_romanian.zip|Russian|serviwin_russian.zip|Slovak|serviwin_slovak.zip|Spanish|serviwin_spanish.zip|Swedish|serviwin_swedish.zip|Taiwanese|serviwin_taiwanese.zip|Turkish|serviwin_turkish.zip|Valencian|serviwin_valencian.zip
+%DownloadURLx86%=https://www.nirsoft.net/utils/serviwin.zip
+%DownloadURLx64%=https://www.nirsoft.net/utils/serviwin-x64.zip
+%SetupFile%="ServiWin-%SourceArch%.zip"
+%aLangMap%=Arabic|serviwin_arabic1.zip|Chinese (Simplified)|serviwin_schinese.zip|Chinese (Traditional)|serviwin_tchinese.zip|Czech|serviwin_czech.zip|Dutch|serviwin_dutch.zip|French|serviwin_french.zip|Galician|serviwin_galician.zip|German|serviwin_german.zip|Greek|serviwin_greek.zip|Hebrew|serviwin_hebrew.zip|Italian|serviwin_italian.zip|Japanese|serviwin_japanese.zip|Polish|serviwin_polish.zip|Portuguese (Brazil)|serviwin_portuguese_brazil.zip|Romanian|serviwin_romanian.zip|Russian|serviwin_russian.zip|Slovak|serviwin_slovak.zip|Spanish|serviwin_spanish.zip|Swedish|serviwin_swedish.zip|Taiwanese|serviwin_taiwanese.zip|Turkish|serviwin_turkish.zip|Valencian|serviwin_valencian.zip

 [Process]
 Echo,"Processing %ScriptTitle%..."

 If,%cb_RunFromRam%,Equal,True,RunFromRam
+Run,%ScriptFile%,SetProgramArch

 ///////////////////////////////////////////////////////////////////////////////////
 // Extract

 If,%cb_AlwaysDownload%,Equal,True,DirDeleteEx,"%ProgramsCache%\%ProgramFolder%"
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
 Run,%ScriptFile%,ExtractProgram,%TargetPrograms%\%ProgramFolder%
 ExtractAllFiles,%ScriptFile%,%SourceArch%,%TargetPrograms%\%ProgramFolder%

@@ -104,7 +106,7 @@ If,%cb_PinToStartMenu2%,Equal,True,PinShortcut,StartMenu,Auto,"%PEPrograms%\%Pro
 // ===============================================================================================================================
 [ExtractProgram]
 Echo,"Extracting files..."
-Decompress,"%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip",#1
+Decompress,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",#1

 [#DownloadProgram#]
 // ===============================================================================================================================
@@ -118,15 +120,29 @@ Decompress,"%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip",#1
 // Related........: 
 // ===============================================================================================================================
 [DownloadProgram]
+Echo,"Downloading %ScriptTitle%..."
+Run,%ScriptFile%,SetProgramArch
+WebGet,%DownloadURL%,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",NOERR
+If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+
+[#SetProgramArch#]
+// ===============================================================================================================================
+// Name...........: SetProgramArch
+// Description....: Configure the script for the correct source architecture.
+// Syntax.........: Run,%ScriptFile%,SetProgramArch
+// Parameters.....: 
+// Return values..: Sets the following local variables:
+//                  %DownloadURL%    - The x86 or x64 download URL for %SetupFile%.
+// Author.........: Homes32
+// Remarks........:
+// Related........: 
+// ===============================================================================================================================
+[SetProgramArch]
 If,%SourceArch%,Equal,x64,Begin
-  Echo,"Downloading %ScriptTitle% x64..."
-  WebGet,%DownloadURL64%,"%ProgramsCache%\%ProgramFolder%\ServiWin-x64.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
-End
+  Set,%DownloadURL%,%DownloadURLx64%
+End  
 Else,Begin
-  Echo,"Downloading %ScriptTitle% x86..."
-  WebGet,%DownloadURL32%,"%ProgramsCache%\%ProgramFolder%\ServiWin-x86.zip",NOERR
-  If,Not,#r,Equal,200,Halt,"Download failed: The code returned was [#r]."
+  Set,%DownloadURL%,%DownloadURLx86%
 End

 [#LaunchProgram#]
@@ -141,9 +157,10 @@ End
 // Related........: btn_LaunchProgram
 // ===============================================================================================================================
 [LaunchProgram]
-If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\ServiWin-%SourceArch%.zip",Run,%ScriptFile%,DownloadProgram
-Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%\%SourceArch%
-ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%SourceArch%\%ProgramExe%"
+Run,%ScriptFile%,SetProgramArch
+If,Not,ExistFile,"%ProgramsCache%\%ProgramFolder%\%SetupFile%",Run,%ScriptFile%,DownloadProgram
+Run,%ScriptFile%,ExtractProgram,%ProjectTemp%\%ProgramFolder%
+ShellExecuteEx,Open,"%ProjectTemp%\%ProgramFolder%\%ProgramExe%"

 [#ClearDownloadCache#]
 // ===============================================================================================================================