3 files changed, 12 insertions, 6 deletions
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
index c7e48e46..00fd3f8e 100644
--- a/installer/settings/files_main_install.nsh
+++ b/installer/settings/files_main_install.nsh
@@ -22,16 +22,20 @@ File /r ..\installerdependencies\visuals
 
 File ..\installerdependencies\dll\*.dll
 
+
 File ..\ChangeLog.txt
 File ..\ChangeLog.german.txt
 File ..\README.txt
 File ..\installerdependencies\documents\documentation.pdf
+File ..\installerdependencies\documents\license.txt
 
 File "..\ScoreConverter.exe"
 File "..\${exe}.exe"
 
 ; Covers dir:
 
+SetOutPath "$INSTDIR\covers"
+
 IfFileExists $INSTDIR\covers\covers.ini +2 0
 File ..\game\covers\Covers.ini
 File ..\game\covers\NoCover.jpg
@@ -52,3 +56,4 @@ ${If} ${AtLeastWinVista}
 
 ${EndIf}
 
+SetOutPath "$INSTDIR"
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
index c8d3a229..b3d69da2 100644
--- a/installer/settings/files_main_uninstall.nsh
+++ b/installer/settings/files_main_uninstall.nsh
@@ -7,7 +7,7 @@
 
  SetShellVarContext all
 
- RMDir "$SMPROGRAMS\$ICONS_GROUP\
+ RMDir /r "$SMPROGRAMS\$ICONS_GROUP\"
 
 ; Delete created Icon on Desktop
 
@@ -16,11 +16,11 @@
 
 ; Remove dirs
 
- RMDir "$INSTDIR\plugins"
- RMDir "$INSTDIR\themes"
- RMDir "$INSTDIR\languages"
- RMDir "$INSTDIR\visuals"
- RMDir "$INSTDIR\sounds"
+ RMDir /r "$INSTDIR\plugins"
+ RMDir /r "$INSTDIR\themes"
+ RMDir /r "$INSTDIR\languages"
+ RMDir /r "$INSTDIR\visuals"
+ RMDir /r "$INSTDIR\sounds"
 
 ; Delete remaining files
 
@@ -30,6 +30,7 @@
  Delete "$INSTDIR\Changelog.txt"
  Delete "$INSTDIR\documentation.pdf"
  Delete "$INSTDIR\License.txt"
+ Delete "$INSTDIR\config.ini"
  Delete "$INSTDIR\README.txt"
  Delete "$INSTDIR\Error.log"
  Delete "$INSTDIR\covers.cache"
diff --git a/installer/license.txt b/installerdependencies/documents/license.txt
index 4964fc70..4964fc70 100644
--- a/installer/license.txt
+++ b/installerdependencies/documents/license.txt