6 files changed, 74 insertions, 20 deletions
diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
index 882a1c9a..1e71e28c 100644
--- a/installer/UltraStar Deluxe.nsi
+++ b/installer/UltraStar Deluxe.nsi
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: Main
+; UltraStar Deluxe Installer: Main
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 !include MUI2.nsh
diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
index 2b6f17c3..f74e5c75 100644
--- a/installer/languages/English.nsh
+++ b/installer/languages/English.nsh
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: English
+; UltraStar Deluxe Installer - Language file: English
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 LangString abort_install ${LANG_ENGLISH} "Are you sure to abort Installation?"
diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
index b536eb0e..1027b8e0 100644
--- a/installer/languages/German.nsh
+++ b/installer/languages/German.nsh
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: German
+; UltraStar Deluxe Installer - Language file: German
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 LangString abort_install ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?"
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index 1ff099d4..5ce3326f 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: Main components
+; UltraStar Deluxe Installer: Main components
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 ; Create Directories:
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index 882fba9a..c8d3a229 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: Main components
+; UltraStar Deluxe Uninstaller: Main components
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 
@@ -7,22 +7,76 @@
 
  SetShellVarContext all
 
- Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Deinstallieren.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Internetseite.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe spielen.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Lies mich.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Lizenz.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\License.lnk"
+ RMDir "$SMPROGRAMS\$ICONS_GROUP\
 
 ; Delete created Icon on Desktop
 
-Delete "$Desktop\Play UltraStar Deluxe.lnk"
-Delete "$Desktop\UltraStar Deluxe spielen.lnk"
+ Delete "$Desktop\Play UltraStar Deluxe.lnk"
+ Delete "$Desktop\UltraStar Deluxe spielen.lnk"
 
-StrCpy $0 "$SMPROGRAMS\$ICONS_GROUP"
-Call un.DeleteIfEmpty
+; Remove dirs
 
+ RMDir "$INSTDIR\plugins"
+ RMDir "$INSTDIR\themes"
+ RMDir "$INSTDIR\languages"
+ RMDir "$INSTDIR\visuals"
+ RMDir "$INSTDIR\sounds"
+
+; Delete remaining files
+
+ Delete "$INSTDIR\ScoreConverter.exe"
+ Delete "$INSTDIR\${exe}.exe"
+ Delete "$INSTDIR\Changelog.german.txt"
+ Delete "$INSTDIR\Changelog.txt"
+ Delete "$INSTDIR\documentation.pdf"
+ Delete "$INSTDIR\License.txt"
+ Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\Error.log"
+ Delete "$INSTDIR\covers.cache"
+
+ Delete "$INSTDIR\avcodec-51.dll"
+ Delete "$INSTDIR\avformat-50.dll"
+ Delete "$INSTDIR\avutil-49.dll"
+ Delete "$INSTDIR\bass.dll"
+ Delete "$INSTDIR\glew32.dll"
+ Delete "$INSTDIR\jpeg.dll"
+ Delete "$INSTDIR\libfreetype-6.dll"
+ Delete "$INSTDIR\libpng12-0.dll"
+ Delete "$INSTDIR\libprojectM.dll"
+ Delete "$INSTDIR\libtiff-3.dll"
+ Delete "$INSTDIR\portaudio_x86.dll"
+ Delete "$INSTDIR\portmixer.dll"
+ Delete "$INSTDIR\projectM-cwrapper.dll"
+ Delete "$INSTDIR\SDL.dll"
+ Delete "$INSTDIR\SDL_image.dll"
+ Delete "$INSTDIR\SDL_ttf.dll"
+ Delete "$INSTDIR\sqlite3.dll"
+ Delete "$INSTDIR\zlib1.dll"
+
+${If} ${AtLeastWinVista}
+ Delete "$WINDIR\gdf.dll"
+${EndIf}
+
+
+ RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18"
+ RMDir "$INSTDIR\songs\Joshua Morin - On The Run"
+ RMDir "$INSTDIR\songs\Pornophonique - Space Invaders"
+ RMDir "$INSTDIR\songs\Steven Dunston - Northern Star"
+
+ StrCpy $0 "$INSTDIR\songs"
+ Call un.DeleteIfEmpty
+
+ Delete "$INSTDIR\covers\NoCover.jpg"
+
+ StrCpy $0 "$INSTDIR\screenshots"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$INSTDIR\playlists"
+ Call un.DeleteIfEmpty
+
+; Self delete:
+
+ Delete "$INSTDIR\Uninstall.exe"
+
+ StrCpy $0 "$INSTDIR"
+ Call un.DeleteIfEmpty
+\ No newline at end of file
diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh
index 64df51f1..b6ffc022 100644
--- a/installer/settings/variables.nsh
+++ b/installer/settings/variables.nsh
@@ -1,5 +1,5 @@
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
-; UltraStar Deluxe Installer - Version 1.1: Variables
+; UltraStar Deluxe Un/Installer: Variables
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
 ; Product Information: