diff --git a/Artemis/Artemis.Installer/Artemis.Installer.wixproj b/Artemis/Artemis.Installer/Artemis.Installer.wixproj
index ec1becaf7..feaad0010 100644
--- a/Artemis/Artemis.Installer/Artemis.Installer.wixproj
+++ b/Artemis/Artemis.Installer/Artemis.Installer.wixproj
@@ -36,6 +36,17 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="banner.bmp" />
+    <Content Include="dialog.bmp" />
+    <Content Include="logo.ico" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/Artemis/Artemis.Installer/Product.wxs b/Artemis/Artemis.Installer/Product.wxs
index 28ee064d0..a7e918949 100644
--- a/Artemis/Artemis.Installer/Product.wxs
+++ b/Artemis/Artemis.Installer/Product.wxs
@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  
+
   <Product Id="7a2ac6d5-70dd-41af-a5ba-e7b56a2464f5" Name="Artemis" Language="1033" Version="1.11.0.0" Manufacturer="SpoinkyNL" UpgradeCode="ebc7bc50-0473-4729-8de8-32ddb99bb986">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MediaTemplate EmbedCab="yes" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+    
+    <!-- Images -->
+    <Icon Id="ProductIcon" SourceFile="logo.ico" />
+    <WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />
+      
+    <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
+    <Property Id="ARPHELPLINK" Value="https://github.com/SpoinkyNL/Artemis/wiki" />
+    <Property Id="ARPURLINFOABOUT" Value="https://github.com/SpoinkyNL/Artemis" />
+    <Property Id="ARPNOREPAIR" Value="1" />
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
 
     <Feature Id="ProductFeature" Title="Artemis" Level="1">
       <ComponentGroupRef Id="HeatGenerated" />
+      <ComponentRef Id="ApplicationShortcuts" />
     </Feature>
+    <UI Id='Mondo'>
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <UIRef Id="WixUI_InstallDir" />
+      
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="3">1</Publish>
+      <!-- skip the page on the way back too -->
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">1</Publish>
+    </UI>
   </Product>
 
   <Fragment>
@@ -16,6 +37,15 @@
       <Directory Id="ProgramFiles64Folder">
         <Directory Id="INSTALLFOLDER" Name="Artemis" />
       </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ProgramMenuSubfolder" Name="Artemis">
+          <Component Id="ApplicationShortcuts" Guid="b7465bd9-c8d7-4999-9695-8bbfd9306986">
+            <Shortcut Id="ApplicationShortcut1" Name="Artemis" Description="Artemis" Target="[INSTALLFOLDER]Artemis.exe" WorkingDirectory="INSTALLFOLDER" />
+            <RegistryValue Root="HKCU" Key="Software\SpoinkyNL\Artemis" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+            <RemoveFolder Id="ProgramMenuSubfolder" On="uninstall" />
+          </Component>
+        </Directory>
+      </Directory>
     </Directory>
   </Fragment>
 
@@ -23,5 +53,4 @@
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
     </ComponentGroup>
   </Fragment>
-  
 </Wix>
\ No newline at end of file
diff --git a/Artemis/Artemis.Installer/banner.bmp b/Artemis/Artemis.Installer/banner.bmp
new file mode 100644
index 000000000..c8c5a43ce
Binary files /dev/null and b/Artemis/Artemis.Installer/banner.bmp differ
diff --git a/Artemis/Artemis.Installer/dialog.bmp b/Artemis/Artemis.Installer/dialog.bmp
new file mode 100644
index 000000000..9b2259682
Binary files /dev/null and b/Artemis/Artemis.Installer/dialog.bmp differ
diff --git a/Artemis/Artemis.Installer/logo.ico b/Artemis/Artemis.Installer/logo.ico
new file mode 100644
index 000000000..e3f35618e
Binary files /dev/null and b/Artemis/Artemis.Installer/logo.ico differ