diff --git a/CONTENT.md b/CONTENT.md
index bb7b47b991..48f117dea4 100644
--- a/CONTENT.md
+++ b/CONTENT.md
@@ -3,4 +3,5 @@ http://www.desiquintans.com/articles.php?page=nounlist
http://wordlist.sourceforge.net/
Icons from
http://www.fatcow.com/free-icons
-za
\ No newline at end of file
+Wizard Icon from
+http://www.flaticon.com
\ No newline at end of file
diff --git a/OCTGN.sln b/OCTGN.sln
index 215b446153..53889bcb27 100644
--- a/OCTGN.sln
+++ b/OCTGN.sln
@@ -5,6 +5,7 @@ VisualStudioVersion = 16.0.29123.88
MinimumVisualStudioVersion = 14.0.24720.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octgn", "octgnFX\Octgn\Octgn.csproj", "{C6ADE75C-5BC2-47DB-9240-B99C66431EF3}"
ProjectSection(ProjectDependencies) = postProject
+ {0DCA834F-D3D4-4433-B981-91A80031719F} = {0DCA834F-D3D4-4433-B981-91A80031719F}
{74009662-AA58-4A94-97B6-1AD019ECA302} = {74009662-AA58-4A94-97B6-1AD019ECA302}
{0A68077E-561A-4DF2-ACE0-75044A2A8184} = {0A68077E-561A-4DF2-ACE0-75044A2A8184}
EndProjectSection
@@ -677,54 +678,6 @@ Global
{0A68077E-561A-4DF2-ACE0-75044A2A8184}.Release|x64.Build.0 = Release|Any CPU
{0A68077E-561A-4DF2-ACE0-75044A2A8184}.Release|x86.ActiveCfg = Release|Any CPU
{0A68077E-561A-4DF2-ACE0-75044A2A8184}.Release|x86.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|ARM.Build.0 = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x64.ActiveCfg = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x64.Build.0 = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x86.Build.0 = Debug|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|Any CPU.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|ARM.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|ARM.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x64.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x64.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x86.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x86.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|Any CPU.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|ARM.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|ARM.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x64.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x64.Build.0 = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x86.ActiveCfg = Release|Any CPU
- {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x86.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|ARM.Build.0 = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x64.ActiveCfg = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x64.Build.0 = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x86.Build.0 = Debug|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|Any CPU.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|ARM.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|ARM.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x64.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x64.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x86.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x86.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|Any CPU.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|ARM.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|ARM.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x64.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x64.Build.0 = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x86.ActiveCfg = Release|Any CPU
- {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x86.Build.0 = Release|Any CPU
{9D562814-A825-4E22-A20C-2F7EA33D6902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D562814-A825-4E22-A20C-2F7EA33D6902}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D562814-A825-4E22-A20C-2F7EA33D6902}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -845,6 +798,54 @@ Global
{74009662-AA58-4A94-97B6-1AD019ECA302}.Release|x64.Build.0 = Release|Any CPU
{74009662-AA58-4A94-97B6-1AD019ECA302}.Release|x86.ActiveCfg = Release|Any CPU
{74009662-AA58-4A94-97B6-1AD019ECA302}.Release|x86.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|ARM.Build.0 = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x64.Build.0 = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Debug|x86.Build.0 = Debug|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|Any CPU.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|ARM.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|ARM.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x64.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x64.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x86.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release_Test|x86.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|ARM.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|ARM.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x64.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x64.Build.0 = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x86.ActiveCfg = Release|Any CPU
+ {0DCA834F-D3D4-4433-B981-91A80031719F}.Release|x86.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|ARM.Build.0 = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x64.Build.0 = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Debug|x86.Build.0 = Debug|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|Any CPU.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|Any CPU.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|ARM.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|ARM.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x64.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x64.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x86.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release_Test|x86.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|ARM.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|ARM.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x64.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x64.Build.0 = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x86.ActiveCfg = Release|Any CPU
+ {0EEB9C9E-51D2-47C6-B323-ADB28D5CEA7B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/octgnFX/Octgn.GameWizard/Octgn.GameWizard.csproj b/octgnFX/Octgn.GameWizard/Octgn.GameWizard.csproj
index 713495ba99..b14e3ddec3 100644
--- a/octgnFX/Octgn.GameWizard/Octgn.GameWizard.csproj
+++ b/octgnFX/Octgn.GameWizard/Octgn.GameWizard.csproj
@@ -34,6 +34,9 @@
prompt
4
+
+ wizard.ico
+
..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll
@@ -157,10 +160,15 @@
Octgn.Library
-
+
+
+
+
+ xcopy /sY "$(TargetDir)*.*" "$(ProjectDir)..\Octgn\bin\$(ConfigurationName)\"
+
\ No newline at end of file
diff --git a/octgnFX/Octgn.GameWizard/wizard.ico b/octgnFX/Octgn.GameWizard/wizard.ico
new file mode 100644
index 0000000000..8c3dc36428
Binary files /dev/null and b/octgnFX/Octgn.GameWizard/wizard.ico differ
diff --git a/octgnFX/Octgn.Installer/Product.wxs b/octgnFX/Octgn.Installer/Product.wxs
index 1b29815911..7a9fe4c0ea 100644
--- a/octgnFX/Octgn.Installer/Product.wxs
+++ b/octgnFX/Octgn.Installer/Product.wxs
@@ -72,6 +72,9 @@
+
diff --git a/octgnFX/Octgn.InstallerLib/Comp.StartMenu.Dev.GameWizard.wxs b/octgnFX/Octgn.InstallerLib/Comp.StartMenu.Dev.GameWizard.wxs
new file mode 100644
index 0000000000..f6a840f995
--- /dev/null
+++ b/octgnFX/Octgn.InstallerLib/Comp.StartMenu.Dev.GameWizard.wxs
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/octgnFX/Octgn.InstallerLib/HeatGeneratedFileList.wxs b/octgnFX/Octgn.InstallerLib/HeatGeneratedFileList.wxs
index b1cd0e4abd..2a10ecc818 100644
--- a/octgnFX/Octgn.InstallerLib/HeatGeneratedFileList.wxs
+++ b/octgnFX/Octgn.InstallerLib/HeatGeneratedFileList.wxs
@@ -4,995 +4,937 @@
+
-
+
-
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1003,22 +945,21 @@
+
-
-
-
+
+
-
+
-
@@ -1034,21 +975,21 @@
-
-
+
+
-
+
-
+
@@ -1057,18 +998,15 @@
-
-
+
-
-
@@ -1081,64 +1019,136 @@
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
+
+
-
-
\ No newline at end of file
diff --git a/octgnFX/Octgn.InstallerLib/Octgn.InstallerLib.wixproj b/octgnFX/Octgn.InstallerLib/Octgn.InstallerLib.wixproj
index d684d1ad32..1a66d2ffe5 100644
--- a/octgnFX/Octgn.InstallerLib/Octgn.InstallerLib.wixproj
+++ b/octgnFX/Octgn.InstallerLib/Octgn.InstallerLib.wixproj
@@ -28,6 +28,7 @@
+
@@ -61,7 +62,7 @@
-
+