diff --git a/msvs/RedisWindowsX64/FileComponents.wxs b/msvs/RedisWindowsX64/FileComponents.wxs
new file mode 100644
index 0000000000000000000000000000000000000000..b1bfff4359f9a7ca2d04df32ab5b460dcc265854
--- /dev/null
+++ b/msvs/RedisWindowsX64/FileComponents.wxs
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+     xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
+	<Fragment>
+    <PropertyRef Id="WIX_ACCOUNT_NETWORKSERVICE" />
+    
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component Id="cmp_redis_benchmarkEXE" Guid="*">
+        <File Source="$(var.RedisBenchmark.TargetDir)redis-benchmark.exe" />
+      </Component>
+
+      <Component Id="cmp_redis_check_aofEXE" Guid="*">
+        <File Source="$(var.RedisCheckAof.TargetDir)redis-check-aof.exe" />
+      </Component>
+
+      <Component Id="cmp_redis_check_dumpEXE" Guid="*">
+        <File Source="$(var.RedisCheckDump.TargetDir)redis-check-dump.exe" />
+      </Component>
+
+      <Component Id="cmp_redis_cliEXE" Guid="*">
+        <File Source="$(var.RedisCli.TargetDir)redis-cli.exe" />
+      </Component>
+
+      <!--
+        The following component installs Redis as a Windows service.
+      -->
+      <Component Id="cmp_redis_server" Guid="*">
+        <File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
+        <ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run &quot;[#file_redis.windowsCONF]&quot; --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
+        <ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
+        <fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
+      </Component>
+
+      <!--
+          The following component gives the NetworkService user full access to the Redis install directory.
+          It needs this to start the service.
+      -->
+      <Component Id="cmp_give_network_service_folder_permissions" Guid="{55E5EFB3-61E6-4D51-934E-BFEEFB430701}">
+        <CreateFolder>
+          <util:PermissionEx User="[WIX_ACCOUNT_NETWORKSERVICE]" GenericAll="yes" />
+        </CreateFolder>
+      </Component>
+    </ComponentGroup>
+
+    <!--Documentation files-->
+    <ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="..\setups\documentation">
+      <Component Id="cmp_Redis_on_Windows_Release_NotesDOCX" Guid="*">
+        <File Name="Redis on Windows Release Notes.docx" />
+      </Component>
+
+      <Component Id="cmp_Redis_on_WindowsDOCX" Guid="*">
+        <File Name="Redis on Windows.docx" />
+      </Component>
+
+      <Component Id="cmp_redis.windowsCONF" Guid="*">
+        <File Id="file_redis.windowsCONF" Name="redis.windows.conf" />
+      </Component>
+
+      <Component Id="cmp_Windows_Service_DocumentationDOCX" Guid="*">
+        <File Name="Windows Service Documentation.docx" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>
\ No newline at end of file
diff --git a/msvs/RedisWindowsX64/License.rtf b/msvs/RedisWindowsX64/License.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..10e7c85ea4b04ea19fb93695da46aab32023b21c
Binary files /dev/null and b/msvs/RedisWindowsX64/License.rtf differ
diff --git a/msvs/RedisWindowsX64/Product.wxs b/msvs/RedisWindowsX64/Product.wxs
index af0a20270631e31ea771822a6e31037c50cf0feb..8d60c8c8758e7310292e95c401aca047c7a135eb 100644
--- a/msvs/RedisWindowsX64/Product.wxs
+++ b/msvs/RedisWindowsX64/Product.wxs
@@ -15,6 +15,13 @@
     <MediaTemplate EmbedCab="yes" />
 
     <Property Id="ARPURLINFOABOUT" Value="https://github.com/MSOpenTech/redis" />
+    <Property Id="LOGLEVEL" Value="verbose" />
+
+    <UIRef Id="WixUI_InstallDir"/>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf"/>
+    <WixVariable Id="WixUIDialogBmp" Value="redis_background.jpg"/>
+    <WixVariable Id="WixUIBannerBmp" Value="top_banner.jpg"/>
 
     <Feature Id="ProductFeature" Title="Redis" Level="1">
       <ComponentGroupRef Id="ProductComponents" />
@@ -29,72 +36,4 @@
       </Directory>
     </Directory>
   </Fragment>
-
-  <Fragment>
-    <PropertyRef Id="WIX_ACCOUNT_NETWORKSERVICE" />
-
-    <!--
-    The following properties can be customized.
-    -->
-    <Property Id="LOGLEVEL" Value="verbose" />
-    <Property Id="CONFIG" Value="redis.windows.conf" />
-
-    <!--Executable files-->
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Id="cmp_redis_benchmarkEXE" Guid="*">
-        <File Source="$(var.RedisBenchmark.TargetDir)redis-benchmark.exe" />
-      </Component>
-
-      <Component Id="cmp_redis_check_aofEXE" Guid="*">
-        <File Source="$(var.RedisCheckAof.TargetDir)redis-check-aof.exe" />
-      </Component>
-
-      <Component Id="cmp_redis_check_dumpEXE" Guid="*">
-        <File Source="$(var.RedisCheckDump.TargetDir)redis-check-dump.exe" />
-      </Component>
-
-      <Component Id="cmp_redis_cliEXE" Guid="*">
-        <File Source="$(var.RedisCli.TargetDir)redis-cli.exe" />
-      </Component>
-
-      <!--
-        The following component installs Redis as a Windows service.
-      -->
-      <Component Id="cmp_redis_server" Guid="*">
-        <File Id="file_redis_server" Source="$(var.RedisServer.TargetDir)redis-server.exe" />
-        <ServiceInstall Id="redisService" Name="Redis" DisplayName="Redis" Description="This service runs the Redis server" Start="auto" ErrorControl="normal" Type="ownProcess" Arguments="--service-run [CONFIG] --loglevel [LOGLEVEL]" Account="[WIX_ACCOUNT_NETWORKSERVICE]" />
-        <ServiceControl Id="redisServiceControl" Name="Redis" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
-        <fw:FirewallException Id="fw_redis_server" Program="[#file_redis_server]" Description="Exception for Redis server" Name="Redis" Scope="any" />
-      </Component>
-
-      <!--
-          The following component gives the NetworkService user full access to the Redis install directory.
-          It needs this to start the service.
-      -->
-      <Component Id="cmp_give_network_service_folder_permissions" Guid="{55E5EFB3-61E6-4D51-934E-BFEEFB430701}">
-        <CreateFolder>
-          <util:PermissionEx User="[WIX_ACCOUNT_NETWORKSERVICE]" GenericAll="yes" />
-        </CreateFolder>
-      </Component>
-    </ComponentGroup>
-
-    <!--Documentation files-->
-    <ComponentGroup Id="DocumentationComponents" Directory="INSTALLFOLDER" Source="..\setups\documentation">
-      <Component Id="cmp_Redis_on_Windows_Release_NotesDOCX" Guid="*">
-        <File Name="Redis on Windows Release Notes.docx" />
-      </Component>
-
-      <Component Id="cmp_Redis_on_WindowsDOCX" Guid="*">
-        <File Name="Redis on Windows.docx" />
-      </Component>
-
-      <Component Id="cmp_redis.windowsCONF" Guid="*">
-        <File Name="redis.windows.conf" />
-      </Component>
-
-      <Component Id="cmp_Windows_Service_DocumentationDOCX" Guid="*">
-        <File Name="Windows Service Documentation.docx" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/msvs/RedisWindowsX64/RedisWindowsX64.wixproj b/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
index eff91f63537264a07fef3f9edc555aeb3e451807..ae167c6b5e6a2d89fda308e85f44bb3311ce276b 100644
--- a/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
+++ b/msvs/RedisWindowsX64/RedisWindowsX64.wixproj
@@ -23,6 +23,7 @@
     <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="FileComponents.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
@@ -68,6 +69,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>..\..\..\..\Program Files (x86)\WiX Toolset v3.9\bin\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
     <WixExtension Include="WixFirewallExtension">
       <HintPath>$(WixToolPath)WixFirewallExtension.dll</HintPath>
       <Name>WixFirewallExtension</Name>
@@ -77,6 +82,11 @@
       <Name>WixUtilExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="License.rtf" />
+    <Content Include="redis_background.jpg" />
+    <Content Include="top_banner.jpg" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/msvs/RedisWindowsX64/redis_background.jpg b/msvs/RedisWindowsX64/redis_background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b65a9dee15c7b539eb6173c4d47d5e06cecd9381
Binary files /dev/null and b/msvs/RedisWindowsX64/redis_background.jpg differ
diff --git a/msvs/RedisWindowsX64/top_banner.jpg b/msvs/RedisWindowsX64/top_banner.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9d6df56abb742869eabeb4b270eedcb4618a4547
Binary files /dev/null and b/msvs/RedisWindowsX64/top_banner.jpg differ