diff --git a/tools/estudio_wizard/ewf_ise_console_wizard-safe.ecf b/tools/estudio_wizard/ewf_ise_console_wizard-safe.ecf
new file mode 100644
index 00000000..5e4b1450
--- /dev/null
+++ b/tools/estudio_wizard/ewf_ise_console_wizard-safe.ecf
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="wizard" uuid="835D7132-1767-4462-AAE0-A27ECBD4E5AB" library_target="wizard">
+	<target name="wizard">
+		<root class="EWF_CONSOLE_WIZARD_APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		</option>
+		<setting name="console_application" value="true"/>
+		<setting name="concurrency" value="none"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="console_wizard" location="lib\wizard\estudio_console_wizard-safe.ecf" readonly="false"/>
+		<library name="template_smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true">
+			<file_rule>
+				<exclude>/gui$</exclude>
+				<exclude>/lib$</exclude>
+			</file_rule>
+		</cluster>
+	</target>
+</system>
diff --git a/tools/estudio_wizard/ewf_ise_wizard-safe.ecf b/tools/estudio_wizard/ewf_ise_wizard-safe.ecf
index 2c3cc9ae..6b399757 100644
--- a/tools/estudio_wizard/ewf_ise_wizard-safe.ecf
+++ b/tools/estudio_wizard/ewf_ise_wizard-safe.ecf
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="wizard" uuid="F881A707-745E-4C6D-90D1-F820EE3B1470" library_target="wizard">
 	<target name="wizard">
-		<root class="EWF_CONSOLE_WIZARD_APPLICATION" feature="make"/>
-		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
-		</option>
-		<setting name="console_application" value="true"/>
-		<setting name="concurrency" value="none"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="console_wizard" location="lib\wizard\estudio_console_wizard-safe.ecf" readonly="false"/>
-		<library name="template_smarty" location="$ISE_LIBRARY\contrib\library\text\template\smarty\smarty-safe.ecf"/>
-		<cluster name="src" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/gui$</exclude>
-				<exclude>/lib$</exclude>
-			</file_rule>
-		</cluster>
-	</target>
-	<target name="gui_wizard">
 		<root class="EWF_GRAPHICAL_WIZARD" feature="make_and_launch"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
diff --git a/tools/estudio_wizard/install_ise_wizard.bat b/tools/estudio_wizard/install_ise_wizard.bat
index ca06d95a..1172efde 100644
--- a/tools/estudio_wizard/install_ise_wizard.bat
+++ b/tools/estudio_wizard/install_ise_wizard.bat
@@ -1,7 +1,7 @@
 setlocal
 
 set TMP_ROOTDIR=%~dp0rootdir
-set TMP_TARGETNAME=gui_wizard
+set TMP_TARGETNAME=wizard
 
 set WIZ_TARGET=%ISE_EIFFEL%\studio\wizards\new_projects\ewf
 rd /q/s %WIZ_TARGET%
diff --git a/tools/estudio_wizard/install_ise_wizard.sh b/tools/estudio_wizard/install_ise_wizard.sh
index ab64d020..9b5496ea 100644
--- a/tools/estudio_wizard/install_ise_wizard.sh
+++ b/tools/estudio_wizard/install_ise_wizard.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 mkdir tmp
-ecb -config ewf_ise_wizard-safe.ecf -target gui_wizard -finalize -c_compile -project_path tmp
+ecb -config ewf_ise_wizard-safe.ecf -target wizard -finalize -c_compile -project_path tmp
 mkdir -p spec/$ISE_PLATFORM
 mv tmp/EIFGENs/wizard/F_code/wizard spec/$ISE_PLATFORM/wizard
 rm -rf tmp
diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat
index ff75cdc2..8d345df9 100644
--- a/tools/install_ewf.bat
+++ b/tools/install_ewf.bat
@@ -64,7 +64,6 @@ echo Install library: ewf/wsf_html
 echo Install library: ewf/encoder
 %COPYCMD% %TMP_DIR%\library\text\encoder	%TMP_CONTRIB_DIR%\library\web\framework\ewf\text\encoder
 
-
 echo Install library: ewf/obsolete
 %COPYCMD% %TMP_DIR%\library\server\obsolete	%TMP_CONTRIB_DIR%\library\web\framework\ewf\obsolete
 
@@ -74,6 +73,15 @@ echo Install examples
 %COPYCMD% %TMP_DIR%\examples	%TMP_CONTRIB_DIR%\examples\web\ewf
 %COPYCMD% %TMP_DIR%\precomp		%TMP_CONTRIB_DIR%\examples\web\ewf_precomp
 
+echo Install EWF wizard
+%COPYCMD% %TMP_DIR%\tools\estudio_wizard	%TMP_TARGET_DIR%\help\wizards\ewf
+rename %TMP_TARGET_DIR%\help\wizards\ewf\install_ise_wizard.bat %TMP_TARGET_DIR%\help\wizards\ewf\install.bat
+rename %TMP_TARGET_DIR%\help\wizards\ewf\install_ise_wizard.sh %TMP_TARGET_DIR%\help\wizards\ewf\install.sh
+rename %TMP_TARGET_DIR%\help\wizards\ewf\ewf_ise_wizard-safe.ecf %TMP_TARGET_DIR%\help\wizards\ewf\wizard.ecf
+rename %TMP_TARGET_DIR%\help\wizards\ewf\ewf_ise_console_wizard-safe.ecf %TMP_TARGET_DIR%\help\wizards\ewf\console_wizard.ecf
+%SAFE_MD% %TMP_TARGET_DIR%\help\wizards\ewf\rootdir\pixmaps
+%SAFE_MD% %TMP_TARGET_DIR%\help\wizards\ewf\rootdir\templates
+
 echo Install library: error
 %COPYCMD% %TMP_DIR%\library\utility\general\error	%TMP_CONTRIB_DIR%\library\utility\general\error
 echo Install library: http_client
diff --git a/tools/uninstall_ewf.bat b/tools/uninstall_ewf.bat
index c0b09777..6a3d2b86 100644
--- a/tools/uninstall_ewf.bat
+++ b/tools/uninstall_ewf.bat
@@ -48,6 +48,9 @@ echo Uninstall ewf examples
 %RDCMD% %TMP_CONTRIB_DIR%\examples\web\ewf
 %RDCMD% %TMP_CONTRIB_DIR%\examples\ewb\ewf_precomp
 
+echo Uninstall ewf wizard
+%RDCMD% %TMP_TARGET_DIR%\help\wizards\ewf
+
 echo Uninstall library: error
 %RDCMD% %TMP_CONTRIB_DIR%\library\utility\general\error
 echo Uninstall library: http_client