2 files changed, 29 insertions, 9 deletions
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index df697d5e..a79d4991 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -2,6 +2,31 @@
 ; UltraStar Deluxe Installer: Main components
 ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
 
+; Remove old files from previous versions
+IfFileExists $INSTDIR\ScoreConverter.exe 0 +2
+Delete "$INSTDIR\ScoreConverter.exe"
+IfFileExists $INSTDIR\USdx.exe 0 +2
+Delete "$INSTDIR\USdx.exe"
+IfFileExists $INSTDIR\covers.cache 0 +2
+Delete "$INSTDIR\covers.cache"
+IfFileExists $INSTDIR\avcodec-51.dll 0 +2
+Delete "$INSTDIR\avcodec-51.dll"
+IfFileExists $INSTDIR\avformat-50.dll 0 +2
+Delete "$INSTDIR\avformat-50.dll"
+IfFileExists $INSTDIR\avutil-49.dll 0 +2
+Delete "$INSTDIR\avutil-49.dll"
+IfFileExists $INSTDIR\bass.dll 0 +2
+Delete "$INSTDIR\bass.dll"
+IfFileExists $INSTDIR\SDL.dll 0 +2
+Delete "$INSTDIR\SDL.dll"
+IfFileExists $INSTDIR\sqlite3.dll 0 +2
+Delete "$INSTDIR\sqlite3.dll"
+
+RMDir /r "$INSTDIR\Themes"
+RMDir /r "$INSTDIR\Skins"
+RMDir /r "$INSTDIR\Plugins"
+RMDir /r "$INSTDIR\Languages"
+
 ; Create Directories:
 
 CreateDirectory $INSTDIR\plugins
@@ -62,4 +87,4 @@ File ..\game\covers\NoCover.jpg
 SetOutPath "$INSTDIR\plugins\"
 File "..\game\plugins\*.*"
 
-SetOutPath "$INSTDIR"
+SetOutPath "$INSTDIR"
+\ No newline at end of file
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index 6a081c5b..ed2259bf 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -11,6 +11,7 @@
 
  Delete "$Desktop\Play UltraStar Deluxe.lnk"
  Delete "$Desktop\UltraStar Deluxe spielen.lnk"
+ Delete "$Desktop\UltraStar Deluxe karaoke.lnk"
 
 ; Remove dirs
 
@@ -22,14 +23,6 @@
  RMDir /r "$INSTDIR\resources"
  RMDir /r "$INSTDIR\sounds"
 
-; Remove old files from previous versions
- IfFileExists $INSTDIR\ScoreConverter.exe 0 +2
- Delete "$INSTDIR\ScoreConverter.exe"
- IfFileExists $INSTDIR\USdx.exe 0 +2
- Delete "$INSTDIR\USdx.exe"
- IfFileExists $INSTDIR\covers.cache 0 +2
- Delete "$INSTDIR\covers.cache"
-
 ; Delete remaining files
  Delete "$INSTDIR\ScoreConverter.exe"
  Delete "$INSTDIR\${exe}.exe"
@@ -44,6 +37,7 @@
  Delete "$INSTDIR\config.ini.lnk"
 
  Delete "$INSTDIR\Error.log"
+ Delete "$INSTDIR\Benchmark.log"
  Delete "$INSTDIR\cover.db"
 
  Delete "$INSTDIR\avcodec-52.dll"
@@ -88,6 +82,7 @@
  SetShellVarContext current
 
  Delete "$APPDATA\ultrastardx\Error.log"
+ Delete "$APPDATA\ultrastardx\Benchmark.log"
  Delete "$APPDATA\ultrastardx\cover.db"
 
  StrCpy $0 "$APPDATA\ultrastardx\covers"