diff --git a/Installer/EmbroideryReader.wxs b/Installer/EmbroideryReader.wxs
index 9949ae6..ca9d417 100644
--- a/Installer/EmbroideryReader.wxs
+++ b/Installer/EmbroideryReader.wxs
@@ -8,26 +8,28 @@
         <Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFilesFolder" Name="PFiles">
-                <Component Id="RequiredFiles" DiskId="1" Guid="ad3defbe-e276-41ab-9d76-9ab9f2976ac2">
-                    <File Id="EMBROIDERYREADER.EXE" Name="embroideryReader.exe" Source="..\embroideryReader\bin\Release\embroideryReader.exe" KeyPath="yes">
-                        <Shortcut Id="ExeShortcut" Directory="ProgramMenuDir" Name="Embroidery Reader" Advertise="yes" Icon="StartMenuIcon.exe" IconIndex="0" />
-                    </File>
-                    <ProgId Id="EmbroideryDesign" Description="Embroidery Design File" Icon="StartMenuIcon.exe" IconIndex="0" Advertise="yes">
-                        <Extension Id="pes" Advertise="yes">
-                            <Verb Id="open" Command="&amp;Open" Argument="&quot;%1&quot;" Sequence="1" />
-                        </Extension>
-                    </ProgId>
-                    <File Id="PESFILE.DLL" Name="PesFile.dll" Source="..\embroideryReader\bin\Release\PesFile.dll" />
-                    <File Id="INIFILE.DLL" Name="IniFile.dll" Source="..\embroideryReader\bin\Release\IniFile.dll" />
-                    <File Id="ERRORREPORTER.DLL" Name="ErrorReporter.dll" Source="..\embroideryReader\bin\Release\ErrorReporter.dll" />
-                </Component>
-                <Directory Id="TRANSLATIONS" Name="translations">
-                    <Component Id="Translations" DiskId="1" KeyPath="yes" Guid="4ac2c11d-b2c9-4557-a618-fa4bacf50889">
-                        <File Id="EN_US.INI" Name="en-US.ini" Source="..\translations\en-US.ini" />
-                        <File Id="IT_IT.INI" Name="it-IT.ini" Source="..\translations\it-IT.ini" />
-                        <File Id="ZH_HANS.INI" Name="zh-Hans.ini" Source="..\translations\zh-Hans.ini" />
-                        <File Id="ZH_HANT.INI" Name="zh-Hant.ini" Source="..\translations\zh-Hant.ini" />
+                <Directory Id="PRODUCTDIR" Name="Embroidery Reader">
+                    <Component Id="RequiredFiles" DiskId="1" Guid="ad3defbe-e276-41ab-9d76-9ab9f2976ac2">
+                        <File Id="EMBROIDERYREADER.EXE" Name="embroideryReader.exe" Source="..\embroideryReader\bin\Release\embroideryReader.exe" KeyPath="yes">
+                            <Shortcut Id="ExeShortcut" Directory="ProgramMenuDir" Name="Embroidery Reader" Advertise="yes" Icon="StartMenuIcon.exe" IconIndex="0" />
+                        </File>
+                        <ProgId Id="EmbroideryDesign" Description="Embroidery Design File" Icon="StartMenuIcon.exe" IconIndex="0" Advertise="yes">
+                            <Extension Id="pes" Advertise="yes">
+                                <Verb Id="open" Command="&amp;Open" Argument="&quot;%1&quot;" Sequence="1" />
+                            </Extension>
+                        </ProgId>
+                        <File Id="PESFILE.DLL" Name="PesFile.dll" Source="..\embroideryReader\bin\Release\PesFile.dll" />
+                        <File Id="INIFILE.DLL" Name="IniFile.dll" Source="..\embroideryReader\bin\Release\IniFile.dll" />
+                        <File Id="ERRORREPORTER.DLL" Name="ErrorReporter.dll" Source="..\embroideryReader\bin\Release\ErrorReporter.dll" />
                     </Component>
+                    <Directory Id="TRANSLATIONS" Name="translations">
+                        <Component Id="Translations" DiskId="1" KeyPath="yes" Guid="4ac2c11d-b2c9-4557-a618-fa4bacf50889">
+                            <File Id="EN_US.INI" Name="en-US.ini" Source="..\translations\en-US.ini" />
+                            <File Id="IT_IT.INI" Name="it-IT.ini" Source="..\translations\it-IT.ini" />
+                            <File Id="ZH_HANS.INI" Name="zh-Hans.ini" Source="..\translations\zh-Hans.ini" />
+                            <File Id="ZH_HANT.INI" Name="zh-Hant.ini" Source="..\translations\zh-Hant.ini" />
+                        </Component>
+                    </Directory>
                 </Directory>
             </Directory>
             <Directory Id="ProgramMenuFolder">
@@ -45,7 +47,8 @@
             <ComponentRef Id="StartMenuShortcuts" />
         </Feature>
         <UI />
-        <UIRef Id="WixUI_Minimal" />
+        <UIRef Id="WixUI_InstallDir" />
+        <Property Id="WIXUI_INSTALLDIR" Value="PRODUCTDIR" />
         <PropertyRef Id="NETFRAMEWORK40CLIENT" />
         <Condition Message="This application requires .NET Framework X.Y.">Installed OR NETFRAMEWORK40CLIENT</Condition>
         <Icon Id="StartMenuIcon.exe" SourceFile="..\embroideryReader\bin\Release\embroideryReader.exe" />
diff --git a/Installer/Installer requirements.txt b/Installer/Installer requirements.txt
index eb5bae5..25b0924 100644
--- a/Installer/Installer requirements.txt	
+++ b/Installer/Installer requirements.txt	
@@ -1,26 +1,26 @@
 Installer must:
-1. Install files
+1. Install files into program files, in Embroidery Reader folder (or a user-selected folder)
 	a. Program .exe and .dlls
 	b. Translation .inis
 2. Install Start menu Folder
 	a. Short cut to .exe
+	b. Must install for all users
 3. Check for required .net version before installing
 	a. Should also direct user to download page, if not installed
 4. Check for old non-Wix versions before installing
 	a. Version 1.5.1 and older
-	b. Would be nice if it would offer to remove old version as well
+	b. Would be nice if it would offer to uninstall old version as well
 5. Only allow upgrades
 	a. If downgrade is required, uninstall current version and install older version
-	b. Older Wix-based installers must be removed during install (to maintain a single Programs and Features entry)
+	b. Older Wix-based installers must be removed during upgrade (to maintain a single Programs and Features entry)
 6. Must have a respectable Programs and Features presence
 	a. Correct program name
 	b. Program icon
 	c. Contact URL
 	d. Support URL
 	e. Help URL
-7. Must install for all users
-8. Must include correct license in installer
-9. Must install a file association
+7. Must include correct license in installer
+8. Must install a file association
 	a. Show icon for .pes files
 	b. Open .pes file with double click