diff --git a/client/pom.xml b/client/pom.xml
index 09daebc88fa..6d895ce9815 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -679,6 +679,7 @@
                       <fileset dir="../scripts/installer/windows/">
                         <include name="start.bat"/>
                         <include name="acs_license.rtf"/>
+                        <include name="optionstheme.xml"/>
                       </fileset>
                     </copy>
                     <copy todir="./target/client">
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 411d026f596..84045c5794f 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -53,6 +53,9 @@
       <RegistrySearch Id="SecenZSearch" Name="Path" Root="HKLM"
         Key="SOFTWARE\7-Zip" Type="raw" Win64="yes" />
     </Property>
+    <Property Id='MYSQL'>
+      <RegistrySearch Id="MySqlSearch" Name="Location" Root="HKLM" Key="SOFTWARE\Wow6432Node\MySQL AB\MySQL Server 5.1" Type="raw" Win64="yes" />
+    </Property>
     <Condition Message="7Z is not installed please do install 7z and then try"><![CDATA[(Installed OR SEVENZ_HOME)]]></Condition>
 
     <!-- Properties for Database Related Information to be collected -->
@@ -79,7 +82,7 @@
                 Value="-XX:MaxPermSize=512m -Xmx1024m -Xms256m" />
               <Environment Id="Path" Action="set" Name="Path"
                 Permanent="yes" System="yes" Part="last"
-                Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools" />
+                Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools;[MYSQL]\bin" />
             </Component>
             <Component Id='setuptools' Guid='019a51dd-7fc4-4d6c-9277-13cc7b600789'>
               <File Id="ez_setup" Source="ez_setup.py" />
@@ -278,7 +281,7 @@
     </InstallExecuteSequence>
     <Feature Id='Complete' Title='ACS' Description='The complete package.'
       Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
-      <Feature Id='MainProgram' Title='Program' Description='The main executable.'
+      <Feature Id='MainProgram' Title='Management Server' Description='The main executable.'
         Level='1'>
         <ComponentRef Id='webappsFolder' />
         <ComponentGroupRef Id='ClientPath' />
@@ -295,7 +298,7 @@
         <ComponentRef Id='ServiceInstaller' />
       </Feature>
     </Feature>
-    <UIRef Id="WixUI_Mondo_Custom" />
-    <UIRef Id="WixUI_ErrorProgressText" />
+		<UIRef Id="WixUI_Mondo_Custom" />
+		<UIRef Id="WixUI_ErrorProgressText" />
   </Product>
 </Wix>
\ No newline at end of file
diff --git a/scripts/installer/windows/dependencies.wxs b/scripts/installer/windows/dependencies.wxs
index 56ea2a4f46f..82fcd278e51 100644
--- a/scripts/installer/windows/dependencies.wxs
+++ b/scripts/installer/windows/dependencies.wxs
@@ -13,10 +13,11 @@
 <!-- Installing dependencies -->
 	<Bundle UpgradeCode="7cc78eac-106d-400e-b266-1b2c778b16b9" Version="4.4.0">
 		<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" >
-			<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes"/>
+			<bal:WixStandardBootstrapperApplication LicenseFile="acs_license.rtf" ShowVersion="yes" ThemeFile="optionstheme.xml"/>
 		</BootstrapperApplicationRef>
 		<Chain>
-			<MsiPackage Id="MySql" Name="mysql-5.1.73-winx64.msi" DownloadUrl="http://cdn.mysql.com/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" DisplayInternalUI="yes" EnableFeatureSelection="yes" />
+			<MsiPackage Id="MySql" Name="mysql-5.1.73-winx64.msi" DownloadUrl="http://cdn.mysql.com/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" DisplayInternalUI="yes" EnableFeatureSelection="yes" InstallCondition="ACSCheckbox"/>
+			<MsiPackage Id="MySqlClient" Name="mysql-5.1.73-winx64.msi" DownloadUrl="http://cdn.mysql.com/Downloads/MySQL-5.1/mysql-5.1.73-winx64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" EnableFeatureSelection="no" DisplayInternalUI="no" InstallCondition="Not ACSCheckbox"/>
 			<MsiPackage Id="SevenZip" Name="7z920-x64.msi" DownloadUrl="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" After="MySql"/>
 			<MsiPackage Id="Python" Name="python-2.7.6.amd64.msi" DownloadUrl="https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi" Compressed="no" Visible="yes" ForcePerMachine="yes" After="SevenZip"/>
 			<ExePackage Id="Tomcat6" Name="apache-tomcat-6.0.39.exe" PerMachine="yes" DownloadUrl="http://mirror.sdunix.com/apache/tomcat/tomcat-6/v6.0.39/bin/apache-tomcat-6.0.39.exe" Compressed="no" InstallCommand="/S" After="Python"/>