diff --git a/Greenshot/releases/innosetup/greenshot.bmp b/Greenshot/releases/innosetup/greenshot.bmp
new file mode 100644
index 000000000..b2a609a1c
Binary files /dev/null and b/Greenshot/releases/innosetup/greenshot.bmp differ
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 1145d735d..1d599485f 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -3,8 +3,8 @@ Source: ..\..\bin\Release\*; DestDir: {app}; Flags: overwritereadonly ignorevers
 Source: ..\..\bin\Release\Languages\*; DestDir: {app}\Languages; Flags: overwritereadonly ignoreversion replacesameversion
 Source: ..\additional_files\*; DestDir: {app}; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion
 ;Flickr Plugin
-Source: ..\..\bin\Release\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
-Source: ..\..\bin\Release\Languages\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
+;Source: ..\..\bin\Release\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
+;Source: ..\..\bin\Release\Languages\Plugins\GreenshotFlickrPlugin\*; DestDir: {app}\Languages\Plugins\GreenshotFlickrPlugin; Components: plugins\flickr; Flags: overwritereadonly ignoreversion replacesameversion;
 ;OCR Plugin
 ;Source: ..\..\bin\Release\Plugins\Greenshot-OCR-Plugin\*; DestDir: {app}\Plugins\Greenshot-OCR-Plugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
 ;Source: ..\..\bin\Release\Languages\Plugins\Greenshot-OCR-Plugin\*; DestDir: {app}\Languages\Plugins\Greenshot-OCR-Plugin; Components: plugins\ocr; Flags: overwritereadonly ignoreversion replacesameversion;
@@ -20,11 +20,22 @@ OutputBaseFilename=Greenshot-INSTALLER-0.8.0.$WCREV$
 DefaultDirName={pf}\Greenshot
 DefaultGroupName=Greenshot
 AppName=Greenshot
-AppVerName=Greenshot
+AppVerName=0.8.0.$WCREV$
 AppMutex=F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08,Global\F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08
 PrivilegesRequired=admin
+; Reference a bitmap, max size 164x314
+WizardImageFile=greenshot.bmp
+WizardImageStretch=false
+; Color for rest (needed when stretch=false)
+WizardImageBackColor=$3f3f3f
+; Reference a bitmap, max size 55x58
+WizardSmallImageFile=greenshot.bmp
+VersionInfoVersion=0.8.0.$WCREV$
+VersionInfoCompany=Greenshot
+VersionInfoProductName=Greenshot
+MinVersion=,5.01.2600
 [Registry]
-Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Greenshot"; ValueData: "{app}\Greenshot.exe"; Permissions: users-modify; Flags: uninsdeletevalue; Tasks: startup
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Run; ValueType: string; ValueName: Greenshot; ValueData: {app}\Greenshot.exe; Permissions: users-modify; Flags: uninsdeletevalue; Tasks: startup
 [Icons]
 Name: {group}\Greenshot; Filename: {app}\Greenshot.exe; WorkingDir: {app}
 Name: {group}\Uninstall Greenshot; Filename: {app}\unins000.exe; WorkingDir: {app}
@@ -37,13 +48,13 @@ Name: en; MessagesFile: compiler:Default.isl
 Name: de; MessagesFile: compiler:Languages\German.isl
 Name: nl; MessagesFile: compiler:Languages\Dutch.isl
 [Tasks]
-Name: startup; Description: "{cm:startup}";
-[Components]
-Name: "plugins"; Description: "Plugins"; Types: Full
+Name: startup; Description: {cm:startup}
+;[Components]
+;Name: "plugins"; Description: "Plugins"; Types: Full
 ;Name: "plugins\ocr"; Description: "OCR Plugin"; Types: Full
 ;Name: "plugins\jira"; Description: "JIRA Plugin"; Types: Full
 ;Name: "plugins\titlefix"; Description: "Title-fix Plugin"; Types: Full
-Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: Full
+;Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: Full
 [CustomMessages]
 en.dotnetmissing=This setup requires the .NET Framework v2.0.%nDo you want to download the framework now?
 de.dotnetmissing=Dieses Programm benötigt Microsoft .NET Framework v2.0.%nWollen Sie das Framework jetzt downloaden?
@@ -84,8 +95,8 @@ begin
 end;
 
 [Run]
-Filename: {app}\Greenshot.exe; Description: "{cm:startgreenshot}"; Parameters: --config Ui_Language={language}; WorkingDir: {app}; Flags: nowait postinstall runasoriginaluser skipifsilent
+Filename: {app}\Greenshot.exe; Description: {cm:startgreenshot}; Parameters: --config Ui_Language={language}; WorkingDir: {app}; Flags: nowait postinstall runasoriginaluser skipifsilent
 [InstallDelete]
 Name: {app}; Type: filesandordirs; Languages: 
-Name: {userstartup}\Greenshot.lnk; Type: files; Languages:
-Name: {commonstartup}\Greenshot.lnk; Type: files; Languages:
+Name: {userstartup}\Greenshot.lnk; Type: files; Languages: 
+Name: {commonstartup}\Greenshot.lnk; Type: files; Languages: