diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js
index 0117b66ac5..d65e8689c1 100644
--- a/Engines/Wine/Engine/Object/script.js
+++ b/Engines/Wine/Engine/Object/script.js
@@ -21,6 +21,26 @@ function Wine() {
     this._OperatingSystemFetcher = Bean("operatingSystemFetcher");
 }
 
+/**
+*
+* @returns {string} architecture ("x86" or "amd64")
+*/
+Wine.prototype.architecture = function () {
+    // get
+    if (arguments.length == 0) {
+        if (fileExists(this.prefixDirectory())) {
+            var configFactory = Bean("compatibleConfigFileFormatFactory");
+            var containerConfiguration = configFactory.open(this.prefixDirectory() + "/phoenicis.cfg");
+            var architecture = containerConfiguration.readValue("wineArchitecture", "x86");
+            return architecture;
+        }
+        else {
+            print("Wine prefix \"" + this.prefixDirectory() + "\" does not exist!");
+            return "";
+        }
+    }
+};
+
 /**
 *
 * @param {SetupWizard} [wizard]
@@ -128,6 +148,8 @@ Wine.prototype.runInsidePrefix = function (executable, args) {
 Wine.prototype.run = function (executable, args, workingDirectory, captureOutput, wait, userData) {
     if (!args) {
         args = [];
+    } else if (typeof args === 'string' || args instanceof String) {
+        args = [args];
     }
     if (!workingDirectory) {
         workingDirectory = this._implementation.getContainerDirectory(this._implementation.getWorkingContainer());
diff --git a/Engines/Wine/Verbs/PhysX/script.js b/Engines/Wine/Verbs/PhysX/script.js
index 3c66c526b7..f947b1eb79 100644
--- a/Engines/Wine/Verbs/PhysX/script.js
+++ b/Engines/Wine/Verbs/PhysX/script.js
@@ -8,14 +8,14 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.physx = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://uk.download.nvidia.com/Windows/9.14.0702/PhysX-9.14.0702-SystemSoftware.msi")
         .checksum("81e2d38e2356e807ad80cdf150ed5acfff839c8b")
         .name("PhysX-9.14.0702-SystemSoftware.msi")
         .get();
 
-    this.run("msiexec", ["/i", setupFile, "/q"])
-        .wait(tr("Please wait while {0} is installed ...", "PhysX"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "PhysX"));
+    this.run("msiexec", ["/i", setupFile, "/q"], null, false, true);
 
     return this;
 };
diff --git a/Engines/Wine/Verbs/QuickTime 7.6/script.js b/Engines/Wine/Verbs/QuickTime 7.6/script.js
index f8f06048f5..3c494f51b8 100644
--- a/Engines/Wine/Verbs/QuickTime 7.6/script.js	
+++ b/Engines/Wine/Verbs/QuickTime 7.6/script.js	
@@ -7,14 +7,14 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.quicktime76 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://appldnld.apple.com/QuickTime/041-0025.20101207.Ptrqt/QuickTimeInstaller.exe")
         .checksum("1eec8904f041d9e0ad3459788bdb690e45dbc38e")
         .name("QuickTimeInstaller.exe")
         .get();
 
-    this.run(setupFile, ["ALLUSERS=1", "DESKTOP_SHORTCUTS=0", "QTTaskRunFlags=0", "QTINFO.BISQTPRO=1", "SCHEDULE_ASUW=0", "REBOOT_REQUIRED=No"])
-        .wait(tr("Please wait while {0} is installed ...", "QuickTime"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "QuickTime"));
+    this.run(setupFile, ["ALLUSERS=1", "DESKTOP_SHORTCUTS=0", "QTTaskRunFlags=0", "QTINFO.BISQTPRO=1", "SCHEDULE_ASUW=0", "REBOOT_REQUIRED=No"], null, false, true);
 
     return this;
 };
diff --git a/Engines/Wine/Verbs/Tahoma/script.js b/Engines/Wine/Verbs/Tahoma/script.js
index 9e19121f20..6006938674 100644
--- a/Engines/Wine/Verbs/Tahoma/script.js
+++ b/Engines/Wine/Verbs/Tahoma/script.js
@@ -10,14 +10,14 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.tahoma = function () {
     var tahoma = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://github.com/caarlos0/msfonts/blob/master/fonts/tahoma.ttf?raw=true")
         .checksum("ae34f679d7f384123ff10453bbeaca649d4987b1")
         .name("tahoma.ttf")
         .get();
 
     var tahomabd = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://github.com/caarlos0/msfonts/blob/master/fonts/tahomabd.ttf?raw=true")
         .checksum("07e766641293bfd570ed85bce75abc9be2da0ee1")
         .name("tahomabd.ttf")
diff --git a/Engines/Wine/Verbs/Uplay/script.js b/Engines/Wine/Verbs/Uplay/script.js
index 7e8cbd60aa..94dbf0116f 100644
--- a/Engines/Wine/Verbs/Uplay/script.js
+++ b/Engines/Wine/Verbs/Uplay/script.js
@@ -7,13 +7,13 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.uplay = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UplayInstaller.exe")
         .name("UplayInstaller.exe")
         .get();
 
-    this.run(setupFile)
-        .wait(tr("Please follow the steps of the Uplay setup.\n\nUncheck \"Run Uplay\" or close Uplay completely after the setup so that the installation can continue."));
+    this.wizard().wait(tr("Please follow the steps of the Uplay setup.\n\nUncheck \"Run Uplay\" or close Uplay completely after the setup so that the installation can continue."));
+    this.run(setupFile, [], null, false, true);
 
     return this;
 };
diff --git a/Engines/Wine/Verbs/Windows XP SP 3/script.js b/Engines/Wine/Verbs/Windows XP SP 3/script.js
index 3224f7bcd8..99b4bafec5 100644
--- a/Engines/Wine/Verbs/Windows XP SP 3/script.js	
+++ b/Engines/Wine/Verbs/Windows XP SP 3/script.js	
@@ -16,7 +16,7 @@ Wine.prototype.sp3extract = function (fileToExtract) {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://freeware.epsc.wustl.edu/Win/XP_SP3/WindowsXP-KB936929-SP3-x86-ENU.exe")// Just a test, the URL needs to be fixed
         .checksum("c81472f7eeea2eca421e116cd4c03e2300ebfde4")
         .name("WindowsXP-KB936929-SP3-x86-ENU.exe")
@@ -24,7 +24,7 @@ Wine.prototype.sp3extract = function (fileToExtract) {
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.prefixDirectory() + "/drive_c/sp3/")
         .extract(["-F", "i386/" + fileToExtract.slice(0, -1) + "_"]);
 
@@ -32,7 +32,7 @@ Wine.prototype.sp3extract = function (fileToExtract) {
 
     new CabExtract()
         .archive(this.prefixDirectory() + "/drive_c/sp3/i386/" + fileToExtract.slice(0, -1) + "_")
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(that._targetDirectory)
         .extract();
 
diff --git a/Engines/Wine/Verbs/corefonts/script.js b/Engines/Wine/Verbs/corefonts/script.js
index 650f09b631..1aa7d1d9e0 100644
--- a/Engines/Wine/Verbs/corefonts/script.js
+++ b/Engines/Wine/Verbs/corefonts/script.js
@@ -11,77 +11,77 @@ Wine.prototype.corefonts = function () {
     var fontResources =
     [
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/arial32.exe")
             .checksum("6d75f8436f39ab2da5c31ce651b7443b4ad2916e")
             .name("arial32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/arialb32.exe")
             .checksum("d45cdab84b7f4c1efd6d1b369f50ed0390e3d344")
             .name("arialb32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/comic32.exe")
             .checksum("2371d0327683dcc5ec1684fe7c275a8de1ef9a51")
             .name("comic32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/courie32.exe")
             .checksum("06a745023c034f88b4135f5e294fece1a3c1b057")
             .name("courie32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/georgi32.exe")
             .checksum("90e4070cb356f1d811acb943080bf97e419a8f1e")
             .name("georgi32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/impact32.exe")
             .checksum("86b34d650cfbbe5d3512d49d2545f7509a55aad2")
             .name("impact32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/times32.exe")
             .checksum("20b79e65cdef4e2d7195f84da202499e3aa83060")
             .name("times32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/trebuc32.exe ")
             .checksum("50aab0988423efcc9cf21fac7d64d534d6d0a34a")
             .name("trebuc32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/verdan32.exe ")
             .checksum("f5b93cedf500edc67502f116578123618c64a42a")
             .name("verdan32.exe")
             .get(),
 
         new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://mirrors.kernel.org/gentoo/distfiles/webdin32.exe ")
             .checksum("2fb4a42c53e50bc70707a7b3c57baf62ba58398f")
             .name("webdin32.exe")
             .get()
     ];
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Installing {0} ...", tr("fonts")));
     progressBar.setProgressPercentage(0.);
     var numInstalledFonts = 0;
diff --git a/Engines/Wine/Verbs/d3dx10/script.js b/Engines/Wine/Verbs/d3dx10/script.js
index aae4dafdde..ac2078a972 100644
--- a/Engines/Wine/Verbs/d3dx10/script.js
+++ b/Engines/Wine/Verbs/d3dx10/script.js
@@ -26,13 +26,13 @@ Wine.prototype.d3dx10 = function () {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
         .checksum("f8f1217f666bf2f6863631a7d5e5fb3a8d1542df")
         .name("directx_Jun2010_redist.exe")
         .get();
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Extracting {0} ...", "DirectX 10"));
     progressBar.setProgressPercentage(0.);
 
diff --git a/Engines/Wine/Verbs/d3dx9/script.js b/Engines/Wine/Verbs/d3dx9/script.js
index a9a9bcb3e9..920686cf8c 100644
--- a/Engines/Wine/Verbs/d3dx9/script.js
+++ b/Engines/Wine/Verbs/d3dx9/script.js
@@ -26,13 +26,13 @@ Wine.prototype.d3dx9 = function () {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
         .checksum("f8f1217f666bf2f6863631a7d5e5fb3a8d1542df")
         .name("directx_Jun2010_redist.exe")
         .get();
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Extracting {0} ...", "DirectX 9"));
     progressBar.setProgressPercentage(0.);
 
diff --git a/Engines/Wine/Verbs/dotnet40/script.js b/Engines/Wine/Verbs/dotnet40/script.js
index e75f8bf31f..7de9f9ef6a 100644
--- a/Engines/Wine/Verbs/dotnet40/script.js
+++ b/Engines/Wine/Verbs/dotnet40/script.js
@@ -10,7 +10,7 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.dotnet40 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe")
         .checksum("58da3d74db353aad03588cbb5cea8234166d8b99")
         .name("dotNetFx40_Full_x86_x64.exe")
@@ -18,8 +18,8 @@ Wine.prototype.dotnet40 = function () {
 
     this.uninstall("Mono");
 
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
 
@@ -27,17 +27,17 @@ Wine.prototype.dotnet40 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""])
-        .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.0"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
         .do();
 
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"])
-        .wait(tr("Please wait ..."));
-    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Install", "/t", "REG_DWORD", "/d", "0001", "/f"], null, false, true);
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["add", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4\Full", "/v", "Version", "/t", "REG_SZ", "/d", "4.0.30319", "/f"], null, false, true);
 
     return this;
 };
diff --git a/Engines/Wine/Verbs/dotnet45/script.js b/Engines/Wine/Verbs/dotnet45/script.js
index f04ff547f0..ebc6796fb9 100644
--- a/Engines/Wine/Verbs/dotnet45/script.js
+++ b/Engines/Wine/Verbs/dotnet45/script.js
@@ -19,7 +19,7 @@ Wine.prototype.dotnet45 = function () {
     var OSVersion = this.windowsVersion();
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe")
         .checksum("b2ff712ca0947040ca0b8e9bd7436a3c3524bb5d")
         .name("dotnetfx45_full_x86_x64.exe")
@@ -27,8 +27,8 @@ Wine.prototype.dotnet45 = function () {
 
     this.uninstall("Mono");
 
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
 
@@ -39,8 +39,8 @@ Wine.prototype.dotnet45 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""])
-        .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/dotnet452/script.js b/Engines/Wine/Verbs/dotnet452/script.js
index fd8bb06472..9ba005ca25 100644
--- a/Engines/Wine/Verbs/dotnet452/script.js
+++ b/Engines/Wine/Verbs/dotnet452/script.js
@@ -18,7 +18,7 @@ Wine.prototype.dotnet452 = function () {
     var OSVersion = this.windowsVersion();
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
         .checksum("89f86f9522dc7a8a965facce839abb790a285a63")
         .name("NDP452-KB2901907-x86-x64-AllOS-ENU.exe")
@@ -26,8 +26,8 @@ Wine.prototype.dotnet452 = function () {
 
     this.uninstall("Mono");
 
-    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"])
-        .wait(tr("Please wait ..."));
+    this.wizard().wait(tr("Please wait ..."));
+    this.run("reg", ["delete", "HKLM\Software\Microsoft\NET Framework Setup\NDP\v4", "/f"], null, false, true);
 
     remove(this.system32directory() + "/mscoree.dll");
 
@@ -38,8 +38,8 @@ Wine.prototype.dotnet452 = function () {
         .set("builtin", ["fusion"])
         .do();
 
-    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""])
-        .wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5.2"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", ".NET Framework 4.5.2"));
+    this.run(setupFile, [setupFile, "/q", "/c:\"install.exe /q\""], null, false, true);
 
     this.overrideDLL()
         .set("native", ["mscoree"])
diff --git a/Engines/Wine/Verbs/luna/script.js b/Engines/Wine/Verbs/luna/script.js
index ff7f16340b..822f2cccd7 100644
--- a/Engines/Wine/Verbs/luna/script.js
+++ b/Engines/Wine/Verbs/luna/script.js
@@ -9,14 +9,14 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.luna = function () {
     var lunaStyle = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://repository.playonlinux.com/divers/luna.msstyles")
         .checksum("50a71767f90c1d3d86ca188a84393f2d39664311")
         .name("luna.msstyles")
         .get();
 
     var lunaReg = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://repository.playonlinux.com/divers/luna.reg")
         .checksum("074e655d391ae87527f4cc50ba822a8aad83a09f")
         .name("luna.reg")
diff --git a/Engines/Wine/Verbs/mfc42/script.js b/Engines/Wine/Verbs/mfc42/script.js
index 27f7aa5b9f..e7489d0753 100644
--- a/Engines/Wine/Verbs/mfc42/script.js
+++ b/Engines/Wine/Verbs/mfc42/script.js
@@ -8,7 +8,7 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.mfc42 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/vc60pro/Update/2/W9XNT4/EN-US/VC6RedistSetup_deu.exe")
         .checksum("a8c4dd33e281c166488846a10edf97ff0ce37044")
         .name("VC6RedistSetup_deu.exe")
@@ -19,13 +19,13 @@ Wine.prototype.mfc42 = function () {
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract();
 
     new CabExtract()
         .archive(this.system32directory() + "/vcredist.exe")
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract(['-F', 'mfc42*.dll']);
 
diff --git a/Engines/Wine/Verbs/msls31/script.js b/Engines/Wine/Verbs/msls31/script.js
index 298006b023..87ed06cfd4 100644
--- a/Engines/Wine/Verbs/msls31/script.js
+++ b/Engines/Wine/Verbs/msls31/script.js
@@ -7,7 +7,7 @@ include(["utils", "functions", "net", "resource"]);
 */
 Wine.prototype.msls31 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("ftp://ftp.hp.com/pub/softlib/software/msi/InstMsiW.exe")
         .checksum("4fc3bf0dc96b5cf5ab26430fac1c33c5c50bd142")
         .name("InstMsiW.exe")
@@ -17,7 +17,7 @@ Wine.prototype.msls31 = function () {
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract(["-F", "msls31.dll"]);
 
diff --git a/Engines/Wine/Verbs/mspatcha/script.js b/Engines/Wine/Verbs/mspatcha/script.js
index a12781d456..757728a63f 100644
--- a/Engines/Wine/Verbs/mspatcha/script.js
+++ b/Engines/Wine/Verbs/mspatcha/script.js
@@ -10,7 +10,7 @@ include(["utils", "functions", "filesystem", "files"]);
 Wine.prototype.mspatcha = function () {
     //Inspired from winetricks mspatcha, but with a link Phoenicis can understand
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://ftp.anadolu.edu.tr/Service_Packs/Windows_2000/W2ksp4_EN.exe")
         .checksum("fadea6d94a014b039839fecc6e6a11c20afa4fa8")
         .name("W2ksp4_EN.exe")
@@ -20,13 +20,13 @@ Wine.prototype.mspatcha = function () {
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract();
 
     new CabExtract()
         .archive(this.system32directory() + "/i386/mspatcha.dl_")
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract();
 
diff --git a/Engines/Wine/Verbs/quartz/script.js b/Engines/Wine/Verbs/quartz/script.js
index f4826d3abd..a2d818316f 100644
--- a/Engines/Wine/Verbs/quartz/script.js
+++ b/Engines/Wine/Verbs/quartz/script.js
@@ -10,7 +10,7 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.quartz = function (){
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://download.microsoft.com/download/E/E/1/EE17FF74-6C45-4575-9CF4-7FC2597ACD18/directx_feb2010_redist.exe")
         .checksum("a97c820915dc20929e84b49646ec275760012a42")
         .name("directx_feb2010_redist.exe")
@@ -18,13 +18,13 @@ Wine.prototype.quartz = function (){
 
     new CabExtract()
         .archive(setupFile)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.prefixDirectory() + "/TMP/")
         .extract(["-L", "-F", "dxnt.cab"]);
 
     new CabExtract()
         .archive(this.prefixDirectory() + "/TMP/dxnt.cab")
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.system32directory())
         .extract(["-L", "-F", "quartz.dll"]);
 
diff --git a/Engines/Wine/Verbs/secur32/script.js b/Engines/Wine/Verbs/secur32/script.js
index ae8c6515be..aba59009b1 100644
--- a/Engines/Wine/Verbs/secur32/script.js
+++ b/Engines/Wine/Verbs/secur32/script.js
@@ -9,7 +9,7 @@ include(["utils", "functions", "filesystem", "files"]);
 */
 Wine.prototype.secur32 = function () {
     var setupFilex86 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X86.exe")
         .checksum("c3516bc5c9e69fee6d9ac4f981f5b95977a8a2fa")
         .name("windows6.1-KB976932-X86.exe")
@@ -17,7 +17,7 @@ Wine.prototype.secur32 = function () {
 
     new CabExtract()
         .archive(setupFilex86)
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .to(this.prefixDirectory() + "/TMP/")
         .extract(["-L", "-F", "x86_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_a851f4adbb0d5141/secur32.dll"]);
 
@@ -27,7 +27,7 @@ Wine.prototype.secur32 = function () {
 
     if (this.architecture() == "amd64") {
         var setupFilex64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://download.microsoft.com/download/0/A/F/0AFB5316-3062-494A-AB78-7FB0D4461357/windows6.1-KB976932-X64.exe")
             .checksum("74865ef2562006e51d7f9333b4a8d45b7a749dab")
             .name("windows6.1-KB976932-X64.exe")
@@ -35,7 +35,7 @@ Wine.prototype.secur32 = function () {
 
         new CabExtract()
             .archive(setupFilex64)
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .to(this.prefixDirectory() + "/TMP/")
             .extract(["-L", "-F", "amd64_microsoft-windows-lsa_31bf3856ad364e35_6.1.7601.17514_none_04709031736ac277/secur32.dll"]);
 
diff --git a/Engines/Wine/Verbs/vcrun2003/script.js b/Engines/Wine/Verbs/vcrun2003/script.js
index d61265ab95..4dc325b5ae 100644
--- a/Engines/Wine/Verbs/vcrun2003/script.js
+++ b/Engines/Wine/Verbs/vcrun2003/script.js
@@ -9,14 +9,14 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2003 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://sourceforge.net/projects/bzflag/files/bzedit%20win32/1.6.5/BZEditW32_1.6.5.exe")
         .checksum("bdd1b32c4202fd77e6513fd507c8236888b09121")
         .name("BZEditW32_1.6.5.exe")
         .get();
 
-    this.run(setupFile, "/S")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2003 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2003 Redistributable (x86)"));
+    this.run(setupFile, "/S", null, false, true);
 
     var dlls = [
         "msvcp71",
diff --git a/Engines/Wine/Verbs/vcrun2005/script.js b/Engines/Wine/Verbs/vcrun2005/script.js
index 4c105fc179..3179e1e9e7 100644
--- a/Engines/Wine/Verbs/vcrun2005/script.js
+++ b/Engines/Wine/Verbs/vcrun2005/script.js
@@ -9,14 +9,14 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2005 = function () {
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE")
         .checksum("b8fab0bb7f62a24ddfe77b19cd9a1451abd7b847")
         .name("vcredist_x86.EXE")
         .get();
 
-    this.run(setupFile, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2005 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2005 Redistributable (x86)"));
+    this.run(setupFile, "/q", null, false, true);
 
     var dlls = [
         "atl80",
diff --git a/Engines/Wine/Verbs/vcrun2008/script.js b/Engines/Wine/Verbs/vcrun2008/script.js
index 1f2229b19a..e1947ea982 100644
--- a/Engines/Wine/Verbs/vcrun2008/script.js
+++ b/Engines/Wine/Verbs/vcrun2008/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2008 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe")
         .checksum("470640aa4bb7db8e69196b5edb0010933569e98d")
         .name("vcredist_x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2008 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2008 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe")
             .checksum("a7c83077b8a28d409e36316d2d7321fa0ccdb7e8")
             .name("vcredist_x64.exe")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2008 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2008 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     var dlls = [
diff --git a/Engines/Wine/Verbs/vcrun2010/script.js b/Engines/Wine/Verbs/vcrun2010/script.js
index b916032892..5b75d785a3 100644
--- a/Engines/Wine/Verbs/vcrun2010/script.js
+++ b/Engines/Wine/Verbs/vcrun2010/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2010 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe")
         .checksum("372d9c1670343d3fb252209ba210d4dc4d67d358")
         .name("vcredist_x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2010 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2010 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("http://download.microsoft.com/download/A/8/0/A80747C3-41BD-45DF-B505-E9710D2744E0/vcredist_x64.exe")
             .checksum("027d0c2749ec5eb21b031f46aee14c905206f482")
             .name("vcredist_x64.exe")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2010 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2010 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     var dlls = [
diff --git a/Engines/Wine/Verbs/vcrun2012/script.js b/Engines/Wine/Verbs/vcrun2012/script.js
index ec9e78eb8c..f7b3ac6228 100644
--- a/Engines/Wine/Verbs/vcrun2012/script.js
+++ b/Engines/Wine/Verbs/vcrun2012/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2012 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe")
         .checksum("96b377a27ac5445328cbaae210fc4f0aaa750d3f")
         .name("vcredist_x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2012 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2012 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("http://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe")
             .checksum("1a5d93dddbc431ab27b1da711cd3370891542797")
             .name("vcredist_x64")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2012 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2012 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     var dlls = [
diff --git a/Engines/Wine/Verbs/vcrun2013/script.js b/Engines/Wine/Verbs/vcrun2013/script.js
index 6dfc98e4db..3957d44ac6 100644
--- a/Engines/Wine/Verbs/vcrun2013/script.js
+++ b/Engines/Wine/Verbs/vcrun2013/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2013 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe")
         .checksum("df7f0a73bfa077e483e51bfb97f5e2eceedfb6a3")
         .name("vcredist_x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2013 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2013 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe")
             .checksum("8bf41ba9eef02d30635a10433817dbb6886da5a2")
             .name("vcredist_x64.exe")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2013 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2013 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     this.overrideDLL()
diff --git a/Engines/Wine/Verbs/vcrun2015/script.js b/Engines/Wine/Verbs/vcrun2015/script.js
index a7da6ac3be..3637ab9abb 100644
--- a/Engines/Wine/Verbs/vcrun2015/script.js
+++ b/Engines/Wine/Verbs/vcrun2015/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2015 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe")
         .checksum("bfb74e498c44d3a103ca3aa2831763fb417134d1")
         .name("vc_redist.x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2015 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2015 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe")
             .checksum("3155cb0f146b927fcc30647c1a904cd162548c8c")
             .name("vc_redist.x64.exe")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2015 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2015 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     var dlls = [
diff --git a/Engines/Wine/Verbs/vcrun2017/script.js b/Engines/Wine/Verbs/vcrun2017/script.js
index be7ba101cf..e262ec1ce4 100644
--- a/Engines/Wine/Verbs/vcrun2017/script.js
+++ b/Engines/Wine/Verbs/vcrun2017/script.js
@@ -9,25 +9,25 @@ include(["engines", "wine", "verbs", "luna"]);
 */
 Wine.prototype.vcrun2017 = function () {
     var setupFile32 = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe")
         .checksum("370583c380c26064885289037380af7d8d5f4e81")
         .name("vc_redist.x86.exe")
         .get();
 
-    this.run(setupFile32, "/q")
-        .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2017 Redistributable (x86)"));
+    this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2017 Redistributable (x86)"));
+    this.run(setupFile32, "/q", null, false, true);
 
     if (this.architecture() == "amd64") {
         var setupFile64 = new Resource()
-            .wizard(this._wizard)
+            .wizard(this.wizard())
             .url("https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe")
             .checksum("bdb645ebaf3c91eceb1a143be6793ca57e6435c3")
             .name("vc_redist.x64.exe")
             .get();
 
-        this.run(setupFile64, "/q")
-            .wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2017 Redistributable (x64)"));
+        this.wizard().wait(tr("Please wait while {0} is installed ...", "Microsoft Visual C++ 2017 Redistributable (x64)"));
+        this.run(setupFile64, "/q", null, false, true);
     }
 
     var dlls = [
diff --git a/Engines/Wine/Verbs/xact/script.js b/Engines/Wine/Verbs/xact/script.js
index 1176fae325..dac11eb2bd 100644
--- a/Engines/Wine/Verbs/xact/script.js
+++ b/Engines/Wine/Verbs/xact/script.js
@@ -41,13 +41,13 @@ Wine.prototype.xact = function () {
     };
 
     var setupFile = new Resource()
-        .wizard(this._wizard)
+        .wizard(this.wizard())
         .url("http://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
         .checksum("f8f1217f666bf2f6863631a7d5e5fb3a8d1542df")
         .name("directx_Jun2010_redist.exe")
         .get();
 
-    var progressBar = this._wizard.progressBar(tr("Please wait ..."));
+    var progressBar = this.wizard().progressBar(tr("Please wait ..."));
     progressBar.setText(tr("Extracting {0} ...", "Xact"));
     progressBar.setProgressPercentage(0.);