diff --git a/.gitignore b/.gitignore
index 53447f5..2169edd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /build/
 /build_linux/
 /out/
+/Output/
 /windows/
 /linux/
 /mac/
diff --git a/scripts/ci/windows/assemble.bat b/scripts/ci/windows/assemble.bat
index c5c7a3f..68532c0 100644
--- a/scripts/ci/windows/assemble.bat
+++ b/scripts/ci/windows/assemble.bat
@@ -26,5 +26,6 @@ for /f "delims=" %%f in (scripts\ci\windows\files_server.txt) do (
 )
 
 set win=windows
+if exist %win% rmdir %win% /S /Q
 xcopy %client% %win% /E /I /Y
 xcopy %server% %win% /E /I /Y
\ No newline at end of file
diff --git a/scripts/inno/setup.iss b/scripts/inno/setup.iss
index 907a951..a28be34 100644
--- a/scripts/inno/setup.iss
+++ b/scripts/inno/setup.iss
@@ -1,19 +1,19 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "OpenStarbound"
-#define MyAppVersion "1.0"
-#define MyAppExeName "starbound.exe"
+#define AppName "OpenStarbound"
+#define AppVersion "1.0"
+#define AppExeName "starbound.exe"
 
 [Setup]
 SourceDir={#SourcePath}\..\..\
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{08791089-2868-4FE5-ACC8-4473ACA67ED7}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-DefaultDirName={autopf}\{#MyAppName}
+AppName={#AppName}
+AppVersion={#AppVersion}
+AppVerName={#AppName} {#AppVersion}
+DefaultDirName={autopf}\{#AppName}
 DisableProgramGroupPage=yes
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
@@ -22,8 +22,10 @@ OutputBaseFilename=OpenStarbound
 SetupIconFile=scripts\inno\starbound.ico
 Compression=lzma2/ultra64
 SolidCompression=yes
-WizardStyle=modern
 ArchitecturesInstallIn64BitMode=x64
+WizardStyle=modern
+WizardImageAlphaFormat=premultiplied
+WizardSmallImageFile=scripts\inno\small.bmp
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -32,7 +34,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "windows\win\{#MyAppExeName}"; DestDir: "{app}\win\"; Flags: ignoreversion
+Source: "windows\win\{#AppExeName}"; DestDir: "{app}\win\"; Flags: ignoreversion
 Source: "windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -40,9 +42,8 @@ Source: "windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs creat
 Name: "{app}"; Permissions: users-modify
 
 [Icons]
-Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{autoprograms}\{#AppName}"; Filename: "{app}\{#AppExeName}"
+Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\win\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
+Filename: "{app}\win\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
diff --git a/scripts/inno/small.bmp b/scripts/inno/small.bmp
new file mode 100644
index 0000000..91b17a9
Binary files /dev/null and b/scripts/inno/small.bmp differ