diff --git a/installer/aegisub.bmp b/installer/aegisub.bmp
index 0f1091715..040f09da8 100644
Binary files a/installer/aegisub.bmp and b/installer/aegisub.bmp differ
diff --git a/installer/aegisub2.iss b/installer/aegisub2.iss
index 5b3177533..764aab413 100644
--- a/installer/aegisub2.iss
+++ b/installer/aegisub2.iss
@@ -1,12 +1,46 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+; Copyright (c) 2007, Niels Martin Hansen
+;
+; Redistribution and use in source and binary forms, with or without
+; modification, are permitted provided that the following conditions are met:
+;
+;   * Redistributions of source code must retain the above copyright notice,
+;     this list of conditions and the following disclaimer.
+;   * Redistributions in binary form must reproduce the above copyright notice,
+;     this list of conditions and the following disclaimer in the documentation
+;     and/or other materials provided with the distribution.
+;   * Neither the name of the Aegisub Group nor the names of its contributors
+;     may be used to endorse or promote products derived from this software
+;     without specific prior written permission.
+;
+; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+; POSSIBILITY OF SUCH DAMAGE.
+;
+; -----------------------------------------------------------------------------
+;
+; AEGISUB
+;
+; Website: http://aegisub.net/
+; Contact: mailto:jiifurusu@gmail.com
+;
 
 #define MyAppName "Aegisub"
-#define MyAppVerName "Aegisub 2.00 alpha r1564"
+#define MyAppVerName "Aegisub 2.00 alpha r1606"
 #define MyAppPublisher "Aegisub Team"
 #define MyAppURL "http://aegisub.net/"
 #define MyAppExeName "Aegisub.exe"
 
+#define IncludeSpeller 1
+#define IncludeThesaurus 1
+
 [Setup]
 AppName={#MyAppName}
 AppVerName={#MyAppVerName}
@@ -31,7 +65,7 @@ PrivilegesRequired=poweruser
 DisableProgramGroupPage=true
 UsePreviousGroup=false
 AlwaysShowComponentsList=true
-AppVersion=2.00 Release Candidate 1
+AppVersion=2.00 alpha r1606
 AppID={{24BC8B57-716C-444F-B46B-A3349B9164C5}
 UninstallDisplayIcon={app}\Aegisub.exe
 
@@ -41,7 +75,7 @@ Name: english; MessagesFile: compiler:Default.isl
 [Files]
 ; redist
 Source: RuntimeTestLibrary\RuntimeTestLibrary.dll; Flags: dontcopy
-Source: redist\vcredist_x86.exe; Flags: dontcopy nocompression; Components: main/runtime
+Source: redist\vcredist_x86_sp1.exe; Flags: dontcopy nocompression; Components: main/runtime
 ; main
 DestDir: {app}; Source: install\Aegisub.exe; Flags: ignoreversion; Components: main
 DestDir: {app}; Source: install\Aegisub.pdb; Flags: ignoreversion; Components: main/pdb
@@ -87,6 +121,7 @@ DestDir: {app}\automation\auto3; Source: install\automation\auto3\multi-template
 DestDir: {app}\automation\auto3; Source: install\automation\auto3\simple-k-replacer.auto3; Flags: ignoreversion; Components: auto/auto3
 DestDir: {app}\automation\docs; Source: install\automation\docs\automation3.txt; Flags: ignoreversion; Components: auto/auto3
 ; dictionaries
+#if IncludeSpeller != 0
 Source: install\dictionaries\de_AT.dic; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/de_AT
 Source: install\dictionaries\de_DE.aff; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/de_DE
 Source: install\dictionaries\de_DE.dic; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/de_DE
@@ -114,7 +149,9 @@ Source: install\dictionaries\sl_SI.aff; DestDir: {app}\dictionaries; Flags: igno
 Source: install\dictionaries\sl_SI.dic; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/sl_SI
 Source: install\dictionaries\sv_SE.aff; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/sv_SE
 Source: install\dictionaries\sv_SE.dic; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: dic/sv_SE
-; thesaurii
+#endif
+; thesauri
+#if IncludeThesaurus != 0
 Source: install\dictionaries\th_de_DE.dat; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/de_DE
 Source: install\dictionaries\th_de_DE.idx; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/de_DE
 Source: install\dictionaries\th_en_US.dat; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/en_US
@@ -125,13 +162,14 @@ Source: install\dictionaries\th_fr_FR.dat; DestDir: {app}\dictionaries; Flags: i
 Source: install\dictionaries\th_fr_FR.idx; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/fr_FR
 Source: install\dictionaries\th_it_IT.dat; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/it_IT
 Source: install\dictionaries\th_it_IT.idx; DestDir: {app}\dictionaries; Flags: ignoreversion; Components: th/it_IT
+#endif
 
 [Icons]
 Name: {commonprograms}\{#MyAppName}; Filename: {app}\Aegisub.exe; WorkingDir: {app}; IconIndex: 0; Components: main; Comment: Aegisub subtitle editor
 
 [Run]
 Filename: {app}\{#MyAppExeName}; Description: {cm:LaunchProgram,{#MyAppName}}; Flags: nowait postinstall skipifsilent
-Filename: {tmp}\vcredist_x86.exe; StatusMsg: Installing runtime libraries...; Components: main/runtime; Parameters: /Q
+Filename: {tmp}\vcredist_x86_sp1.exe; StatusMsg: Installing runtime libraries...; Components: main/runtime; Parameters: /Q
 
 [Components]
 Name: main; Description: Aegisub; Types: compact full custom; Languages: ; Flags: fixed
@@ -146,6 +184,7 @@ Name: auto/auto3; Description: Automation 3 backwards compatibility; Types: full
 Name: help; Description: Help files (not written yet); Flags: fixed
 Name: i18n; Description: Languages; Types: full custom compact; Flags: fixed
 Name: i18n/english; Description: English (built in); Flags: fixed; Types: compact full custom
+#if IncludeSpeller != 0
 Name: dic; Description: Spell checker; Types: full
 Name: dic/en_GB; Description: British English dictionary; Types: full
 Name: dic/en_US; Description: American English dictionary; Types: full
@@ -161,12 +200,15 @@ Name: dic/pt_BR; Description: Brazilian Portuguese dictionary; Types: full
 Name: dic/sk_SK; Description: Slovak dictionary; Types: full
 Name: dic/sl_SI; Description: Slovenian dictionary; Types: full
 Name: dic/sv_SE; Description: Swedish dictionary; Types: full
+#endif
+#if IncludeThesaurus != 0
 Name: th; Description: Thesaurus; Types: full
 Name: th/en_US; Description: American English thesaurus; Types: full
 Name: th/es_ES; Description: Estonian thesaurus; Types: full
 Name: th/fr_FR; Description: French thesaurus; Types: full
 Name: th/de_DE; Description: German thesaurus; Types: full
 Name: th/it_IT; Description: Italian thesaurus; Types: full
+#endif
 
 [Messages]
 ; Replacement for License page, no need to bother the user with legal mumbo-jumbo
@@ -201,4 +243,3 @@ begin
 	end;
 	Result := not RuntimeLibInstalled;
 end;
-
diff --git a/installer/welcome.bmp b/installer/welcome.bmp
index 4402b28dd..714804682 100644
Binary files a/installer/welcome.bmp and b/installer/welcome.bmp differ