29 files changed, 3600 insertions, 0 deletions
diff --git a/installer/UAC.nsh b/installer/UAC.nsh
new file mode 100644
index 00000000..b21e72ff
--- /dev/null
+++ b/installer/UAC.nsh
@@ -0,0 +1,191 @@
+/*
+=======================
+UAC helper include file
+.......................
+
+Macros starting with UAC.I should only be called from the installer and vice versa for UAC.U macros.
+
+*/
+!ifndef UAC_HDR__INC
+!define UAC_HDR__INC
+!include LogicLib.nsh
+
+!define UAC.RunElevatedAndProcessMessages 'UAC::RunElevated '
+!define UAC.Unload 'UAC::Unload '
+!define UAC.StackPush 'UAC::StackPush '
+
+/*!macro _UAC.BuildOnInitElevationFunc _funcprefix
+Function ${_funcprefix}onInit
+!ifmacrodef
+FunctionEnd
+!macroend*/
+
+!macro _UAC.GenerateSimpleFunction _funcprefix _funcName _funcCode
+Function ${_funcprefix}${_funcName}
+${_funcCode}
+#messagebox mb_ok "${_funcprefix}${_funcName}"
+FunctionEnd
+!macroend
+
+!macro _UAC.TryDef _d _v
+!ifndef ${_d}
+!define ${_d} "${_v}"
+!endif
+!macroend
+
+!macro _UAC.InitStrings _modeprefix
+!insertmacro _UAC.TryDef UACSTR.UnDataFile "UAC.dat"
+!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvWinErr "Unable to elevate , error $0"
+!ifNdef __UNINSTALL__
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This installer requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This installer requires admin access, try again"
+	!else
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This uninstaller requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This uninstaller requires admin access, try again"
+	!endif
+!macroend
+
+!ifmacroNdef _UAC.GenerateUninstallerTango
+!macro _UAC.GenerateUninstallerTango UninstallerFileName
+!ifdef __GLOBAL__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!ifNdef __UNINSTALL__
+	!error "UAC: _UAC.GenerateUninstallerTango should only be called by uninstaller, see http://forums.winamp.com/showthread.php?threadid=280330"
+	!endif
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+	!include WinVer.nsh
+	!endif
+!insertmacro _UAC.InitStrings 'U.'
+ReadIniStr $0 "$ExeDir\${UACSTR.UnDataFile}" UAC "Un.Ready"
+${IF} $0 != 1
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+${AndIf} ${AtLeastWinVista}
+!endif
+	InitPluginsDir
+	WriteIniStr "$PluginsDir\${UACSTR.UnDataFile}" UAC "Un.Ready" 1
+	CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UninstallerFileName}"
+	StrCpy $0 ""
+	${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
+	ExecWait '"$PluginsDir\${UninstallerFileName}" $0/NCRC _?=$INSTDIR' $0
+	SetErrorLevel $0
+	Quit
+	${EndIf}
+!macroend
+!endif
+
+!ifmacroNdef _UAC.GenerateOnInitElevationCode
+!macro _UAC.GenerateOnInitElevationCode _modeprefix
+!ifndef __FUNCTION__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!insertmacro _UAC.InitStrings ${_modeprefix}
+!define _UAC.GOIECUniq L${__LINE__}
+UAC_Elevate_${_UAC.GOIECUniq}:
+UAC::RunElevated 
+StrCmp 1223 $0 UAC_ElevationAborted_${_UAC.GOIECUniq} ; UAC dialog aborted by user?
+StrCmp 0 $0 0 UAC_Err_${_UAC.GOIECUniq} ; Error?
+StrCmp 1 $1 0 UAC_Success_${_UAC.GOIECUniq} ;Are we the real deal or just the wrapper?
+Quit
+UAC_Err_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvWinErr}"
+Abort
+UAC_ElevationAborted_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvAbortReqAdmin}"
+Abort
+UAC_Success_${_UAC.GOIECUniq}:
+# if $0==0 && $3==1, we are a member of the admin group (Any OS)
+# if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal?
+# if $0==0 && $1==3, we can try to elevate again
+StrCmp 1 $3 /*+4*/ UAC_Done_${_UAC.GOIECUniq} ;Admin?
+StrCmp 3 $1 0 UAC_ElevationAborted_${_UAC.GOIECUniq} ;Try again or abort?
+MessageBox mb_iconexclamation "${UACSTR.${_modeprefix}ElvMustTryAgain}" ;Inform user...
+goto UAC_Elevate_${_UAC.GOIECUniq} ;...lets try again
+UAC_Done_${_UAC.GOIECUniq}:
+!undef _UAC.GOIECUniq
+!macroend
+!endif
+
+!define UAC.I.Elevate.AdminOnly '!insertmacro UAC.I.Elevate.AdminOnly '
+!macro UAC.I.Elevate.AdminOnly
+!insertmacro _UAC.GenerateOnInitElevationCode 'I.'
+!macroend
+
+!define UAC.U.Elevate.AdminOnly '!insertmacro UAC.U.Elevate.AdminOnly '
+!macro UAC.U.Elevate.AdminOnly _UninstallerName
+!ifNdef UAC_DISABLEUNINSTALLERTANGO
+	!insertmacro _UAC.GenerateUninstallerTango "${_UninstallerName}"
+	!endif
+!insertmacro _UAC.GenerateOnInitElevationCode 'U.'
+!macroend
+
+!define UAC.AutoCodeUnload '!insertmacro UAC.AutoCodeUnload '
+!macro UAC.AutoCodeUnload _HasUninstaller
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstFailed '${UAC.Unload}'
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstSuccess '${UAC.Unload}'
+!ifNdef MUI_INCLUDED
+	!insertmacro _UAC.GenerateSimpleFunction "" .onUserAbort '${UAC.Unload}'
+	!else
+	!ifNdef MUI_CUSTOMFUNCTION_ABORT
+		!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_ABORT!"
+		!endif
+	!endif
+!if "${_HasUninstaller}" != ""
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstFailed '${UAC.Unload}'
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstSuccess '${UAC.Unload}'
+	!ifNdef MUI_INCLUDED
+		!insertmacro _UAC.GenerateSimpleFunction "un" .onUserAbort '${UAC.Unload}'
+		!else
+		!ifNdef MUI_CUSTOMFUNCTION_ABORT
+			!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_(UN)ABORT!"
+			!endif
+		!endif
+	!endif
+!macroend
+
+!define UAC.FastCallFunctionAsUser '!insertmacro UAC.FastCallFunctionAsUser '
+!macro UAC.FastCallFunctionAsUser _func _var
+GetFunctionAddress ${_var} ${_func}
+UAC::ExecCodeSegment ${_var}
+!macroend
+!define UAC.CallFunctionAsUser '!insertmacro UAC.CallFunctionAsUser '
+!macro UAC.CallFunctionAsUser _func
+push $R9
+!insertmacro UAC.FastCallFunctionAsUser ${_func} $R9
+pop $R9
+!macroend
+
+!define UAC.FastCallGetOuterInstanceHwndParent UAC::GetOuterHwnd
+!define UAC.GetOuterInstanceHwndParent '!insertmacro UAC.GetOuterInstanceHwndParent '
+!macro UAC.GetOuterInstanceHwndParent _var
+push $0
+${UAC.FastCallGetOuterInstanceHwndParent}
+Exch $0
+Pop ${_var}
+!macroend
+
+
+
+!macro _UAC.DumpEx _disp _f _fp _v
+${_f} ${_fp}
+DetailPrint "${_disp}=${_v}"
+!macroend
+!macro _UAC.Dump _f _fp _v
+!insertmacro _UAC.DumpEx `${_f}` `${_f}` `${_fp}` `${_v}`
+!macroend
+!macro _UAC.DbgDetailPrint
+push $0
+push $1
+System::Call /NoUnload "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})"
+System::Call "Kernel32::GetComputerName(t.r1,*i${NSIS_MAX_STRLEN})"
+DetailPrint "$1\$0"
+;!insertmacro _UAC.DumpEx "User" System::Call "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})" $0
+!insertmacro _UAC.DumpEx "CmdLine" "" "" "$CmdLine"
+!insertmacro _UAC.Dump UAC::IsAdmin "" $0
+!insertmacro _UAC.Dump UAC::SupportsUAC "" $0
+!insertmacro _UAC.Dump UAC::GetElevationType "" $0
+pop $1
+pop $0
+!macroend
+
+!endif /* ifndef UAC_HDR__INC */
+\ No newline at end of file
diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi
new file mode 100644
index 00000000..e98edc54
--- /dev/null
+++ b/installer/UltraStar Deluxe.nsi
@@ -0,0 +1,614 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer: Main
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!include MUI2.nsh
+!include WinVer.nsh
+!include LogicLib.nsh
+!include InstallOptions.nsh
+!include nsDialogs.nsh
+!include UAC.nsh
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Variables
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Installer Paths:
+
+!define path_settings ".\settings"
+!define path_languages ".\languages"
+!define path_dependencies ".\dependencies"
+!define path_images ".\dependencies\images"
+!define path_plugins ".\dependencies\plugins"
+
+; MultiLanguage - Show all languages:
+!define MUI_LANGDLL_ALLLANGUAGES
+
+!addPluginDir "${path_plugins}\"
+
+!include "${path_settings}\variables.nsh"
+!include "${path_settings}\functions.nsh"
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Export Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+SetCompress Auto
+SetCompressor lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+
+CRCCheck on
+
+XPStyle on
+
+Name "${name} v.${version}"
+Brandingtext "${name} v.${version} Installation"
+OutFile "ultrastardx-${version}-installer-full.exe"
+
+InstallDir "$PROGRAMFILES\${name}"
+InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\UltraStar Deluxe" "InstallDir"
+
+; Windows Vista / Windows 7:
+; must be "user" for UAC plugin 
+RequestExecutionLevel user
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Interface Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Icons:
+
+!define MUI_ICON "${img_install}"
+!define MUI_UNICON "${img_uninstall}"
+
+; Header and Side Images:
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}"
+!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"
+
+; Abort Warnings:
+
+!define MUI_ABORTWARNING
+!define MUI_ABORTWARNING_TEXT "$(abort_install)"
+!define MUI_ABORTWARNING_CANCEL_DEFAULT
+
+!define MUI_UNABORTWARNING
+!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)"
+!define MUI_UNABORTWARNING_CANCEL_DEFAULT
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Pages Installation Routine Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!define MUI_CUSTOMFUNCTION_GUIINIT bgmusic
+
+; Welcome Page:
+
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title)"
+
+!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt)"
+
+; License Page:
+
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+
+; Components Page:
+
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO $(page_components_info)
+
+; Finish Pages:
+
+!define MUI_FINISHPAGE_TITLE_3LINES
+
+!define MUI_FINISHPAGE_TEXT_LARGE
+!define MUI_FINISHPAGE_TEXT "$(page_finish_txt)"
+
+; MUI_FINISHPAGE_RUN is executed as admin by default.
+; To get the config.ini location right it must be executed with user 
+; rights instead.
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_NOTCHECKED
+!define MUI_FINISHPAGE_RUN_FUNCTION RunAppAsUser 
+
+Function RunAppAsUser 
+    UAC::ShellExec 'open' '' '$INSTDIR\${exe}.exe' '' '$INSTDIR'
+FunctionEnd
+
+!define MUI_FINISHPAGE_LINK "$(page_finish_linktxt)"
+!define MUI_FINISHPAGE_LINK_LOCATION "${homepage}"
+
+!define MUI_FINISHPAGE_SHOWREADME
+!define MUI_FINISHPAGE_SHOWREADME_TEXT $(page_finish_desktop)
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortCuts
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Pages Installation Routine
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "${license}"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+
+; Start menu page
+
+Var ICONS_GROUP
+!define MUI_STARTMENUPAGE_NODISABLE
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}"
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${name}"
+!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
+
+!insertmacro MUI_PAGE_INSTFILES
+
+; USDX Settings Page
+
+Page custom Settings
+
+
+; User data info
+
+Var UseAppData    ; true if APPDATA is used for user data, false for INSTDIR
+Var UserDataPath  ; Path to user data dir (e.g. $INSTDIR)
+Var ConfigIniPath ; Path to config.ini (e.g. "$INSTDIR\config.ini")
+
+; Checks for write permissions on $INSTDIR\config.ini.
+; This function creates $INSTDIR\config.use as a marker file if
+; the user has write permissions.
+; Note: Must be run with user privileges
+Function CheckInstDirUserPermissions
+	ClearErrors
+	; try to open the ini file.
+	; Use "append" mode so an existing config.ini is not destroyed.
+	FileOpen $0 "$INSTDIR\config.ini" a
+	IfErrors end
+	; we have write permissions -> create a marker file
+	FileOpen $1 "$INSTDIR\config.use" a	
+	FileClose $1
+end:
+	FileClose $0
+FunctionEnd
+
+; Determines the directory used for config.ini and other user
+; settings and data.
+; Sets $UseAppData, $UserDataPath and $ConfigIniPath
+Function DetermineUserDataDir
+	Delete "$INSTDIR\config.use"
+	!insertmacro UAC.CallFunctionAsUser CheckInstDirUserPermissions
+	IfFileExists "$INSTDIR\config.use" 0 notexists
+	StrCpy $UseAppData false
+	StrCpy $UserDataPath "$INSTDIR"
+	Goto end
+notexists:
+	StrCpy $UseAppData true
+	SetShellVarContext current
+	StrCpy $UserDataPath "$APPDATA\ultrastardx"
+	SetShellVarContext all
+end:
+	Delete "$INSTDIR\config.use"	
+	StrCpy $ConfigIniPath "$UserDataPath\config.ini"
+FunctionEnd
+
+Function Settings
+
+	!insertmacro INSTALLOPTIONS_WRITE "Settings-$LANGUAGE" "Field 18" "State" "$INSTDIR\songs"
+
+	!insertmacro MUI_HEADER_TEXT " " "$(page_settings_subtitle)"   
+	!insertmacro INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"
+
+	; Get all the variables:
+
+	Var /GLOBAL LABEL_COMPONENTS
+
+	Var /GLOBAL CHECKBOX_COVERS
+	Var /GLOBAL CB_COVERS_State
+	Var /GLOBAL CHECKBOX_SCORES
+	Var /GLOBAL CB_SCORES_State
+	Var /GLOBAL CHECKBOX_CONFIG
+	Var /GLOBAL CB_CONFIG_State
+	Var /GLOBAL CHECKBOX_SCREENSHOTS
+	Var /GLOBAL CB_SCREENSHOTS_State
+	Var /GLOBAL CHECKBOX_PLAYLISTS
+	Var /GLOBAL CB_PLAYLISTS_State
+	Var /GLOBAL CHECKBOX_SONGS 
+	Var /GLOBAL CB_SONGS_State
+
+	Var /GLOBAL fullscreen
+	Var /GLOBAL language2
+	Var /GLOBAL resolution
+	Var /GLOBAL tabs
+	Var /GLOBAL sorting
+	Var /GLOBAL songdir
+
+	!insertmacro INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 5" "State"
+	!insertmacro INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 6" "State"
+	!insertmacro INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 7" "State"
+	!insertmacro INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 8" "State"
+	!insertmacro INSTALLOPTIONS_READ $sorting "Settings-$LANGUAGE" "Field 15" "State"
+	!insertmacro INSTALLOPTIONS_READ $songdir "Settings-$LANGUAGE" "Field 18" "State"
+
+	WriteINIStr "$ConfigIniPath" "Game" "Language" "$language2"
+	WriteINIStr "$ConfigIniPath" "Game" "Tabs" "$tabs"
+	WriteINIStr "$ConfigIniPath" "Game" "Sorting" "$sorting"
+
+	WriteINIStr "$ConfigIniPath" "Graphics" "FullScreen" "$fullscreen"
+	WriteINIStr "$ConfigIniPath" "Graphics" "Resolution" "$resolution"
+
+	${If} $songdir != "$INSTDIR\songs"
+	WriteINIStr "$ConfigIniPath" "Directories" "SongDir1" "$songdir"
+	${EndIf}
+		
+FunctionEnd ; Settings page End
+
+!insertmacro MUI_PAGE_FINISH
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Pages UnInstallation Routine
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!define MUI_WELCOMEPAGE_TITLE "$(page_un_welcome_title)"
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+
+UninstPage custom un.AskDelete un.DeleteAll
+
+Function un.AskDelete
+
+	nsDialogs::Create /NOUNLOAD 1018
+
+	${NSD_CreateLabel} 0 -195 100% 12u "$(delete_components)"
+	Pop $LABEL_COMPONENTS
+
+	${NSD_CreateCheckbox} 0 -175 100% 8u "$(delete_covers)"
+	Pop $CHECKBOX_COVERS
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_COVERS $1
+
+	${NSD_CreateCheckbox} 0 -155 100% 8u "$(delete_config)"
+	Pop $CHECKBOX_CONFIG
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_CONFIG $2
+
+	${NSD_CreateCheckbox} 0 -135 100% 8u "$(delete_highscores)"
+	Pop $CHECKBOX_SCORES 
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCORES $3
+
+	${NSD_CreateCheckbox} 0 -115 100% 8u "$(delete_screenshots)"
+	Pop $CHECKBOX_SCREENSHOTS 
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SCREENSHOTS $4
+
+	${NSD_CreateCheckbox} 0 -95 100% 8u "$(delete_playlists)"
+	Pop $CHECKBOX_PLAYLISTS
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_PLAYLISTS $5
+
+	${NSD_CreateCheckbox} 0 -65 100% 18u "$(delete_songs)"
+	Pop $CHECKBOX_SONGS 
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX_SONGS $6
+
+
+	nsDialogs::Show
+
+FunctionEnd
+
+Function un.DeleteAll
+
+${NSD_GetState} $CHECKBOX_COVERS $CB_COVERS_State
+${NSD_GetState} $CHECKBOX_CONFIG $CB_CONFIG_State
+${NSD_GetState} $CHECKBOX_SCORES $CB_SCORES_State
+${NSD_GetState} $CHECKBOX_SCORES $CB_SCREENSHOTS_State
+${NSD_GetState} $CHECKBOX_SCORES $CB_PLAYLISTS_State
+${NSD_GetState} $CHECKBOX_SONGS  $CB_SONGS_State
+
+${If} $CB_COVERS_State == "1" ; Remove covers
+	RMDir /r "$INSTDIR\covers"
+	SetShellVarContext current	
+	RMDir /r "$APPDATA\ultrastardx\covers"
+	SetShellVarContext all
+${EndIf}
+
+${If} $CB_CONFIG_State == "1" ; Remove config
+	SetShellVarContext current
+	Delete "$APPDATA\ultrastardx\config.ini" 
+	SetShellVarContext all
+	Delete "$INSTDIR\config.ini"
+${EndIf}
+
+${If} $CB_SCORES_State == "1" ; Remove highscores
+	SetShellVarContext current
+	Delete "$APPDATA\ultrastardx\Ultrastar.db" 
+	SetShellVarContext all
+	Delete "$INSTDIR\Ultrastar.db"
+${EndIf}
+
+${If} $CB_SCREENSHOTS_State == "1" ; Remove screenshots
+	RMDir /r "$INSTDIR\sreenshots"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\screenshots"
+	SetShellVarContext all
+${EndIf}
+
+${If} $CB_SCREENSHOTS_State == "1" ; Remove playlists
+	RMDir /r "$INSTDIR\playlists"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\playlists"
+	SetShellVarContext all
+${EndIf}
+
+${If} $CB_SONGS_State == "1" ; Remove songs
+	RMDir /r "$INSTDIR\songs"
+	SetShellVarContext current
+	RMDir /r "$APPDATA\ultrastardx\songs"
+	SetShellVarContext all
+${EndIf}
+
+
+FunctionEnd
+
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Sections Installation Routine
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+;------------------------------------
+; MAIN COMPONENTS (Section 1)
+;------------------------------------
+
+Section $(name_section1) Section1
+	SectionIn RO
+	SetOutPath $INSTDIR
+	SetOverwrite try
+
+	Call DetermineUserDataDir
+	
+	!include "${path_settings}\files_main_install.nsh"
+
+	; Create Shortcuts:
+	SetOutPath "$INSTDIR"
+
+!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+	SetShellVarContext all
+	SetOutPath "$INSTDIR"
+
+	CreateDirectory "${name}"
+	CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs"
+	CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe"
+!insertmacro MUI_STARTMENU_WRITE_END
+
+	; Vista Game Explorer:
+	; (removed due to incompatibility with Windows 7, needs rewrite)
+
+	; Create Uninstaller:
+
+	WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+	WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+
+	SetOutPath "$INSTDIR"
+
+SectionEnd
+
+;------------------------------------
+; OPTIONAL SONGS (Section 2)
+;------------------------------------
+
+ !include "${path_settings}\files_opt_songs.nsh"
+
+;------------------------------------
+; OPTIONAL THEMES (Section 3)
+;------------------------------------
+
+; No additional themes available 
+; for current version of ultrastardx
+
+;------------------------------------
+; UNINSTALL (Section 4)
+;------------------------------------
+
+Section Uninstall
+
+	!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
+
+	!include "${path_settings}\files_main_uninstall.nsh"
+
+	DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+
+	; Unregister from Windows Vista Game Explorer
+	; (removed due to incompatibility with Windows 7)
+
+SectionEnd
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Section Descriptions
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub4} $(DESC_Section2_sub4)
+;	!insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3) THEMES
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section4} $(DESC_g2Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section5} $(DESC_g2Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${g2Section6} $(DESC_g2Section6)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section1} $(DESC_s2_sub1_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section2} $(DESC_s2_sub1_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section3} $(DESC_s2_sub1_Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section4} $(DESC_s2_sub1_Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section5} $(DESC_s2_sub1_Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section6} $(DESC_s2_sub1_Section6)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section7} $(DESC_s2_sub1_Section7)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section8} $(DESC_s2_sub1_Section8)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section9} $(DESC_s2_sub1_Section9)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section10} $(DESC_s2_sub1_Section10)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section11} $(DESC_s2_sub1_Section11)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section12} $(DESC_s2_sub1_Section12)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section13} $(DESC_s2_sub1_Section13)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section14} $(DESC_s2_sub1_Section14)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section15} $(DESC_s2_sub1_Section15)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section16} $(DESC_s2_sub1_Section16)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section17} $(DESC_s2_sub1_Section17)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section18} $(DESC_s2_sub1_Section18)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section19} $(DESC_s2_sub1_Section19)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section20} $(DESC_s2_sub1_Section20)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section21} $(DESC_s2_sub1_Section21)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section22} $(DESC_s2_sub1_Section22)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section23} $(DESC_s2_sub1_Section23)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1_Section24} $(DESC_s2_sub1_Section24)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section1} $(DESC_s2_sub2_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section2} $(DESC_s2_sub2_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section3} $(DESC_s2_sub2_Section3)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section4} $(DESC_s2_sub2_Section4)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section5} $(DESC_s2_sub2_Section5)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section6} $(DESC_s2_sub2_Section6)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section7} $(DESC_s2_sub2_Section7)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section8} $(DESC_s2_sub2_Section8)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2_Section9} $(DESC_s2_sub2_Section9)
+
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)
+	!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3)
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Language Support
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Polish"
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+!include "${path_languages}\*.nsh"
+
+;!addPluginDir "${path_plugins}\"
+ 
+Function bgmusic
+	File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav
+	BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav
+FunctionEnd
+
+Function .onGUIEnd
+	BGImage::Sound /STOP
+FunctionEnd
+
+Function .onInit
+
+	${UAC.I.Elevate.AdminOnly}
+
+	var /GLOBAL version
+	StrCpy $version "1.1"
+
+
+	System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'
+
+	Pop $R0
+
+	StrCmp $R0 0 +3
+	MessageBox MB_OK|MB_ICONEXCLAMATION $(oninit_running)
+	Abort
+
+	ReadRegStr $R0  HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion'
+
+	${If} $R0 == $version
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+			"${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_installagain)" \
+			IDYES continue
+		Abort
+	${EndIf}
+
+	ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
+	StrCmp $R1 "" done
+  
+
+	${If} $R0 != $version
+		MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+			"${name} v.$R0 $(oninit_alreadyinstalled). $\n$\n $(oninit_updateusdx) v.$R0 -> v.${version}" \
+			IDYES continue
+			Abort
+	${EndIf}
+
+
+continue:
+	ReadRegStr $R2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'UninstallString'
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(oninit_uninstall)" IDNO done
+	ExecWait '"$R2" _?=$INSTDIR'
+
+done:
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1038.ini" "Settings-1038"
+	!insertmacro INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1045.ini" "Settings-1045"
+
+FunctionEnd
+
+Function un.onInit
+
+	${nsProcess::FindProcess} "USdx.exe" $R0
+	StrCmp $R0 0 0 +2
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end
+
+closeit:
+	${nsProcess::KillProcess} "USdx.exe" $R0
+	goto continue
+
+	${nsProcess::FindProcess} "ultrastardx.exe" $R0
+	StrCmp $R0 0 0 +2
+	MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end
+
+closeusdx:
+	${nsProcess::KillProcess} "ultrastardx.exe" $R0
+	goto continue
+
+end:
+	${nsProcess::Unload}
+	Abort
+
+continue:
+	!insertmacro MUI_LANGDLL_DISPLAY
+
+FunctionEnd
+
+Function .onInstFailed
+	${UAC.Unload}
+FunctionEnd
+ 
+Function .onInstSuccess
+	${UAC.Unload}
+FunctionEnd
diff --git a/installer/Update.nsi b/installer/Update.nsi
new file mode 100644
index 00000000..e916d3e9
--- /dev/null
+++ b/installer/Update.nsi
@@ -0,0 +1,215 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer: Update
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!include MUI2.nsh
+!include WinVer.nsh
+!include LogicLib.nsh
+!include nsDialogs.nsh
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Variables
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Installer Paths:
+
+!define path_settings ".\settings"
+!define path_languages ".\languages"
+!define path_images "..\installerdependencies\images"
+!define path_plugins "..\installerdependencies\plugins"
+!define path_gdf "$WINDIR\gdf.dll"
+
+!addPluginDir "${path_plugins}\"
+
+!include "${path_settings}\variables.nsh"
+!include "${path_settings}\GameExplorer.nsh"
+!include "${path_settings}\functions.nsh"
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Export Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+SetCompress Auto
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+
+Var /GLOBAL CHECKBOX
+Var /GLOBAL label_update_information
+Var /GLOBAL checkbox_state
+
+XPStyle on
+
+Name "${name} - Update"
+Brandingtext "${name} Update"
+OutFile "ultrastardx-update.exe"
+
+InstallDir "$PROGRAMFILES\${name}"
+
+; Windows Vista / Windows 7:
+
+RequestExecutionLevel admin
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Interface Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Icons:
+
+!define MUI_ICON "${path_images}\${img_install}"
+!define MUI_UNICON "${path_images}\${img_uninstall}"
+
+; Header and Side Images:
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "${path_images}\${img_header}"
+!define MUI_HEADERIMAGE_UNBITMAP "${path_images}\${img_header}"
+
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${path_images}\${img_side}"
+
+; Abort Warnings:
+
+!define MUI_ABORTWARNING
+!define MUI_ABORTWARNING_TEXT "$(abort_install)"
+!define MUI_ABORTWARNING_CANCEL_DEFAULT
+
+!define MUI_UNABORTWARNING
+!define MUI_UNABORTWARNING_TEXT "$(abort_uninstall)"
+!define MUI_UNABORTWARNING_CANCEL_DEFAULT
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Pages Installation Routine Settings
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Welcome Page:
+
+!define MUI_WELCOMEPAGE_TITLE_3LINES
+!define MUI_WELCOMEPAGE_TITLE "$(page_welcome_title_update)"
+!define MUI_WELCOMEPAGE_TEXT "$(page_welcome_txt_update)"
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Pages Installation Routine
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!insertmacro MUI_PAGE_WELCOME
+
+; USDX Update Page
+
+Page custom Update Download
+
+Function Update
+
+nsDialogs::Create /NOUNLOAD 1018
+
+	Pop $0
+	
+	${NSD_CreateCheckbox} 0 -150 100% 8u "$(update_connect)"
+	Pop $CHECKBOX
+	GetFunctionAddress $0 OnCheckbox
+	nsDialogs::OnClick /NOUNLOAD $CHECKBOX $0
+
+	${NSD_CreateLabel} 0 0 100% 30u "$(update_information)"
+	Pop $label_update_information
+
+nsDialogs::Show
+
+
+FunctionEnd ; Update page End
+
+Function Download
+
+${NSD_GetState} $CHECKBOX $checkbox_state
+
+${If} $checkbox_state == "1"
+
+NSISdl::download /TIMEOUT=50000 http://ultrastardeluxe.xtremeweb-hosting.net/version.txt $TEMP\version.txt
+
+Push 1
+Push "$TEMP\version.txt"
+ Call ReadFileLine
+Pop $1
+
+ReadRegStr $R0  HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" 'DisplayVersion'
+
+${VersionCompare} "$R0" "$1" $R1
+
+${If} $R1 == "0"
+
+messageBox MB_OK|MB_ICONINFORMATION "$(update_check_equal)"
+
+${Else}
+	${If} $R1 == "1"
+
+        IfFileExists $TEMP\version.txt FileExists
+           SetErrors
+           Goto Failed
+
+        FileExists:
+	messageBox MB_OK|MB_ICONINFORMATION "$(update_check_newer)"
+
+	${Else}
+
+		${If} $R1 == "2"
+		messageBox MB_YESNO|MB_ICONQUESTION \
+ 		"$(update_check_older)" IDNO +6
+
+		Push 2
+		Push "$TEMP\version.txt"
+ 		Call ReadFileLine
+		Pop $2
+
+		ExecShell Open $2
+
+		${Else}
+
+		Failed:
+		messageBox MB_YESNO|MB_ICONQUESTION \
+ 		"$(update_check_failed)" IDNO +2
+
+		ExecShell Open http://www.ultrastardeluxe.org
+
+		${EndIf}
+	${EndIf}
+${EndIf}
+${Else}
+
+; If checkbox_state = 0
+
+
+${EndIf}
+
+Delete "$TEMP\version.txt"
+
+
+FunctionEnd
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UPDATE (Section 1)
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+Section $(name_section1) Section1
+	SectionIn RO
+	SetOutPath $INSTDIR
+	SetOverwrite try
+
+SectionEnd
+
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Language Support
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+
+!include "${path_languages}\*.nsh"
+
+Function .onInit
+
+  !insertmacro MUI_LANGDLL_DISPLAY
+
+
+
+FunctionEnd
diff --git a/installer/dependencies/dll/put game dlls here b/installer/dependencies/dll/put game dlls here
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/installer/dependencies/dll/put game dlls here
diff --git a/installer/dependencies/documents/documentation.pdf b/installer/dependencies/documents/documentation.pdf
new file mode 100644
index 00000000..ae99a860
--- /dev/null
+++ b/installer/dependencies/documents/documentation.pdf
diff --git a/installer/dependencies/documents/license.txt b/installer/dependencies/documents/license.txt
new file mode 100644
index 00000000..66f35b98
--- /dev/null
+++ b/installer/dependencies/documents/license.txt
@@ -0,0 +1,125 @@
+The GNU General Public License (GPL)
+Version 2, June 1991
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+one line to give the program's name and a brief idea of what it does.
+Copyright (C) 
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest 
+in the program `Gnomovision' (which makes passes at compilers)
+written by James Hacker.
+
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
diff --git a/installer/dependencies/images/header.bmp b/installer/dependencies/images/header.bmp
new file mode 100644
index 00000000..058eafd3
--- /dev/null
+++ b/installer/dependencies/images/header.bmp
diff --git a/installer/dependencies/images/side.bmp b/installer/dependencies/images/side.bmp
new file mode 100644
index 00000000..3883fa09
--- /dev/null
+++ b/installer/dependencies/images/side.bmp
diff --git a/installer/dependencies/loop.wav b/installer/dependencies/loop.wav
new file mode 100644
index 00000000..8a252921
--- /dev/null
+++ b/installer/dependencies/loop.wav
diff --git a/installer/dependencies/plugins/NSISdl.dll b/installer/dependencies/plugins/NSISdl.dll
new file mode 100644
index 00000000..a3675054
--- /dev/null
+++ b/installer/dependencies/plugins/NSISdl.dll
diff --git a/installer/dependencies/plugins/UAC.dll b/installer/dependencies/plugins/UAC.dll
new file mode 100644
index 00000000..edf21305
--- /dev/null
+++ b/installer/dependencies/plugins/UAC.dll
diff --git a/installer/dependencies/plugins/ZipDLL.dll b/installer/dependencies/plugins/ZipDLL.dll
new file mode 100644
index 00000000..5925d591
--- /dev/null
+++ b/installer/dependencies/plugins/ZipDLL.dll
diff --git a/installer/dependencies/plugins/nsProcess.dll b/installer/dependencies/plugins/nsProcess.dll
new file mode 100644
index 00000000..064097a3
--- /dev/null
+++ b/installer/dependencies/plugins/nsProcess.dll
diff --git a/installer/install.ico b/installer/install.ico
new file mode 100644
index 00000000..fc1d0797
--- /dev/null
+++ b/installer/install.ico
diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh
new file mode 100644
index 00000000..a3325d5b
--- /dev/null
+++ b/installer/languages/English.nsh
@@ -0,0 +1,131 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer - Language file: English
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+LangString abort_install ${LANG_ENGLISH} "Are you sure to abort Installation?"
+LangString abort_uninstall ${LANG_ENGLISH} "Are you sure to abort UnInstallation?"
+LangString oninit_running ${LANG_ENGLISH} "The installer is already running."
+LangString oninit_installagain ${LANG_ENGLISH} "Are you sure you want to install it again?"
+LangString oninit_alreadyinstalled ${LANG_ENGLISH} "is already installed"
+LangString oninit_closeusdx ${LANG_ENGLISH} "cannot be uninstalled while its running! Do you want to close it?"
+LangString oninit_updateusdx ${LANG_ENGLISH} "Do you want to update the installation from:"
+LangString oninit_uninstall ${LANG_ENGLISH} "Do you want to uninstall the old version? (recommended)"
+
+LangString update_connect ${LANG_ENGLISH} "Establish internet connection and check for new version"
+LangString button_next ${LANG_ENGLISH} "Next >"
+LangString button_close ${LANG_ENGLISH} "Close"
+LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards."
+
+LangString delete_components ${LANG_ENGLISH} "Also delete the following components:"
+LangString delete_covers ${LANG_ENGLISH} "Cover?"
+LangString delete_highscores ${LANG_ENGLISH} "Highscores?"
+LangString delete_config ${LANG_ENGLISH} "Config?"
+LangString delete_screenshots ${LANG_ENGLISH} "Screenshots?"
+LangString delete_playlists ${LANG_ENGLISH} "Playlists?"
+LangString delete_songs ${LANG_ENGLISH} "Remove songs? WARNING: ALL files within the InstallationDir\songs folder will be removed(!)"
+
+LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?"
+LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed."
+LangString update_check_newer ${LANG_ENGLISH} "Your installed version $R0 is newer than the $\n$\rcurrent release version $1 of UltraStar Deluxe. No update needed."
+LangString update_check_failed ${LANG_ENGLISH} "The check for a new version failed. Do you want to visit website to check manually ?"
+
+; Welcome Page:
+
+LangString page_welcome_title_update ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Update Wizard"
+LangString page_welcome_txt_update ${LANG_ENGLISH} "This wizard will guide you through the Update process of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"
+LangString page_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard"
+LangString page_welcome_txt ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar.$\n$\r$\n$\rThe UltraStar Deluxe Team wishes you fun.$\n$\rProject website: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"
+LangString page_un_welcome_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe uninstall wizard"
+
+; Components Page:
+
+LangString page_components_info ${LANG_ENGLISH} "Hover the component to get details"
+
+; Custom Page
+
+LangString page_settings_fullscreen ${LANG_ENGLISH} "Fullscreen Mode"
+LangString page_settings_subtitle ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe."
+
+; Finish Page:
+
+LangString page_finish_txt ${LANG_ENGLISH} "UltraStar Deluxe was installed successfully on you system.$\n$\r$\n$\rVisit out project website to get latest news and updates."
+LangString page_finish_linktxt ${LANG_ENGLISH} "Project website"
+LangString page_finish_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
+
+; Start Menu and Shortcuts
+
+LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe"
+LangString sm_uninstall ${LANG_ENGLISH} "Uninstall"
+LangString sm_website ${LANG_ENGLISH} "Website"
+LangString sm_license ${LANG_ENGLISH} "License"
+LangString sm_readme ${LANG_ENGLISH} "Readme"
+LangString sm_songs ${LANG_ENGLISH} "Songs"
+LangString sm_documentation ${LANG_ENGLISH} "Documentation"
+
+LangString sc_play ${LANG_ENGLISH} "Play"
+LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
+
+; Sections and SectionGroups
+
+LangString name_section1 ${LANG_ENGLISH} "Main components"
+LangString name_section2 ${LANG_ENGLISH} "Songs"
+LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton"
+LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer"
+LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys"
+LangString name_s2_sub4 ${LANG_ENGLISH} "Pornophonique"
+
+LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe"
+LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be downloaded (Requires Internet Connection!)"
+LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed."
+LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed."
+LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed."
+LangString DESC_Section2_sub4 ${LANG_ENGLISH} "You can choose which Pornophonique songs should be installed."
+
+LangString DESC_g2Section2 ${LANG_ENGLISH} "Download the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."
+LangString DESC_g2Section3 ${LANG_ENGLISH} "Download the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."
+LangString DESC_g2Section4 ${LANG_ENGLISH} "Download the song 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."
+LangString DESC_g2Section5 ${LANG_ENGLISH} "Download the song 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."
+LangString DESC_g2Section1 ${LANG_ENGLISH} "Download the song 'Bodo Wartke - Liebeslied (Love Song)'."
+LangString DESC_g2Section6 ${LANG_ENGLISH} "Download the song 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0)."
+
+LangString DESC_s2_sub1_Section1 ${LANG_ENGLISH} "Download the song 'Monkey Shines'."
+LangString DESC_s2_sub1_Section2 ${LANG_ENGLISH} "Download the song 'I Crush Everything'."
+LangString DESC_s2_sub1_Section3 ${LANG_ENGLISH} "Download the song 'Not About You'."
+LangString DESC_s2_sub1_Section4 ${LANG_ENGLISH} "Download the song 'Mr. Fancy Pants'."
+LangString DESC_s2_sub1_Section5 ${LANG_ENGLISH} "Download the song 'Big Bad World One'."
+LangString DESC_s2_sub1_Section6 ${LANG_ENGLISH} "Download the song 'Flickr [incl. video]'."
+LangString DESC_s2_sub1_Section7 ${LANG_ENGLISH} "Download the song 'My Beige Bear'."
+LangString DESC_s2_sub1_Section8 ${LANG_ENGLISH} "Download the song 'The Future Soon'."
+LangString DESC_s2_sub1_Section9 ${LANG_ENGLISH} "Download the song 'Ikea'."
+LangString DESC_s2_sub1_Section10 ${LANG_ENGLISH} "Download the song 'Furry Old Lobster'."
+LangString DESC_s2_sub1_Section11 ${LANG_ENGLISH} "Download the song 'Code Monkey [incl. video]'."
+LangString DESC_s2_sub1_Section12 ${LANG_ENGLISH} "Download the song 'I�m Your Moon'."
+LangString DESC_s2_sub1_Section13 ${LANG_ENGLISH} "Download the song 'First Of May'."
+LangString DESC_s2_sub1_Section14 ${LANG_ENGLISH} "Download the song 'Dance, Soterios Johnson, Dance'."
+LangString DESC_s2_sub1_Section15 ${LANG_ENGLISH} "Download the song 'A Talk With George'."
+LangString DESC_s2_sub1_Section16 ${LANG_ENGLISH} "Download the song 'Creepy Doll [incl. video]'."
+LangString DESC_s2_sub1_Section17 ${LANG_ENGLISH} "Download the song 'That Spells DNA'."
+LangString DESC_s2_sub1_Section18 ${LANG_ENGLISH} "Download the song 'When You Go'."
+LangString DESC_s2_sub1_Section19 ${LANG_ENGLISH} "Download the song 'Better'."
+LangString DESC_s2_sub1_Section20 ${LANG_ENGLISH} "Download the song 'Shop Vac'."
+LangString DESC_s2_sub1_Section21 ${LANG_ENGLISH} "Download the song 'I Feel Fantastic'."
+LangString DESC_s2_sub1_Section22 ${LANG_ENGLISH} "Download the song 'Re: Your Brains'."
+LangString DESC_s2_sub1_Section23 ${LANG_ENGLISH} "Download the song 'Skullcrusher Mountain'."
+LangString DESC_s2_sub1_Section24 ${LANG_ENGLISH} "Download the song 'Chiron Beta Prime [incl. video]'."
+
+LangString DESC_s2_sub2_Section1 ${LANG_ENGLISH} "Download the song '69'."
+LangString DESC_s2_sub2_Section2 ${LANG_ENGLISH} "Download the song '69 (Karaoke)'."
+LangString DESC_s2_sub2_Section3 ${LANG_ENGLISH} "Download the song 'Can't stop it'."
+LangString DESC_s2_sub2_Section4 ${LANG_ENGLISH} "Download the song 'Can't stop it (Karaoke)'."
+LangString DESC_s2_sub2_Section5 ${LANG_ENGLISH} "Download the song 'In My Hand'."
+LangString DESC_s2_sub2_Section6 ${LANG_ENGLISH} "Download the song 'Man Song'."
+LangString DESC_s2_sub2_Section7 ${LANG_ENGLISH} "Download the song 'Man Song (Karaoke)'."
+LangString DESC_s2_sub2_Section8 ${LANG_ENGLISH} "Download the song 'Stay with me'."
+LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "Download the song 'Stay with me (Karaoke)'."
+
+LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "Download the song 'Lebendig und kr�ftig und sch�rfer'."
+LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "Download the song 'Mensch, wo bist du?'."
+LangString DESC_s2_sub3_Section3 ${LANG_ENGLISH} "Download the song 'Mensch, wo bist du? (Karaoke)'."
+
+; Optional Themes
+; (not available)
+\ No newline at end of file
diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh
new file mode 100644
index 00000000..56507ec5
--- /dev/null
+++ b/installer/languages/German.nsh
@@ -0,0 +1,130 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer - Language file: German
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+LangString abort_install ${LANG_GERMAN} "Willst du die Installation wirklich abbrechen?"
+LangString abort_uninstall ${LANG_GERMAN} "Willst du die Deinstallation wirklich abbrechen?"
+LangString oninit_running ${LANG_GERMAN} "Die Installation wird bereits ausgef�hrt."
+LangString oninit_installagain ${LANG_GERMAN} "Bist du sicher, dass du es erneut installieren m�chtest?"
+LangString oninit_alreadyinstalled ${LANG_GERMAN} "ist bereits installiert"
+LangString oninit_closeusdx ${LANG_GERMAN} "kann nicht w�hrend der Laufzeit deinstalliert werden. Soll es geschlossen werden?"
+LangString oninit_updateusdx ${LANG_GERMAN} "M�chtest du das Programm aktualisieren von"
+LangString oninit_uninstall ${LANG_GERMAN} "M�chtest du die alte Version entfernen? (empfohlen)"
+
+LangString update_connect ${LANG_GERMAN} "Mit dem Internet verbinden und nach aktueller Version suchen"
+LangString button_next ${LANG_GERMAN} "Weiter >"
+LangString button_close ${LANG_GERMAN} "Beenden"
+LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschlie�end installiert werden."
+
+LangString delete_components ${LANG_GERMAN} "Folgende Komponenten ebenfalls entfernen:"
+LangString delete_covers ${LANG_GERMAN} "Cover?"
+LangString delete_highscores ${LANG_GERMAN} "Statistiken?"
+LangString delete_config ${LANG_GERMAN} "Konfiguration?"
+LangString delete_screenshots ${LANG_GERMAN} "Screenshots?"
+LangString delete_playlists ${LANG_GERMAN} "Playlisten?"
+LangString delete_songs ${LANG_GERMAN} "Lieder l�schen? WARNUNG: ALLE Dateien im Unterordner 'songs' des Installationsverzeichnisses werden gel�scht(!)"
+
+LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verf�gbar. M�chtest du sie runterladen?"
+LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update ben�tigt."
+LangString update_check_newer ${LANG_GERMAN} "Deine aktuelle Version $R0 ist neuer als die zurzeit ver�ffentlichte$\n$\rVersion $1 von UltraStar Deluxe. Kein Update ben�tigt."
+LangString update_check_failed ${LANG_GERMAN} "Die Aktualisierungspr�fung ist fehlgeschlagen. Willst du manuell nach Updates suchen?"
+
+; Welcome Page:
+
+LangString page_welcome_title_update ${LANG_GERMAN} "Willkommen beim Aktualisierungsassistenten von UltraStar Deluxe" 
+LangString page_welcome_txt_update ${LANG_GERMAN} "Dieser Assistent wird dich durch die Aktualisierung von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar �hnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team w�nscht viel Spa�.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"
+
+LangString page_welcome_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"
+LangString page_welcome_txt ${LANG_GERMAN} "Dieser Assistent wird dich durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar �hnelt. $\n$\r$\n$\rDas UltraStar Deluxe Team w�nscht viel Spa�.$\n$\rProjekthomepage: http://www.ultrastardeluxe.org$\n$\rSupport Forum: http://forum.ultrastardeluxe.org"
+
+LangString page_un_welcome_title ${LANG_GERMAN} "Willkommen zur Deinstallation von UltraStar Deluxe"
+
+; Components Page:
+
+LangString page_components_info ${LANG_GERMAN} "Schiebe den Mauszeiger �ber die Komponente um Details einzusehen"
+
+; Custom Page
+
+LangString page_settings_fullscreen ${LANG_GERMAN} "Vollbild Modus:"
+LangString page_settings_subtitle ${LANG_GERMAN} "Lege deine favorisierten Einstellungen f�r UltraStar Deluxe fest."
+
+; Finish Page:
+
+LangString page_finish_txt ${LANG_GERMAN} "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.$\n$\r$\n$\rBesuche unsere Projektwebseite um die neusten Updates und News zu erhalten."
+LangString page_finish_linktxt ${LANG_GERMAN} "Projektwebseite"
+LangString page_finish_desktop ${LANG_GERMAN} "Verkn�pfung auf dem Desktop erstellen?"
+
+; Start Menu and Shortcuts
+
+LangString sm_website ${LANG_GERMAN} "Webseite"
+LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"		  
+LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe spielen"  
+LangString sm_license ${LANG_GERMAN} "Lizenz"
+LangString sm_readme ${LANG_GERMAN} "Lies mich"
+LangString sm_songs ${LANG_GERMAN} "Songs"
+LangString sm_documentation ${LANG_GERMAN} "Dokumentation"
+
+LangString sc_play ${LANG_GERMAN} "Spielen" 
+LangString sc_desktop ${LANG_GERMAN} "Verkn�pfung auf dem Desktop erstellen?" 
+
+; Sections and SectionGroups
+
+LangString name_section1 ${LANG_GERMAN} "Hauptkomponenten"
+LangString name_section2 ${LANG_GERMAN} "Songs"
+LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton"
+LangString name_s2_sub2 ${LANG_GERMAN} "Shearer"
+LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys"
+LangString name_s2_sub4 ${LANG_GERMAN} "Pornophonique"
+
+LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe ben�tigten Grunddateien"
+LangString DESC_Section2 ${LANG_GERMAN} "Hier k�nnen Songs zum Herunterladen gew�hlt werden. (Ben�tigt aktive Internetverbindung!)"
+LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier k�nnen Jonathan Coulton Songs (CC by-nc 3.0) zum Herunterladen gew�hlt werden."
+LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier k�nnen Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Herunterladen gew�hlt werden."
+LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier k�nnen Wise Guys Songs zum Herunterladen gew�hlt werden."
+LangString DESC_Section2_sub4 ${LANG_GERMAN} "Hier k�nnen Pornophonique Songs zum Herunterladen gew�hlt werden."
+
+LangString DESC_g2Section2 ${LANG_GERMAN} "L�dt das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) herunter."
+LangString DESC_g2Section3 ${LANG_GERMAN} "L�dt das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5) herunter."
+LangString DESC_g2Section4 ${LANG_GERMAN} "L�dt das Lied 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) herunter."
+LangString DESC_g2Section5 ${LANG_GERMAN} "L�dt das Lied 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) herunter."
+LangString DESC_g2Section1 ${LANG_GERMAN} "L�dt das Lied 'Bodo Wartke - Liebeslied (Love Song)' herunter."
+LangString DESC_g2Section6 ${LANG_GERMAN} "L�dt das Lied 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0) herunter."
+
+LangString DESC_s2_sub1_Section1 ${LANG_GERMAN} "L�dt das Lied 'Monkey Shines' herunter."
+LangString DESC_s2_sub1_Section2 ${LANG_GERMAN} "L�dt das Lied 'I Crush Everything' herunter."
+LangString DESC_s2_sub1_Section3 ${LANG_GERMAN} "L�dt das Lied 'Not About You' herunter."
+LangString DESC_s2_sub1_Section4 ${LANG_GERMAN} "L�dt das Lied 'Mr. Fancy Pants' herunter."
+LangString DESC_s2_sub1_Section5 ${LANG_GERMAN} "L�dt das Lied 'Big Bad World One' herunter."
+LangString DESC_s2_sub1_Section6 ${LANG_GERMAN} "L�dt das Lied 'Flickr [inkl. Video]' herunter."
+LangString DESC_s2_sub1_Section7 ${LANG_GERMAN} "L�dt das Lied 'My Beige Bear' herunter."
+LangString DESC_s2_sub1_Section8 ${LANG_GERMAN} "L�dt das Lied 'The Future Soon' herunter."
+LangString DESC_s2_sub1_Section9 ${LANG_GERMAN} "L�dt das Lied 'Ikea' herunter."
+LangString DESC_s2_sub1_Section10 ${LANG_GERMAN} "L�dt das Lied 'Furry Old Lobster' herunter."
+LangString DESC_s2_sub1_Section11 ${LANG_GERMAN} "L�dt das Lied 'Code Monkey [inkl. Video]' herunter."
+LangString DESC_s2_sub1_Section12 ${LANG_GERMAN} "L�dt das Lied 'I�m Your Moon' herunter."
+LangString DESC_s2_sub1_Section13 ${LANG_GERMAN} "L�dt das Lied 'First Of May' herunter."
+LangString DESC_s2_sub1_Section14 ${LANG_GERMAN} "L�dt das Lied 'Dance, Soterios Johnson, Dance' herunter."
+LangString DESC_s2_sub1_Section15 ${LANG_GERMAN} "L�dt das Lied 'A Talk With George' herunter."
+LangString DESC_s2_sub1_Section16 ${LANG_GERMAN} "L�dt das Lied 'Creepy Doll [inkl. Video]' herunter."
+LangString DESC_s2_sub1_Section17 ${LANG_GERMAN} "L�dt das Lied 'That Spells DNA' herunter."
+LangString DESC_s2_sub1_Section18 ${LANG_GERMAN} "L�dt das Lied 'When You Go' herunter."
+LangString DESC_s2_sub1_Section19 ${LANG_GERMAN} "L�dt das Lied 'Better' herunter."
+LangString DESC_s2_sub1_Section20 ${LANG_GERMAN} "L�dt das Lied 'Shop Vac' herunter."
+LangString DESC_s2_sub1_Section21 ${LANG_GERMAN} "L�dt das Lied 'I Feel Fantastic' herunter."
+LangString DESC_s2_sub1_Section22 ${LANG_GERMAN} "L�dt das Lied 'Re: Your Brains' herunter."
+LangString DESC_s2_sub1_Section23 ${LANG_GERMAN} "L�dt das Lied 'Skullcrusher Mountain' herunter."
+LangString DESC_s2_sub1_Section24 ${LANG_GERMAN} "L�dt das Lied 'Chiron Beta Prime [inkl. Video]' herunter."
+
+LangString DESC_s2_sub2_Section1 ${LANG_GERMAN} "L�dt das Lied '69' herunter."
+LangString DESC_s2_sub2_Section2 ${LANG_GERMAN} "L�dt das Lied '69 (Karaoke)' herunter."
+LangString DESC_s2_sub2_Section3 ${LANG_GERMAN} "L�dt das Lied 'Can't stop it' herunter."
+LangString DESC_s2_sub2_Section4 ${LANG_GERMAN} "L�dt das Lied 'Can't stop it (Karaoke)' herunter."
+LangString DESC_s2_sub2_Section5 ${LANG_GERMAN} "L�dt das Lied 'In My Hand' herunter."
+LangString DESC_s2_sub2_Section6 ${LANG_GERMAN} "L�dt das Lied 'Man Song' herunter."
+LangString DESC_s2_sub2_Section7 ${LANG_GERMAN} "L�dt das Lied 'Man Song (Karaoke)' herunter."
+LangString DESC_s2_sub2_Section8 ${LANG_GERMAN} "L�dt das Lied 'Stay with me' herunter."
+LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "L�dt das Lied 'Stay with me (Karaoke)' herunter."
+
+LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "L�dt das Lied 'Lebendig und kr�ftig und sch�rfer' herunter."
+LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "L�dt das Lied 'Mensch, wo bist du?' herunter."
+LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "L�dt das Lied 'Mensch, wo bist du? (Karaoke)' herunter."
+\ No newline at end of file
diff --git a/installer/languages/Hungarian.nsh b/installer/languages/Hungarian.nsh
new file mode 100644
index 00000000..198251f6
--- /dev/null
+++ b/installer/languages/Hungarian.nsh
@@ -0,0 +1,133 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer - Language file: Hungarian
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; Translation by Gergely BOR <borg42+ultrastardx at gmail.com>.
+
+LangString abort_install ${LANG_HUNGARIAN} "Biztosan megszak�tja a telep�t�st?"
+LangString abort_uninstall ${LANG_HUNGARIAN} "Biztosan megszak�tja a program elt�vol�t�s�t?"
+LangString oninit_running ${LANG_HUNGARIAN} "A telep�t�s m�r folyamatban van."
+LangString oninit_installagain ${LANG_HUNGARIAN} "Biztos abban, hogy m�g egyszer telep�teni szeretn�?"
+LangString oninit_alreadyinstalled ${LANG_HUNGARIAN} "m�r telep�tve van"
+LangString oninit_closeusdx ${LANG_HUNGARIAN} "nem elt�vol�that�, ha m�g fut! K�v�nja a program bez�r�s�t?"
+LangString oninit_updateusdx ${LANG_HUNGARIAN} "K�v�nja-e a programot friss�teni err�l a helyr�l:"
+LangString oninit_uninstall ${LANG_HUNGARIAN} "Do you want to uninstall the old version? (recommended)"
+
+LangString update_connect ${LANG_HUNGARIAN} "�j verzi� keres�se az interneten"
+LangString button_next ${LANG_HUNGARIAN} "Tov�bb >"
+LangString button_close ${LANG_HUNGARIAN} "Bez�r�s"
+LangString update_information ${LANG_HUNGARIAN} "Ellen�rizheti, hogy van-e �j 'UltraStar Deluxe'-verzi�. Ehhez internetkapcsolat sz�ks�ges. Ha van �j verzi�, az ezt k�vet�en telep�thet�."
+
+LangString delete_components ${LANG_HUNGARIAN} "Also delete the following components:"
+LangString delete_covers ${LANG_HUNGARIAN} "T�r�lj�k a bor�t�kat?"
+LangString delete_highscores ${LANG_HUNGARIAN} "T�r�lj�k a pontsz�mokat?"
+LangString delete_config ${LANG_HUNGARIAN} "Config?"
+LangString delete_screenshots ${LANG_HUNGARIAN} "Screenshots?"
+LangString delete_playlists ${LANG_HUNGARIAN} "Playlists?"
+LangString delete_songs ${LANG_HUNGARIAN} "T�r�lj�k a dalokat is? WARNING: ALL files within the InstallationDir\songs folder will be removed(!)"
+
+LangString update_check_older ${LANG_HUNGARIAN} "Az �n g�p�n telep�tett verzi�n�l ($R0) van m�r �jabb ($1). K�v�nja friss�teni?"
+LangString update_check_equal ${LANG_HUNGARIAN} "Az �n g�p�n a legfrissebb verzi� ($R0) van telep�tve. Friss�t�s nem sz�ks�ges."
+LangString update_check_newer ${LANG_HUNGARIAN} "Az �n g�p�n telep�tett verzi� ($R0) frissebb, mint a jelenlegi kiad�s ($1). Friss�t�s nem sz�ks�ges."
+LangString update_check_failed ${LANG_HUNGARIAN} "Az ellen�rz�s sikertelen. K�v�nja bet�lteni a program weboldal�t, hogy ellen�rizhesse hogy van-e friss�t�s?"
+
+; Welcome Page:
+
+LangString page_welcome_title_update ${LANG_HUNGARIAN} "�dv�zli �nt az UltraStar Deluxe friss�t�si var�zsl�ja!"
+LangString page_welcome_txt_update ${LANG_HUNGARIAN} "Ez a var�zsl� v�gigvezeti �nt az UltraStar Deluxe friss�t�si folyamat�n. Az UltraStar Deluxe egy ingyenes �s szabad karaokeprogram, olyan mint a Singstar.$\n$\r$\n$\rAz UltraStar Deluxe csapata j� sz�rakoz�st k�v�n!$\n$\rA projekt weboldala: http://www.ultrastardeluxe.org/$\n$\rT�mogat�s a f�rumunkon: http://forum.ultrastardeluxe.org/"
+LangString page_welcome_title ${LANG_HUNGARIAN} "�dv�zli �nt az UltraStar Deluxe telep�t�si var�zsl�ja!"
+LangString page_welcome_txt ${LANG_HUNGARIAN} "Ez a var�zsl� v�gigvezeti �nt az UltraStar Deluxe telep�t�si folyamat�n. Az UltraStar Deluxe egy ingyenes �s szabad karaokeprogram, olyan mint a Singstar.$\n$\r$\n$\rAz UltraStar Deluxe csapata j� sz�rakoz�st k�v�n!$\n$\rA projekt weboldala: http://www.ultrastardeluxe.org/$\n$\rT�mogat�s a f�rumunkon: http://forum.ultrastardeluxe.org/"
+LangString page_un_welcome_title ${LANG_HUNGARIAN} "�dv�zli �nt az UltraStar Deluxe elt�vol�t�si var�zsl�ja!"
+
+; Components Page:
+
+LangString page_components_info ${LANG_HUNGARIAN} "R�szletes inform�ci��rt vigye az egeret a komponens f�l�"
+
+; Custom Page
+
+LangString page_settings_fullscreen ${LANG_HUNGARIAN} "Teljes k�perny�s �zemm�d"
+LangString page_settings_subtitle ${LANG_HUNGARIAN} "Adja meg a kedvenc UltraStar Deluxe-be�ll�t�s�t."
+
+; Finish Page:
+
+LangString page_finish_txt ${LANG_HUNGARIAN} "Az UltraStar Deluxe telep�t�se sikeresen befejez�d�tt.$\n$\r$\n$\rHa k�v�ncsi a legfrissebb h�rekre �s friss�t�sekre, k�rj�k l�togassa meg projekt�nk weboldal�t."
+LangString page_finish_linktxt ${LANG_HUNGARIAN} "A projekt weboldala"
+LangString page_finish_desktop ${LANG_HUNGARIAN} "Tegy�nk egy parancsikont az asztalra?"
+
+; Start Menu and Shortcuts
+
+LangString sm_shortcut ${LANG_HUNGARIAN} "UltraStar Deluxe karaoke"
+LangString sm_uninstall ${LANG_HUNGARIAN} "Elt�vol�t�s"
+LangString sm_website ${LANG_HUNGARIAN} "Weboldal"
+LangString sm_license ${LANG_HUNGARIAN} "Licensz"
+LangString sm_readme ${LANG_HUNGARIAN} "OlvassEl"
+LangString sm_songs ${LANG_HUNGARIAN} "Dalok"
+LangString sm_documentation ${LANG_HUNGARIAN} "Dokument�ci�"
+
+LangString sc_play ${LANG_HUNGARIAN} "J�t�k"
+LangString sc_desktop ${LANG_HUNGARIAN} "Tegy�nk egy parancsikont az asztalra?"
+
+; Sections and SectionGroups
+
+LangString name_section1 ${LANG_HUNGARIAN} "F� komponensek"
+LangString name_section2 ${LANG_HUNGARIAN} "Dalok"
+LangString name_s2_sub1 ${LANG_HUNGARIAN} "Jonathan Coulton"
+LangString name_s2_sub2 ${LANG_HUNGARIAN} "Shearer"
+LangString name_s2_sub3 ${LANG_HUNGARIAN} "Wise Guys"
+LangString name_s2_sub4 ${LANG_HUNGARIAN} "Pornophonique"
+
+LangString DESC_Section1 ${LANG_HUNGARIAN} "Azok a f�jlok, melyek mindenk�ppen sz�ks�gesek az UltraStar Deluxe futtat�s�hoz."
+LangString DESC_Section2 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy milyen dalok legyenek telep�tve."
+LangString DESC_Section2_sub1 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy mely Jonathan Coulton-dalok (CC by-nc 3.0) legyenek telep�tve."
+LangString DESC_Section2_sub2 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy mely Shearer-dalok (CC by-nc-sa 2.0 / 3.0) legyenek telep�tve."
+LangString DESC_Section2_sub3 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy mely Wise Guys-dalok legyenek telep�tve."
+LangString DESC_Section2_sub4 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy mely Pornophonique-dalok legyenek telep�tve."
+LangString DESC_Section3 ${LANG_HUNGARIAN} "Kiv�laszthatja, hogy milyen t�m�k legyenek telep�tve. A t�m�k haszn�lat�val a program grafikai megjelen�se v�ltozik meg. A t�m�k telep�t�se nem k�telez�."
+
+LangString DESC_g2Section2 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5) c�mu dal."
+LangString DESC_g2Section3 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Joshua Morin - On The Run' (CC by-sa 2.5) c�mu dal."
+LangString DESC_g2Section4 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0) c�mu dal."
+LangString DESC_g2Section5 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5) c�mu dal."
+LangString DESC_g2Section6 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0) c�mu dal."
+LangString DESC_g2Section1 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Bodo Wartke - Liebeslied (Love Song)' c�mu dal."
+
+LangString DESC_s2_sub1_Section1 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Monkey Shines' c�mu dal."
+LangString DESC_s2_sub1_Section2 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'I Crush Everything' c�mu dal."
+LangString DESC_s2_sub1_Section3 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Not About You'."
+LangString DESC_s2_sub1_Section4 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Mr. Fancy Pants' c�mu dal."
+LangString DESC_s2_sub1_Section5 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Big Bad World One' c�mu dal."
+LangString DESC_s2_sub1_Section6 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Flickr' c�mu dal (vide�val)."
+LangString DESC_s2_sub1_Section7 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'My Beige Bear' c�mu dal."
+LangString DESC_s2_sub1_Section8 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'The Future Soon' c�mu dal."
+LangString DESC_s2_sub1_Section9 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Ikea' c�mu dal."
+LangString DESC_s2_sub1_Section10 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Furry Old Lobster' c�mu dal."
+LangString DESC_s2_sub1_Section11 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Code Monkey' c�mu dal (vide�val)."
+LangString DESC_s2_sub1_Section12 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'I'm Your Moon' c�mu dal."
+LangString DESC_s2_sub1_Section13 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'First Of May' c�mu dal."
+LangString DESC_s2_sub1_Section14 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Dance, Soterios Johnson, Dance' c�mu dal."
+LangString DESC_s2_sub1_Section15 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'A Talk With George' c�mu dal."
+LangString DESC_s2_sub1_Section16 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Creepy Doll' c�mu dal (vide�val)."
+LangString DESC_s2_sub1_Section17 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'That Spells DNA' c�mu dal."
+LangString DESC_s2_sub1_Section18 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'When You Go' c�mu dal."
+LangString DESC_s2_sub1_Section19 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Better' c�mu dal."
+LangString DESC_s2_sub1_Section20 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Shop Vac' c�mu dal."
+LangString DESC_s2_sub1_Section21 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'I Feel Fantastic' c�mu dal."
+LangString DESC_s2_sub1_Section22 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Re: Your Brains' c�mu dal."
+LangString DESC_s2_sub1_Section23 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Skullcrusher Mountain' c�mu dal."
+LangString DESC_s2_sub1_Section24 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Chiron Beta Prime' c�mu dal (vide�val)."
+
+LangString DESC_s2_sub2_Section1 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a '69' c�mu dal."
+LangString DESC_s2_sub2_Section2 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a '69 (Karaoke)' c�mu dal."
+LangString DESC_s2_sub2_Section3 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Can't stop it' c�mu dal."
+LangString DESC_s2_sub2_Section4 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Can't stop it (Karaoke)' c�mu dal."
+LangString DESC_s2_sub2_Section5 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'In My Hand' c�mu dal."
+LangString DESC_s2_sub2_Section6 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Man Song' c�mu dal."
+LangString DESC_s2_sub2_Section7 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Man Song (Karaoke)' c�mu dal."
+LangString DESC_s2_sub2_Section8 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Stay with me' c�mu dal."
+LangString DESC_s2_sub2_Section9 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Stay with me (Karaoke)' c�mu dal."
+
+LangString DESC_s2_sub3_Section1 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Lebendig und kr�ftig und sch�rfer' c�mu dal."
+LangString DESC_s2_sub3_Section2 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Mensch, wo bist du?' c�mu dal."
+LangString DESC_s2_sub3_Section3 ${LANG_HUNGARIAN} "Telep�t�sre ker�l a 'Mensch, wo bist du? (Karaoke)' c�mu dal."
+
+; Optional Themes
+; (not available)
+\ No newline at end of file
diff --git a/installer/languages/Polish.nsh b/installer/languages/Polish.nsh
new file mode 100644
index 00000000..00d04d8e
--- /dev/null
+++ b/installer/languages/Polish.nsh
@@ -0,0 +1,131 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer - Language file: Polish
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+LangString abort_install ${LANG_POLISH} "Czy jeste� pewien �e chcesz zatrzyma� instalacj� ?"
+LangString abort_uninstall ${LANG_POLISH} "Czy jeste� pewien �e chcesz zatrzyma� odinstalowywanie ?"
+LangString oninit_running ${LANG_POLISH} "Instajacja jest ju� uruchomiona."
+LangString oninit_installagain ${LANG_POLISH} "Jeste� pewien �e chcesz zainstalowa� jeszcze raz ?"
+LangString oninit_alreadyinstalled ${LANG_POLISH} "Jest obecnie zainstalowany"
+LangString oninit_closeusdx ${LANG_POLISH} "nie mo�e by� odinstalowany dop�ki jest uruchomiony! Czy chcesz zamkn�� go ?"
+LangString oninit_updateusdx ${LANG_POLISH} "Do you want to update the installation from:"
+LangString oninit_uninstall ${LANG_POLISH} "Czy chcesz odinstalowa� star� wersj� ? (rekomendowane)"
+
+LangString update_connect ${LANG_POLISH} "Sprawd� po��czenie z insternetm i sprawd� nowe wersje"
+LangString button_next ${LANG_POLISH} "Dalej >"
+LangString button_close ${LANG_POLISH} "Zamknij"
+LangString update_information ${LANG_POLISH} "Mo�esz sprawdzi� czy jest nowsza wersja 'UltraStar Deluxe'. Aby to zrobi� po��cz si� z internetm. Je�li nowa wersja zostanie znaleziona, b�dzie mo�na j� zainstalowa�."
+
+LangString delete_components ${LANG_POLISH} "Tak�� usun�� nast�puj�ce sk�adniki:"
+LangString delete_covers ${LANG_POLISH} "Ok�adka?"
+LangString delete_highscores ${LANG_POLISH} "Wyniki?"
+LangString delete_config ${LANG_POLISH} "Koniguracja?"
+LangString delete_screenshots ${LANG_POLISH} "Zrzuty ekran�w?"
+LangString delete_playlists ${LANG_POLISH} "Playlisty?"
+LangString delete_songs ${LANG_POLISH} "Usun�� piosenki? UWAGA: Wszystkie pliki w katalogu InstallationDir\songs b�d� usuni�te(!)"
+
+LangString update_check_older ${LANG_POLISH} "Twoja werjsa $R0 jest przestarza�a. Nowa wersja $1 UltraStar'a Deluxe jest ju� dost�pna. Czy chcesz dokona� aktualizacji ?"
+LangString update_check_equal ${LANG_POLISH} "Obecnie zainstalowana wersja $R0 jest najbardziej aktualna. Nie ma nowszych wersji."
+LangString update_check_newer ${LANG_POLISH} "Twoja obecnie zainstalowana wersja $R0 jest nowsza ni� $\n$\robecnie wydana wersja $1 UltraStar'a Deluxe. Nie ma nowszych aktualizacji."
+LangString update_check_failed ${LANG_POLISH} "Poszukiwanie nowyszch wersji zako�czy�o si� b��dem. Czy chcesz odwiedzi� stron� g��wn� i sprawdzi� r�cznie ?"
+
+; Welcome Page:
+
+LangString page_welcome_title_update ${LANG_POLISH} "Witamy w kreatorze aktualizacji programu UltraStar Deluxe"
+LangString page_welcome_txt_update ${LANG_POLISH} "Ten kreator przeprowadzi ci� przez proces aktualizacji gry UltraStar Deluxe. UltraStar Deluxe jest bezp�atn� i Otwart� gr� Karaoke, kt�r� mo�na por�wna� z SingStar'em.$\n$\r$\n$\rZesp� UltraStar Deluxe �yczy mi�ej zabawy.$\n$\rStrona projektu: http://www.ultrastardeluxe.org$\n$\rForum wsparcia: http://forum.ultrastardeluxe.org"
+LangString page_welcome_title ${LANG_POLISH} "Witamy w kreatorze instalacji programu UltraStar Deluxe"
+LangString page_welcome_txt ${LANG_POLISH} "Ten kreator przeprowadzi ci� przez proces instalacji gry UltraStar Deluxe. UltraStar Deluxe jest bezp�atn� i Otwart� gr� Karaoke, kt�r� mo�na por�wna� z SingStar'em.$\n$\r$\n$\rZesp� UltraStar Deluxe �yczy mi�ej zabawy.$\n$\rStrona projektu: http://www.ultrastardeluxe.org$\n$\rForum wsparcia: http://forum.ultrastardeluxe.org"
+LangString page_un_welcome_title ${LANG_POLISH} "Witamy w kreatorze deinstalacji gry UltraStar Deluxe"
+
+; Components Page:
+
+LangString page_components_info ${LANG_POLISH} "Najed� myszk� na komponent, aby zobaczy� szczeg�y"
+
+; Custom Page
+
+LangString page_settings_fullscreen ${LANG_POLISH} "Tryb Pe�noekranowy"
+LangString page_settings_subtitle ${LANG_POLISH} "Wybierz ustawienia dogodne dla Ciebie."
+
+; Finish Page:
+
+LangString page_finish_txt ${LANG_POLISH} "UltraStar Deluxe zosta� poprawnie zainstalowany na twoim komputerze.$\n$\r$\n$\rOdwied� Nasz� stron� aby otrzyma� najnowsze wiadomo�ci i aktualizacj�."
+LangString page_finish_linktxt ${LANG_POLISH} "Strona Projektu"
+LangString page_finish_desktop ${LANG_POLISH} "Czy stw�rzy� skr�t na Pulpicie ?"
+
+; Start Menu and Shortcuts
+
+LangString sm_shortcut ${LANG_POLISH} "Graj w UltraStar Deluxe"
+LangString sm_uninstall ${LANG_POLISH} "Odinstaluj"
+LangString sm_website ${LANG_POLISH} "Strona Projektu"
+LangString sm_license ${LANG_POLISH} "Licencja"
+LangString sm_readme ${LANG_POLISH} "Readme"
+LangString sm_songs ${LANG_POLISH} "Piosenki"
+LangString sm_documentation ${LANG_POLISH} "Dokumentacja"
+
+LangString sc_play ${LANG_POLISH} "Graj"
+LangString sc_desktop ${LANG_POLISH} "Czy stw�rzy� skr�t na Pulpicie ?"
+
+; Sections and SectionGroups
+
+LangString name_section1 ${LANG_POLISH} "G��wne komponenty"
+LangString name_section2 ${LANG_POLISH} "Piosenki"
+LangString name_s2_sub1 ${LANG_POLISH} "Jonathan Coulton"
+LangString name_s2_sub2 ${LANG_POLISH} "Shearer"
+LangString name_s2_sub3 ${LANG_POLISH} "Wise Guys"
+LangString name_s2_sub4 ${LANG_POLISH} "Pornophonique"
+
+LangString DESC_Section1 ${LANG_POLISH} "To s� podstawowe pliki potrzebe przez UltraStar Deluxe"
+LangString DESC_Section2 ${LANG_POLISH} "Mo�esz wybra� kt�re piosenki chcesz �ci�gn�� (Wymagane po��czenie z internetem!)"
+LangString DESC_Section2_sub1 ${LANG_POLISH} "Mo�esz wybra� kt�re piosenki Jonathan Coulton (CC by-nc 3.0) chcesz zainstalowa�."
+LangString DESC_Section2_sub2 ${LANG_POLISH} "Mo�esz wybra� kt�re piosenki Shearer (CC by-nc-sa 2.0 / 3.0) chcesz zainstalowa�."
+LangString DESC_Section2_sub3 ${LANG_POLISH} "Mo�esz wybra� kt�re piosenki Wise Guys chcesz zainstalowa�."
+LangString DESC_Section2_sub4 ${LANG_POLISH} "Mo�esz wybra� kt�re piosenki Pornophonique chcesz zainstalowa�."
+
+LangString DESC_g2Section2 ${LANG_POLISH} "�ci�gnij piosenk� 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."
+LangString DESC_g2Section3 ${LANG_POLISH} "�ci�gnij piosenk� 'Joshua Morin - On The Run' (CC by-sa 2.5)."
+LangString DESC_g2Section4 ${LANG_POLISH} "�ci�gnij piosenk� 'Pornophonique - Space Invaders' (CC by-nc-nd 2.0)."
+LangString DESC_g2Section5 ${LANG_POLISH} "�ci�gnij piosenk� 'Steven Dunston - Northern Star' (CC by-nc-sa 2.5)."
+LangString DESC_g2Section1 ${LANG_POLISH} "�ci�gnij piosenk� 'Bodo Wartke - Liebeslied (Love Song)'."
+LangString DESC_g2Section6 ${LANG_POLISH} "�ci�gnij piosenk� 'Pornophonique - Space Invaders (Karaoke)' (CC by-nc-nd 2.0)."
+
+LangString DESC_s2_sub1_Section1 ${LANG_POLISH} "�ci�gnij piosenk� 'Monkey Shines'."
+LangString DESC_s2_sub1_Section2 ${LANG_POLISH} "�ci�gnij piosenk� 'I Crush Everything'."
+LangString DESC_s2_sub1_Section3 ${LANG_POLISH} "�ci�gnij piosenk� 'Not About You'."
+LangString DESC_s2_sub1_Section4 ${LANG_POLISH} "�ci�gnij piosenk� 'Mr. Fancy Pants'."
+LangString DESC_s2_sub1_Section5 ${LANG_POLISH} "�ci�gnij piosenk� 'Big Bad World One'."
+LangString DESC_s2_sub1_Section6 ${LANG_POLISH} "�ci�gnij piosenk� 'Flickr [incl. video]'."
+LangString DESC_s2_sub1_Section7 ${LANG_POLISH} "�ci�gnij piosenk� 'My Beige Bear'."
+LangString DESC_s2_sub1_Section8 ${LANG_POLISH} "�ci�gnij piosenk� 'The Future Soon'."
+LangString DESC_s2_sub1_Section9 ${LANG_POLISH} "�ci�gnij piosenk� 'Ikea'."
+LangString DESC_s2_sub1_Section10 ${LANG_POLISH} "�ci�gnij piosenk� 'Furry Old Lobster'."
+LangString DESC_s2_sub1_Section11 ${LANG_POLISH} "�ci�gnij piosenk� 'Code Monkey [incl. video]'."
+LangString DESC_s2_sub1_Section12 ${LANG_POLISH} "�ci�gnij piosenk� 'I�m Your Moon'."
+LangString DESC_s2_sub1_Section13 ${LANG_POLISH} "�ci�gnij piosenk� 'First Of May'."
+LangString DESC_s2_sub1_Section14 ${LANG_POLISH} "�ci�gnij piosenk� 'Dance, Soterios Johnson, Dance'."
+LangString DESC_s2_sub1_Section15 ${LANG_POLISH} "�ci�gnij piosenk� 'A Talk With George'."
+LangString DESC_s2_sub1_Section16 ${LANG_POLISH} "�ci�gnij piosenk� 'Creepy Doll [incl. video]'."
+LangString DESC_s2_sub1_Section17 ${LANG_POLISH} "�ci�gnij piosenk� 'That Spells DNA'."
+LangString DESC_s2_sub1_Section18 ${LANG_POLISH} "�ci�gnij piosenk� 'When You Go'."
+LangString DESC_s2_sub1_Section19 ${LANG_POLISH} "�ci�gnij piosenk� 'Better'."
+LangString DESC_s2_sub1_Section20 ${LANG_POLISH} "�ci�gnij piosenk� 'Shop Vac'."
+LangString DESC_s2_sub1_Section21 ${LANG_POLISH} "�ci�gnij piosenk� 'I Feel Fantastic'."
+LangString DESC_s2_sub1_Section22 ${LANG_POLISH} "�ci�gnij piosenk� 'Re: Your Brains'."
+LangString DESC_s2_sub1_Section23 ${LANG_POLISH} "�ci�gnij piosenk� 'Skullcrusher Mountain'."
+LangString DESC_s2_sub1_Section24 ${LANG_POLISH} "�ci�gnij piosenk� 'Chiron Beta Prime [incl. video]'."
+
+LangString DESC_s2_sub2_Section1 ${LANG_POLISH} "�ci�gnij piosenk� '69'."
+LangString DESC_s2_sub2_Section2 ${LANG_POLISH} "�ci�gnij piosenk� '69 (Karaoke)'."
+LangString DESC_s2_sub2_Section3 ${LANG_POLISH} "�ci�gnij piosenk� 'Can't stop it'."
+LangString DESC_s2_sub2_Section4 ${LANG_POLISH} "�ci�gnij piosenk� 'Can't stop it (Karaoke)'."
+LangString DESC_s2_sub2_Section5 ${LANG_POLISH} "�ci�gnij piosenk� 'In My Hand'."
+LangString DESC_s2_sub2_Section6 ${LANG_POLISH} "�ci�gnij piosenk� 'Man Song'."
+LangString DESC_s2_sub2_Section7 ${LANG_POLISH} "�ci�gnij piosenk� 'Man Song (Karaoke)'."
+LangString DESC_s2_sub2_Section8 ${LANG_POLISH} "�ci�gnij piosenk� 'Stay with me'."
+LangString DESC_s2_sub2_Section9 ${LANG_POLISH} "�ci�gnij piosenk� 'Stay with me (Karaoke)'."
+
+LangString DESC_s2_sub3_Section1 ${LANG_POLISH} "�ci�gnij piosenk� 'Lebendig und kr�ftig und sch�rfer'."
+LangString DESC_s2_sub3_Section2 ${LANG_POLISH} "�ci�gnij piosenk� 'Mensch, wo bist du?'."
+LangString DESC_s2_sub3_Section3 ${LANG_POLISH} "�ci�gnij piosenk� 'Mensch, wo bist du? (Karaoke)'."
+
+; Optional Themes
+; (not available)
+\ No newline at end of file
diff --git a/installer/languages/translations.txt b/installer/languages/translations.txt
new file mode 100644
index 00000000..9d5946e8
--- /dev/null
+++ b/installer/languages/translations.txt
@@ -0,0 +1,16 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; How to translate the installer into your own language?
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+If you want to translate the installer, just:
+
+- Take English.nsh and edit each variabe within the "" 
+
+- Replace LANG_ENGLISH with the name of your language (in english).
+
+Please also edit the following file
+for translating the settings screen:
+
+..\settings\settings-1033.ini
+
+Thanks for your help in advance!
+\ No newline at end of file
diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh
new file mode 100644
index 00000000..10afc6f6
--- /dev/null
+++ b/installer/settings/files_main_install.nsh
@@ -0,0 +1,90 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; 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
+CreateDirectory $INSTDIR\covers
+CreateDirectory $INSTDIR\songs
+
+${If} $UseAppData == true
+
+  ; Create folders in appdata for current user
+  SetShellVarContext current		
+  CreateDirectory $UserDataPath
+  CreateDirectory $UserDataPath\screenshots
+  CreateDirectory $UserDataPath\playlists
+
+  SetOutPath "$INSTDIR"
+
+  CreateShortCut "screenshots.lnk" "$UserDataPath\screenshots"
+  CreateShortCut "playlists.lnk" "$UserDataPath\playlists"
+  CreateShortCut "config.ini.lnk" "$ConfigIniPath"
+
+  SetShellVarContext all
+${EndIf}
+
+; themes, languages, sounds, fonts, visuals dir
+
+SetOutPath "$INSTDIR"
+
+File /r /x .svn /x .gitignore ..\game\themes
+File /r /x .svn /x .gitignore ..\game\languages
+File /r /x .svn /x .gitignore ..\game\sounds
+File /r /x .svn /x .gitignore ..\game\fonts
+File /r /x .svn /x .gitignore ..\game\resources
+File /r /x .svn /x .gitignore ..\game\visuals
+
+; Root dir:
+
+File .\dependencies\dll\*.dll
+
+File ..\ChangeLog.txt
+File ..\ChangeLog.GERMAN.txt
+File ..\game\LuaCommands.odt
+File ..\README.txt
+File .\dependencies\documents\license.txt
+File .\dependencies\documents\documentation.pdf
+
+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
+
+; Plugins dir:
+
+SetOutPath "$INSTDIR\plugins\"
+File "..\game\plugins\*.*"
+
+SetOutPath "$INSTDIR"
+\ No newline at end of file
diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh
new file mode 100644
index 00000000..ed2259bf
--- /dev/null
+++ b/installer/settings/files_main_uninstall.nsh
@@ -0,0 +1,110 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Uninstaller: Main components
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Delete created Icons in startmenu
+
+ SetShellVarContext all
+ RMDir /r "$SMPROGRAMS\$ICONS_GROUP\"
+
+; Delete created Icon on Desktop
+
+ Delete "$Desktop\Play UltraStar Deluxe.lnk"
+ Delete "$Desktop\UltraStar Deluxe spielen.lnk"
+ Delete "$Desktop\UltraStar Deluxe karaoke.lnk"
+
+; Remove dirs
+
+ RMDir /r "$INSTDIR\plugins"
+ RMDir /r "$INSTDIR\themes"
+ RMDir /r "$INSTDIR\fonts"
+ RMDir /r "$INSTDIR\languages"
+ RMDir /r "$INSTDIR\visuals"
+ RMDir /r "$INSTDIR\resources"
+ RMDir /r "$INSTDIR\sounds"
+
+; Delete remaining files
+ Delete "$INSTDIR\ScoreConverter.exe"
+ Delete "$INSTDIR\${exe}.exe"
+ Delete "$INSTDIR\ChangeLog.GERMAN.txt"
+ Delete "$INSTDIR\ChangeLog.txt"
+ Delete "$INSTDIR\LuaCommands.odt"
+ Delete "$INSTDIR\documentation.pdf"
+ Delete "$INSTDIR\license.txt"
+ Delete "$INSTDIR\README.txt"
+ Delete "$INSTDIR\screenshots.lnk"
+ Delete "$INSTDIR\playlists.lnk"
+ Delete "$INSTDIR\config.ini.lnk"
+
+ Delete "$INSTDIR\Error.log"
+ Delete "$INSTDIR\Benchmark.log"
+ Delete "$INSTDIR\cover.db"
+
+ Delete "$INSTDIR\avcodec-52.dll"
+ Delete "$INSTDIR\avformat-52.dll"
+ Delete "$INSTDIR\avfilter-1.dll"
+ Delete "$INSTDIR\avdevice-52.dll"
+ Delete "$INSTDIR\avutil-50.dll"
+ Delete "$INSTDIR\bass.dll"
+ Delete "$INSTDIR\freetype6.dll"
+ Delete "$INSTDIR\glew32.dll"
+ Delete "$INSTDIR\jpeg.dll"
+ Delete "$INSTDIR\libpng12-0.dll"
+ Delete "$INSTDIR\libprojectM.dll"
+ Delete "$INSTDIR\libtiff-3.dll"
+ Delete "$INSTDIR\lua5.1.dll"
+ Delete "$INSTDIR\lua51.dll"
+ Delete "$INSTDIR\pcre3.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\swscale-0.dll"
+ Delete "$INSTDIR\zlib1.dll"
+
+ StrCpy $0 "$INSTDIR\songs"
+ Call un.DeleteIfEmpty 
+
+ StrCpy $0 "$INSTDIR\covers"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$INSTDIR\screenshots"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$INSTDIR\playlists"
+ Call un.DeleteIfEmpty
+
+ ; Clean up AppData
+
+ SetShellVarContext current
+
+ Delete "$APPDATA\ultrastardx\Error.log"
+ Delete "$APPDATA\ultrastardx\Benchmark.log"
+ Delete "$APPDATA\ultrastardx\cover.db"
+
+ StrCpy $0 "$APPDATA\ultrastardx\covers"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$APPDATA\ultrastardx\songs"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$APPDATA\ultrastardx\screenshots"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$APPDATA\ultrastardx\playlists"
+ Call un.DeleteIfEmpty
+
+ StrCpy $0 "$APPDATA\ultrastardx"
+ Call un.DeleteIfEmpty
+
+ SetShellVarContext all
+
+; Self delete:
+
+ Delete "$INSTDIR\Uninstall.exe"
+
+ StrCpy $0 "$INSTDIR"
+ Call un.DeleteIfEmpty
+\ No newline at end of file
diff --git a/installer/settings/files_opt_songs.nsh b/installer/settings/files_opt_songs.nsh
new file mode 100644
index 00000000..d8d4ef28
--- /dev/null
+++ b/installer/settings/files_opt_songs.nsh
@@ -0,0 +1,931 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Installer: Download optional songs
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+SectionGroup $(name_section2) Section2
+
+;-----------------------------------------------------------------------
+; BODO WARTKE
+;-----------------------------------------------------------------------
+Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1
+
+   AddSize 10343
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+
+;-----------------------------------------------------------------------
+; Dead Smiling Pirates - I 18
+;-----------------------------------------------------------------------
+
+Section /o "Dead Smiling Pirates - I 18" g2Section2
+   AddSize 2816
+   SetOverwrite try
+   SetOutPath "$INSTDIR"
+   CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18"
+   SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-I-18.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+
+;-----------------------------------------------------------------------
+; Jonathan Coulton Songs
+;-----------------------------------------------------------------------
+
+SectionGroup $(name_s2_sub1) s2_sub1
+
+Section /o "A Talk With George" s2_sub1_Section15
+
+   AddSize 4076
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip"
+
+  SetOutPath "$INSTDIR"
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Better" s2_sub1_Section19
+
+   AddSize 4199
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Monkey Shines" s2_sub1_Section1
+
+   AddSize 1455
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "I Crush Everything" s2_sub1_Section2
+
+   AddSize 7127
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Not About You" s2_sub1_Section3
+
+   AddSize 3492
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Mr. Fancy Pants" s2_sub1_Section4
+
+   AddSize 2427
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Big Bad World One" s2_sub1_Section5
+
+   AddSize 4424
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Flickr" s2_sub1_Section6
+
+   AddSize 21607
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "My Beige Bear" s2_sub1_Section7
+
+   AddSize 4926
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "The Future Soon" s2_sub1_Section8
+
+   AddSize 5612
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Ikea" s2_sub1_Section9
+
+   AddSize 4608
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Furry Old Lobster" s2_sub1_Section10
+
+   AddSize 3288
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Code Monkey" s2_sub1_Section11
+
+   AddSize 21402
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "I�m Your Moon" s2_sub1_Section12
+
+   AddSize 4916
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "First Of May" s2_sub1_Section13
+
+   AddSize 6257
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14
+
+   AddSize 5929
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Creepy Doll" s2_sub1_Section16
+
+   AddSize 66560
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "That Spells DNA" s2_sub1_Section17
+
+   AddSize 4158
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "When You Go" s2_sub1_Section18
+
+   AddSize 5755
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shop Vac" s2_sub1_Section20
+
+   AddSize 5448
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "I Feel Fantastic" s2_sub1_Section21
+
+   AddSize 3851
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Re: Your Brains" s2_sub1_Section22
+
+   AddSize 7087
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Skullcrusher Mountain" s2_sub1_Section23
+
+   AddSize 6298
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Chiron Beta Prime" s2_sub1_Section24
+
+   AddSize 38298
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+
+SectionGroupEnd
+;-----------------------------------------------------------------------
+; Joshua Morin - On The Run
+;-----------------------------------------------------------------------
+Section /o "Joshua Morin - On The Run" g2Section3
+   AddSize 3881
+   SetOverwrite try
+   SetOutPath "$INSTDIR"
+   CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run"
+   SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip
+
+  Pop $R0 ;Get the return value
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+; Pornophonique
+;-----------------------------------------------------------------------
+SectionGroup $(name_s2_sub4) s2_sub4
+
+Section /o "Pornophonique - Space Invaders" g2Section4
+   AddSize 3646
+   SetOverwrite try
+   SetOutPath "$INSTDIR"
+   CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders"
+   SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip
+
+  Pop $R0 ;Get the return value
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Pornophonique - Space Invaders (Karaoke)" g2Section6
+   AddSize 3779
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song6} $LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip
+
+  Pop $R0 ;Get the return value
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-SpaceInvadersKAR.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+
+SectionGroupEnd
+;-----------------------------------------------------------------------
+; Shearer
+;-----------------------------------------------------------------------
+SectionGroup $(name_s2_sub2) s2_sub2
+
+Section /o "Shearer - 69" s2_sub2_Section1
+
+   AddSize 4557
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2
+
+   AddSize 4772
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Can't stop it" s2_sub2_Section3
+
+   AddSize 5510
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4
+
+   AddSize 4178
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - In My Hand" s2_sub2_Section5
+
+   AddSize 5960
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Man Song" s2_sub2_Section6
+
+   AddSize 7270
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7
+
+   AddSize 5807
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Stay With Me" s2_sub2_Section8
+
+   AddSize 6400
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9
+
+   AddSize 5417
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+SectionGroupEnd
+
+Section /o "Steven Dunston - Northern Star" g2Section5
+   AddSize 2427
+   SetOverwrite try
+   SetOutPath "$INSTDIR"
+   CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star"
+   SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip
+
+  Pop $R0 ;Get the return value
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+; Wise Guys
+;-----------------------------------------------------------------------
+SectionGroup $(name_s2_sub3) s2_sub3
+
+Section /o "Wise Guys - Lebendig und kr�ftig und sch�rfer" s2_sub3_Section1
+
+   AddSize 4015
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2
+
+   AddSize 5335
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+;-----------------------------------------------------------------------
+Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3
+
+   AddSize 5335
+   SetOverwrite try
+   SetOutPath "$INSTDIR\songs\"
+
+; Download song:
+  NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip
+ 
+  Pop $R0
+    StrCmp $R0 "success" dlok
+      MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
+  dlok:
+
+  ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\"
+
+  Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip"
+
+  SetOutPath "$INSTDIR"
+
+SectionEnd
+
+SectionGroupEnd
+
+SectionGroupEnd
+\ No newline at end of file
diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh
new file mode 100644
index 00000000..d437c9e1
--- /dev/null
+++ b/installer/settings/functions.nsh
@@ -0,0 +1,50 @@
+; Creates Desktop Shortcut(s) if 
+; checked on Finish Page
+
+Function CreateDesktopShortCuts
+SetOutPath "$INSTDIR"
+CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe"
+FunctionEnd
+
+; Deletes only empty dirs which are
+; at the top of the stack.
+
+Function un.DeleteIfEmpty
+  FindFirst $R0 $R1 "$0\*.*"
+  strcmp $R1 "." 0 NoDelete
+   FindNext $R0 $R1
+   strcmp $R1 ".." 0 NoDelete
+    ClearErrors
+    FindNext $R0 $R1
+    IfErrors 0 NoDelete
+     FindClose $R0
+     Sleep 1000
+     RMDir "$0"
+  NoDelete:
+   FindClose $R0
+FunctionEnd
+
+; Finds UltraStar Deluxe process
+;
+
+!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
+
+!macro nsProcess::FindProcess _FILE _ERR
+	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
+
+!macro nsProcess::KillProcess _FILE _ERR
+	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
+	Pop ${_ERR}
+!macroend
+
+
+!define nsProcess::Unload `!insertmacro nsProcess::Unload`
+
+!macro nsProcess::Unload
+	nsProcess::_Unload
+!macroend
+\ No newline at end of file
diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini
new file mode 100644
index 00000000..9a6b4b71
--- /dev/null
+++ b/installer/settings/settings-1031.ini
@@ -0,0 +1,161 @@
+[Settings]
+NumFields=19
+
+; Background Group of Settings Box
+[Field 17]
+Type=GroupBox
+Left=0
+Top=0
+Right=300
+Bottom=140
+Text=UltraStar Deluxe Konfiguration (Optional) 
+
+[Field 1]
+Type=Label
+Text="Vollbild Modus:"
+Left=5
+Right=58
+Top=30
+Bottom=38
+
+[Field 2]
+Type=Label
+Text="Sprache:"
+Left=5
+Right=58
+Top=47
+Bottom=55
+
+[Field 3]
+Type=Label
+Text="Aufl�sung:"
+Left=5
+Right=58
+Top=64
+Bottom=72
+
+[Field 4]
+Type=Label
+Text="Ordnerstruktur:"
+Left=5
+Right=58
+Top=82
+Bottom=90
+
+[Field 5]
+Type=DropList
+ListItems=On|Off
+State=On
+Left=62
+Right=152
+Top=28
+Bottom=39
+
+[Field 6]
+Type=DropList
+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish
+State=German
+Left=62
+Right=152
+Top=45
+Bottom=56
+
+[Field 7]
+Type=DropList
+ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
+Left=62
+Right=152
+Top=62
+Bottom=73
+
+[Field 8]
+Type=DropList
+ListItems=On|Off
+State=Off
+Left=62
+Right=152
+Top=81
+Bottom=91
+
+[Field 9]
+Type=Label
+Text=Spiel im Fenster oder Vollbild starten?
+Left=157
+Right=300
+Top=30
+Bottom=38
+
+[Field 10]
+Type=Label
+Text=Alle Einstellungen k�nnen nachtr�glich im Spielmen� ge�ndert werden.
+Left=5
+Right=246
+Top=14
+Bottom=23
+
+[Field 11]
+Type=Label
+Text=Passe die Sprache des Men�s an.
+Left=158
+Right=300
+Top=46
+Bottom=55
+
+[Field 12]
+Type=Label
+Text=W�hle die Aufl�sung/Fenstergr��e aus.
+Left=157
+Right=300
+Top=64
+Bottom=72
+
+[Field 13]
+Type=Label
+Text=Eine virtuelle Ordnerstruktur zum Anzeigen der Lieder verwenden?
+Left=158
+Right=300
+Top=78
+Bottom=94
+
+[Field 14]
+Type=Label
+Left=5
+Top=100
+Right=58
+Bottom=109
+Text=Sortierung:
+
+[Field 15]
+Type=DropList
+Left=62
+Top=100
+Right=152
+Bottom=111
+State=Artist
+ListItems=Edition|Genre|Language|Folder|Title|Artist
+
+[Field 16]
+Type=Label
+Left=157
+Top=101
+Right=300
+Bottom=110
+Text=Kriterium zum Sortieren der Lieder w�hlen.
+
+[Field 18]
+Type=DirRequest
+Left=5
+Top=121
+Right=152
+Bottom=132
+Text=SongDir
+State=
+
+[Field 19]
+Type=Label
+Left=158
+Top=119
+Right=295
+Bottom=134
+Text=Hier kann ein weiterer Ordner mit Songs f�r UltraStar Deluxe angegeben werden.
diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini
new file mode 100644
index 00000000..7176d229
--- /dev/null
+++ b/installer/settings/settings-1033.ini
@@ -0,0 +1,161 @@
+[Settings]
+NumFields=19
+
+; Background Group of Settings Box
+[Field 17]
+Type=GroupBox
+Left=1
+Top=1
+Right=300
+Bottom=140
+Text=UltraStar Deluxe Configuration (optional) 
+
+[Field 1]
+Type=Label
+Text="Fullscreen Mode:"
+Left=5
+Right=58
+Top=30
+Bottom=38
+
+[Field 2]
+Type=Label
+Text="Language:"
+Left=5
+Right=58
+Top=47
+Bottom=55
+
+[Field 3]
+Type=Label
+Text="Resolution:"
+Left=5
+Right=58
+Top=64
+Bottom=72
+
+[Field 4]
+Type=Label
+Text="Tabs:"
+Left=5
+Right=58
+Top=82
+Bottom=90
+
+[Field 5]
+Type=DropList
+ListItems=On|Off
+State=On
+Left=62
+Right=152
+Top=28
+Bottom=39
+
+[Field 6]
+Type=DropList
+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish
+State=English
+Left=62
+Right=152
+Top=45
+Bottom=56
+
+[Field 7]
+Type=DropList
+ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
+Left=62
+Right=152
+Top=62
+Bottom=73
+
+[Field 8]
+Type=DropList
+ListItems=On|Off
+State=Off
+Left=62
+Right=152
+Top=81
+Bottom=91
+
+[Field 9]
+Type=Label
+Text=Start game in window or fullscreen?
+Left=157
+Right=300
+Top=30
+Bottom=38
+
+[Field 10]
+Type=Label
+Text=All settings can also be changed in the GUI later.
+Left=5
+Right=246
+Top=14
+Bottom=23
+
+[Field 11]
+Type=Label
+Text=Adjust the GUI language.
+Left=158
+Right=300
+Top=46
+Bottom=55
+
+[Field 12]
+Type=Label
+Text=Choose screen resolution/window size.
+Left=157
+Right=300
+Top=64
+Bottom=72
+
+[Field 13]
+Type=Label
+Text=Employ a virtual folder structure to show songs?
+Left=158
+Right=300
+Top=78
+Bottom=94
+
+[Field 14]
+Type=Label
+Left=5
+Top=100
+Right=58
+Bottom=109
+Text=Sorting:
+
+[Field 15]
+Type=DropList
+Left=62
+Top=100
+Right=152
+Bottom=111
+State=Artist
+ListItems=Edition|Genre|Language|Folder|Title|Artist
+
+[Field 16]
+Type=Label
+Left=157
+Top=101
+Right=300
+Bottom=110
+Text=Select criterion to sort songs.
+
+[Field 18]
+Type=DirRequest
+Left=5
+Top=121
+Right=152
+Bottom=132
+Text=SongDir
+State=
+
+[Field 19]
+Type=Label
+Left=158
+Top=119
+Right=295
+Bottom=134
+Text=Choose additional song directory for UltraStar Deluxe.
+\ No newline at end of file
diff --git a/installer/settings/settings-1038.ini b/installer/settings/settings-1038.ini
new file mode 100644
index 00000000..f2ef973a
--- /dev/null
+++ b/installer/settings/settings-1038.ini
@@ -0,0 +1,161 @@
+[Settings]
+NumFields=19
+
+; Background Group of Settings Box
+[Field 17]
+Type=GroupBox
+Left=1
+Top=1
+Right=300
+Bottom=140
+Text=UltraStar Deluxe Configuration (optional) 
+
+[Field 1]
+Type=Label
+Text="Teljes k�perny�s m�d:"
+Left=5
+Right=58
+Top=30
+Bottom=38
+
+[Field 2]
+Type=Label
+Text="Nyelv:"
+Left=5
+Right=58
+Top=47
+Bottom=55
+
+[Field 3]
+Type=Label
+Text="Felbont�s:"
+Left=5
+Right=58
+Top=64
+Bottom=72
+
+[Field 4]
+Type=Label
+Text="Tabs:"
+Left=5
+Right=58
+Top=82
+Bottom=90
+
+[Field 5]
+Type=DropList
+ListItems=On|Off
+State=On
+Left=62
+Right=152
+Top=28
+Bottom=39
+
+[Field 6]
+Type=DropList
+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish
+State=Hungarian
+Left=62
+Right=152
+Top=45
+Bottom=56
+
+[Field 7]
+Type=DropList
+ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
+Left=62
+Right=152
+Top=62
+Bottom=73
+
+[Field 8]
+Type=DropList
+ListItems=On|Off
+State=Off
+Left=62
+Right=152
+Top=81
+Bottom=91
+
+[Field 9]
+Type=Label
+Text=Start game in window or fullscreen?
+Left=157
+Right=300
+Top=30
+Bottom=38
+
+[Field 10]
+Type=Label
+Text=All settings can also be changed in the GUI later.
+Left=5
+Right=246
+Top=14
+Bottom=23
+
+[Field 11]
+Type=Label
+Text=Adjust the GUI language.
+Left=158
+Right=300
+Top=46
+Bottom=55
+
+[Field 12]
+Type=Label
+Text=Choose screen resolution/window size.
+Left=157
+Right=300
+Top=64
+Bottom=72
+
+[Field 13]
+Type=Label
+Text=Employ a virtual folder structure to show songs?
+Left=158
+Right=300
+Top=78
+Bottom=94
+
+[Field 14]
+Type=Label
+Left=5
+Top=100
+Right=58
+Bottom=109
+Text=Sorting:
+
+[Field 15]
+Type=DropList
+Left=62
+Top=100
+Right=152
+Bottom=111
+State=Artist
+ListItems=Edition|Genre|Language|Folder|Title|Artist
+
+[Field 16]
+Type=Label
+Left=157
+Top=101
+Right=300
+Bottom=110
+Text=Select criterion to sort songs.
+
+[Field 18]
+Type=DirRequest
+Left=5
+Top=121
+Right=152
+Bottom=132
+Text=SongDir
+State=
+
+[Field 19]
+Type=Label
+Left=158
+Top=119
+Right=295
+Bottom=134
+Text=Choose additional song directory for UltraStar Deluxe.
diff --git a/installer/settings/settings-1045.ini b/installer/settings/settings-1045.ini
new file mode 100644
index 00000000..e59f0227
--- /dev/null
+++ b/installer/settings/settings-1045.ini
@@ -0,0 +1,161 @@
+[Settings]
+NumFields=19
+
+; Background Group of Settings Box
+[Field 17]
+Type=GroupBox
+Left=1
+Top=1
+Right=300
+Bottom=140
+Text=Konfiguracja UltraStar Deluxe (opcjonalnie) 
+
+[Field 1]
+Type=Label
+Text="Tryb Pe�noekranowy:"
+Left=5
+Right=58
+Top=30
+Bottom=38
+
+[Field 2]
+Type=Label
+Text="J�zyk:"
+Left=5
+Right=58
+Top=47
+Bottom=55
+
+[Field 3]
+Type=Label
+Text="Rozdzielczo��:"
+Left=5
+Right=58
+Top=64
+Bottom=72
+
+[Field 4]
+Type=Label
+Text="Zak�adki:"
+Left=5
+Right=58
+Top=82
+Bottom=90
+
+[Field 5]
+Type=DropList
+ListItems=On|Off
+State=On
+Left=62
+Right=152
+Top=28
+Bottom=39
+
+[Field 6]
+Type=DropList
+ListItems=Catalan|Croatian|Czech|Danish|Dutch|English|Euskara|Finnish|French|German|Greek|Hungarian|Icelandic|Italian|Japanese|Luxembourgish|Norwegian|Polish|Portuguese|Serbian|Slovak|Slovenian|Spanish|Swedish
+State=Polish
+Left=62
+Right=152
+Top=45
+Bottom=56
+
+[Field 7]
+Type=DropList
+ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200
+State=800x600
+Left=62
+Right=152
+Top=62
+Bottom=73
+
+[Field 8]
+Type=DropList
+ListItems=On|Off
+State=Off
+Left=62
+Right=152
+Top=81
+Bottom=91
+
+[Field 9]
+Type=Label
+Text=Czy uruchamia� gr� w oknie czy na pe�nym ekranie?
+Left=157
+Right=300
+Top=30
+Bottom=38
+
+[Field 10]
+Type=Label
+Text=Wszystkie ustawienia mo�na p�niej zmieni� w grze.
+Left=5
+Right=246
+Top=14
+Bottom=23
+
+[Field 11]
+Type=Label
+Text=Dostosuj j�zyk GUI.
+Left=158
+Right=300
+Top=46
+Bottom=55
+
+[Field 12]
+Type=Label
+Text=Wybierz rozdzieczo�� ekrany/okna.
+Left=157
+Right=300
+Top=64
+Bottom=72
+
+[Field 13]
+Type=Label
+Text=Czy chcesz aby piosenki zosta�y pogrupowane na zak�adki ?
+Left=158
+Right=300
+Top=78
+Bottom=94
+
+[Field 14]
+Type=Label
+Left=5
+Top=100
+Right=58
+Bottom=109
+Text=Sortowanie:
+
+[Field 15]
+Type=DropList
+Left=62
+Top=100
+Right=152
+Bottom=111
+State=Artist
+ListItems=Edition|Genre|Language|Folder|Title|Artist
+
+[Field 16]
+Type=Label
+Left=157
+Top=101
+Right=300
+Bottom=110
+Text=Wybierz kryteria sortowania piosenek.
+
+[Field 18]
+Type=DirRequest
+Left=5
+Top=121
+Right=152
+Bottom=132
+Text=SongDir
+State=
+
+[Field 19]
+Type=Label
+Left=158
+Top=119
+Right=295
+Bottom=134
+Text=Wybierz katalog w kt�rym znajduj� si� piosenki?
+\ No newline at end of file
diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh
new file mode 100644
index 00000000..331df7e3
--- /dev/null
+++ b/installer/settings/variables.nsh
@@ -0,0 +1,89 @@
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+; UltraStar Deluxe Un/Installer: Variables
+; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+
+; Product Information:
+
+!define version "1.1" ; Make sure version is also set in onInit
+
+
+!define name "UltraStar Deluxe"
+!define publisher "USDX Team"
+!define homepage "http://www.ultrastardeluxe.org"
+!define forum "http://forum.ultrastardeluxe.org"
+!define wiki "http://wiki.ultrastardeluxe.org"
+
+!define exe "ultrastardx"
+
+!define license ".\dependencies\documents\license.txt"
+
+; Icons
+
+!define img_install "install.ico"
+!define img_uninstall "uninstall.ico"
+
+; Header Images
+
+!define img_header "header.bmp" ; Header image (150x57)
+!define img_side "side.bmp" ; Side image (162x314)
+
+; Registry for Start menu entries:
+
+!define PRODUCT_NAME "${name}"
+!define PRODUCT_VERSION "${version}"
+!define PRODUCT_PUBLISHER "${publisher}"
+!define PRODUCT_WEB_SITE "${homepage}"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+; Download URLs for Songs and Themes:
+
+; SONGS
+!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip"
+!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip"
+!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip"
+!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip"
+!define download_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip"
+!define download_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_invaders_kar.zip"
+
+!define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip"
+!define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip"
+!define download_sub1_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_not_about_you.zip"
+!define download_sub1_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_mr_fancy_pants.zip"
+!define download_sub1_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_big_bad_world_one.zip"
+!define download_sub1_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_flickr.zip"
+!define download_sub1_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_my_beige_bear.zip"
+!define download_sub1_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_the_future_soon.zip"
+!define download_sub1_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_ikea.zip"
+!define download_sub1_song10 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_furry_old_lobster.zip"
+!define download_sub1_song11 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_code_monkey.zip"
+!define download_sub1_song12 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_im_your_moon.zip"
+!define download_sub1_song13 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_first_of_may.zip"
+!define download_sub1_song14 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_dance_soterios_johnson_dance.zip"
+!define download_sub1_song15 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_a_talk_with_george.zip"
+!define download_sub1_song16 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_creepy_doll.zip"
+!define download_sub1_song17 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_that_spells_dna.zip"
+!define download_sub1_song18 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_when_you_go.zip"
+!define download_sub1_song19 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_better.zip"
+!define download_sub1_song20 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_shop_vac.zip"
+!define download_sub1_song21 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_feel_fantastic.zip"
+!define download_sub1_song22 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_re-_your_brains.zip"
+!define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip"
+!define download_sub1_song24 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_chiron_beta_prime.zip"
+
+!define download_sub2_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69.zip"
+!define download_sub2_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69_kar.zip"
+!define download_sub2_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it.zip"
+!define download_sub2_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it_kar.zip"
+!define download_sub2_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_in_my_hand.zip"
+!define download_sub2_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song.zip"
+!define download_sub2_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song_kar.zip"
+!define download_sub2_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me.zip"
+!define download_sub2_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me_kar.zip"
+
+!define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip"
+!define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip"
+!define download_sub3_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du_kar.zip"
+
+; THEMES
+; (removed theme section - currently no additional skins available for this usdx version)
diff --git a/installer/uninstall.ico b/installer/uninstall.ico
new file mode 100644
index 00000000..1c72432a
--- /dev/null
+++ b/installer/uninstall.ico