11 files changed, 762 insertions, 1060 deletions
diff --git a/Installer/Skin Files.xls b/Installer/Skin Files.xls
new file mode 100644
index 00000000..12ec7681
--- /dev/null
+++ b/Installer/Skin Files.xls
diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStar Deluxe CMD Edition.nsi
index cb1b7745..c1151ad3 100644
--- a/Installer/UltraStarDeluxe.nsi
+++ b/Installer/UltraStar Deluxe CMD Edition.nsi
@@ -1,5 +1,5 @@
 ; --------------------------------------------------------------
-; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS)
+; UltraStar Deluxe Challege, Medley & Duet Edition - Installation Wizard with NSIS
 ; --------------------------------------------------------------
 
 !include "MUI.nsh"        ; Include the macros for the Modern User Interface
@@ -35,7 +35,7 @@ SetDatablockOptimize On
 !define MUI_WELCOMEPAGE_TEXT "$(wp_text)"
 ;!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(fp_showreadme)"
 !define MUI_FINISHPAGE_LINK "$(fp_link)"
-!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe - $(sm_uninstall)"
+!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe CMD Edition - $(sm_uninstall)"
 
 !define MUI_LICENSEPAGE_RADIOBUTTONS
 !define MUI_WELCOMEPAGE_TITLE_3LINES
@@ -62,10 +62,10 @@ SetDatablockOptimize On
 ; Begin of the installation wizard
 ; --------------------------------------------------
 
-Name "${p_name} V.${version}"
+Name "${p_name} ${version}"
 Brandingtext "${p_name} Installation"
-OutFile "ultrastardx-${version}-installer-lite.exe"
-!define ins_name "Install ${p_name} V.${version}.exe"
+OutFile "USdx CMD Edition-${version}-Installer.exe"
+!define ins_name "Install ${p_name} ${version}.exe"
 
 InstallDir "$PROGRAMFILES\${p_name}"
 
@@ -100,7 +100,7 @@ ShowUnInstDetails show
 ;!define MUI_INSTFILESPAGE_COLORS "${dets_bgcolor}"         ; Background Color of Details Screen while files are being extracted
 
 
-!define MUI_LANGDLL_WINDOWTITLE "USdx In-/Uninstaller: Choose language"
+!define MUI_LANGDLL_WINDOWTITLE "USdx CMD Edition In-/Uninstaller: Choose language"
 !define MUI_LANGDLL_ALWAYSSHOW
 
 !define MUI_FINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of installation (Comment out if unwanted)
@@ -122,7 +122,7 @@ ShowUnInstDetails show
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "${file_license}"
-!insertmacro MUI_PAGE_COMPONENTS
+;!insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 
 
@@ -130,7 +130,7 @@ ShowUnInstDetails show
 
 var ICONS_GROUP
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe CMD Edition"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
@@ -269,18 +269,14 @@ ${If} ${AtLeastWinVista}
 ${GameExplorer_GenerateGUID}
 Pop $0
 
-${GameExplorer_AddGame} all "${gdf_path}" $WINDIR $INSTDIR\${exe}.exe $0
+${GameExplorer_AddGame} all "${gdf_path}" $WINDIR "$INSTDIR\${exe}.exe" $0
 
 CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1
 CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \
   "$INSTDIR\${exe}.exe" "-Benchmark"
 
 CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \
-  "$INSTDIR\${exe}.exe" "-Joypad"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \
+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Fullscreen.lnk" \
   "$INSTDIR\${exe}.exe" "-FullScreen"
 
 CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
@@ -370,24 +366,24 @@ SectionEnd
 ; Section3: Optional Themes
 ; ---------------------------------------------------------
 
-LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"
-LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"
+;LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"
+;LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"
 
-LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"
-LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"
+;LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"
+;LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"
 
-LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"
-LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"
+;LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"
+;LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"
 
-LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"
-LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"
+;LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"
+;LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"
 
-LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"
-LangString sec_group ${LANG_GERMAN} "${ger_sec3}"
+;LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"
+;LangString sec_group ${LANG_GERMAN} "${ger_sec3}"
 
-SectionGroup $(sec_group) Section3
+;SectionGroup $(sec_group) Section3
 
- Section "Orange" g1Sec1
+; Section "Orange" g1Sec1
 
 ; Download theme orange:
 ; NSISdl::download /TIMEOUT=30000 ${dl_orange} $TEMP\Theme-Orange.zip
@@ -400,15 +396,15 @@ SectionGroup $(sec_group) Section3
 
 ; Delete "$TEMP\Theme-Orange.zip"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-!include ".\settings\optional\in_orange.nsh"
+;!include ".\settings\optional\in_orange.nsh"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-SectionEnd
+;SectionEnd
 
- Section "Streetlight" g1Sec2
+; Section "Streetlight" g1Sec2
 
 ; Download theme Streetlight:
 ; NSISdl::download /TIMEOUT=30000 ${dl_streetlight} $TEMP\Theme-Streetlight.zip
@@ -421,15 +417,15 @@ SectionEnd
 
 ; Delete "$TEMP\Theme-Streetlight.zip"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-!include ".\settings\optional\in_streetlight.nsh"
+;!include ".\settings\optional\in_streetlight.nsh"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-SectionEnd
+;SectionEnd
 
- Section "Vistar" g1Sec3
+; Section "Vistar" g1Sec3
 
 ; Download theme Vistar:
 
@@ -443,16 +439,16 @@ SectionEnd
 
 ; Delete "$TEMP\Theme-Vistar.zip"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-!include ".\settings\optional\in_vistar.nsh"
+;!include ".\settings\optional\in_vistar.nsh"
 
-  SetOutPath "$INSTDIR"
+;  SetOutPath "$INSTDIR"
 
-SectionEnd
+;SectionEnd
 
 
-SectionGroupEnd
+;SectionGroupEnd
 
 ; ---------------------------------------------------------
 ; Section4: Uninstallation Wizard
@@ -461,7 +457,7 @@ SectionGroupEnd
 Section Uninstall
  !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
 
- !include ".\settings\optional\opt_uninstall.nsh"
+; !include ".\settings\optional\opt_uninstall.nsh"
  !include ".\settings\files_un.nsh"
 
  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
@@ -482,9 +478,9 @@ SectionEnd
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
 
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)
+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)
+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)
+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)
 
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
@@ -539,12 +535,12 @@ FunctionEnd
 
 Function un.onInit
 
-        ${nsProcess::FindProcess} "USdx.exe" $R0
+        ${nsProcess::FindProcess} "UltraStar CMDe.exe" $R0
         StrCmp $R0 0 0 +2
         MessageBox MB_YESNO|MB_ICONEXCLAMATION 'UltraStar Deluxe cannot be uninstalled while its running! Do you want to close it?' IDYES closeit IDNO end
 
         closeit:
-        ${nsProcess::KillProcess} "USdx.exe" $R0
+        ${nsProcess::KillProcess} "UltraStar CMDe.exe" $R0
         goto continue
 
         end:
diff --git a/Installer/UltraStarDeluxeFull.nsi b/Installer/UltraStarDeluxeFull.nsi
deleted file mode 100644
index 95bb628a..00000000
--- a/Installer/UltraStarDeluxeFull.nsi
+++ /dev/null
@@ -1,599 +0,0 @@
-; --------------------------------------------------------------
-; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS)
-; --------------------------------------------------------------
-
-!include "MUI.nsh"        ; Include the macros for the Modern User Interface
-!include "LogicLib.nsh"
-!include ".\settings\GameExplorer.nsh"
-!include ".\settings\functions.nsh"
-!include "WinVer.nsh"
-
-!define icon_inst "ustar.ico"                ; Icon for Installation
-!define icon_uninst "uninstall.ico"        ; Icon for Uninstallation
-
-SetCompress Auto
-SetCompressor /SOLID lzma
-SetCompressorDictSize 32
-SetDatablockOptimize On
-
-; XPStyle on
-
-; ------------------------------------------------------
-; Declaration of Variables (See .\settings\variables.nsh)
-; ------------------------------------------------------
-
-!include ".\settings\variables.nsh"
-
-!addPluginDir "..\InstallerDependencies\plugins\"
-
-; -------------------------------
-; Strings for Installation Wizard
-; -------------------------------
-
-!define MUI_WELCOMEPAGE_TITLE "$(wp_title)"
-
-!define MUI_WELCOMEPAGE_TEXT "$(wp_text)"
-;!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(fp_showreadme)"
-!define MUI_FINISHPAGE_LINK "$(fp_link)"
-!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe - $(sm_uninstall)"
-
-!define MUI_LICENSEPAGE_RADIOBUTTONS
-!define MUI_WELCOMEPAGE_TITLE_3LINES
-
-!define MUI_FINISHPAGE_TITLE_3LINES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe"
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-
-;!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.txt"
-
-!define MUI_FINISHPAGE_LINK_LOCATION "${homepage}"
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-!define MUI_FINISHPAGE_TEXT_LARGE
-!define MUI_FINISHPAGE_TEXT "$(fp_text)"
-
-!define MUI_UNFINISHPAGE_LINK_LOCATION "${forum}"
-
-!define MUI_COMPONENTSPAGE_SMALLDESC
-
-; The other (multi) language Strings are at the bottom of this file
-
-; --------------------------------------------------
-; Begin of the installation wizard
-; --------------------------------------------------
-
-Name "${p_name} V.${version}"
-Brandingtext "${p_name} Installation"
-OutFile "ultrastardx-${version}-installer-full.exe"
-!define ins_name "Install ${p_name} V.${version}.exe"
-
-InstallDir "$PROGRAMFILES\${p_name}"
-
-ShowInstDetails show
-ShowUnInstDetails show
-
-!define PRODUCT_NAME "${p_name}"
-!define PRODUCT_VERSION "${version}"
-!define PRODUCT_PUBLISHER "${publisher}"
-!define PRODUCT_WEB_SITE "${homepage}"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
-
-; Modern User Interface (MUI) Stuff
-
-!define MUI_ICON "${icon_inst}"                ; Icon for Installation
-!define MUI_UNICON "${icon_uninst}"        ; Icon for Uninstallation
-
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "${bmp_header}"                  ; Header Bitmap of the installation (Size: 150x57 px)
-!define MUI_HEADERIMAGE_UNBITMAP "${bmp_header}"         ; Header Bitmap of the uninstallation (Size: 150x57 px)
-!define MUI_WELCOMEFINISHPAGE_BITMAP "${bmp_side}"         ; Left Side Bitmap of Welcome & Finish Page while Installation (Size: 164x314 px)
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${bmp_side}"         ; Left Side Bitmap of Welcome & Finish Page while Uninstallation (Size: 164x314 px)
-!define MUI_BGCOLOR "FFFFFF"                                 ; RGB Background color (for header, welcome & finish page)
-!define MUI_WELCOMEFINISHPAGE_INI "${mui_ini}"                 ; Installation Options for Welcome & Finish Page (Installation)
-!define MUI_UNWELCOMEFINISHPAGE_INI "${mui_ini}"         ; Installation Options for Welcome & Finish Page (Uninstallation)
-!define MUI_LICENSEPAGE_BGCOLOR "${license_bgcolor}"         ; Background Color of Licence agreement
-!define MUI_COMPONENTSPAGE_CHECKBITMAP "${bmp_check}"          ; Bitmap of Checks at Components Selection Page
-!define MUI_DIRECTORYPAGE_BGCOLOR "${directory_bgcolor}" ; RGB Background Color for Directory textbox
-!define MUI_STARTMENUPAGE_BGCOLOR "${smp_bgcolor}"         ; RGB Background of Startmenu List and Textbox
-;!define MUI_INSTFILESPAGE_COLORS "${dets_bgcolor}"         ; Background Color of Details Screen while files are being extracted
-
-
-!define MUI_LANGDLL_WINDOWTITLE "USdx In-/Uninstaller: Choose language"
-!define MUI_LANGDLL_ALWAYSSHOW
-
-!define MUI_FINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of installation (Comment out if unwanted)
-!define MUI_UNFINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of uninstallation (Comment out if unwanted)
-
-!define MUI_ABORTWARNING
-!define MUI_ABORTWARNING_TEXT $(str_abort)                 ; Abort Warning message
-!define MUI_ABORTWARNING_CANCEL_DEFAULT                         ; Default: Cancel abort (Comment out if unwanted)
-
-!define MUI_FINISHPAGE_SHOWREADME
-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(sc_desktop)
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortCuts
-
-; --------------------------------------------------
-; Begin of the installation routine
-; --------------------------------------------------
-
-; Pages for MUI Installation
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "${file_license}"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-
-
-; Start menu page
-
-var ICONS_GROUP
-!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe"
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
-!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
-
-!insertmacro MUI_PAGE_INSTFILES
-Page custom Settings
-
-; USDX Settings Page
-
-Function Settings
-
-!insertmacro MUI_HEADER_TEXT "$(Settings_TITLE)" "$(Settings_SUBTITLE)"
-
-   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE"
-
-; Get all the variables:
-
-var /GLOBAL fullscreen
-var /GLOBAL language2
-var /GLOBAL resolution
-var /GLOBAL tabs
-var /GLOBAL animations
-  !insertmacro MUI_INSTALLOPTIONS_READ $fullscreen "Settings-$LANGUAGE" "Field 6" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $language2 "Settings-$LANGUAGE" "Field 7" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $resolution "Settings-$LANGUAGE" "Field 8" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $tabs "Settings-$LANGUAGE" "Field 9" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $animations "Settings-$LANGUAGE" "Field 10" "State"
-
-; Write all variables to config.ini
-
-FileOpen $0 '$INSTDIR\config.ini' w
-FileWrite $0 '[Game]$\r$\n'
-FileClose $0
-
-${If} $language2 != ""
-
-${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${If} $tabs != ""
-
-${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini"
-
-${If} $fullscreen != ""
-
-${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${If} $resolution != ""
-
-${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
-
-; Animations On / Off Tasks
-
-${If} $animations == "Off"
-
-${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-
-FunctionEnd ;Custom page end
-
-!insertmacro MUI_PAGE_FINISH
-
-; Pages for MUI Uninstallation
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Language files
-
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "German"
-
-; Finish Page
-
-!insertmacro MUI_UNPAGE_FINISH
-
-; ---------------------------------------------------------
-; Section1: Main components of UltraStar Deluxe
-; ---------------------------------------------------------
-
-LangString DESC_Section1 ${LANG_ENGLISH} "${eng_sec1_desc}"        ; Adds the description to section1
-LangString DESC_Section1 ${LANG_GERMAN} "${ger_sec1_desc}"
-
-LangString sec1 ${LANG_ENGLISH} "${eng_sec1}"                        ; Name of section1
-LangString sec1 ${LANG_GERMAN} "${ger_sec1}"
-
-Section $(sec1) Section1
-  SectionIn RO                        ; readonly
-  SetOutPath $INSTDIR
-  SetOverwrite try
-
-!include ".\settings\files_in.nsh"
-
-; Create shortcuts
-
-  SetOutPath "$INSTDIR"
-
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
-  SetShellVarContext all
-  SetOutPath "$INSTDIR"
-
-  CreateDirectory "${p_name}"
-  CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe"
-;  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt"
-  CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe"
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-; WINDOWS VISTA GAME EXPLORER
-
-${If} ${AtLeastWinVista}
-
-${GameExplorer_GenerateGUID}
-Pop $0
-
-${GameExplorer_AddGame} all "${gdf_path}" $WINDIR $INSTDIR\${exe}.exe $0
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \
-  "$INSTDIR\${exe}.exe" "-Benchmark"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \
-  "$INSTDIR\${exe}.exe" "-Joypad"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \
-  "$INSTDIR\${exe}.exe" "-FullScreen"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \
-  "$INSTDIR\${exe}.exe" "-Screen 2"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \
-  "http://forum.ultrastardeluxe.org"
-
-${EndIf}
-
-; Create Uninstaller:
-
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${p_name}"
-  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}"
-
-SectionEnd
-
-; ---------------------------------------------------------
-; Section2: Example Song "Dead Smiling Pirates"
-; ---------------------------------------------------------
-
- LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}"
- LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}"
-
- LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}"
- LangString DESC_g2Section2 ${LANG_GERMAN} "${ger_g2Section2_desc}"
-
- LangString DESC_g2Section3 ${LANG_ENGLISH} "${eng_g2Section3_desc}"
- LangString DESC_g2Section3 ${LANG_GERMAN} "${ger_g2Section3_desc}"
-
- LangString sec2 ${LANG_ENGLISH} "${eng_sec2}"
- LangString sec2 ${LANG_GERMAN} "${ger_sec2}"
-
-SectionGroup $(sec2) Section2
-
-Section /o "Dead Smiling Pirates - I 18" g2Section1
-;  AddSize 1400
-   SetOverwrite try
-   SetOutPath "$INSTDIR"
-   CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]"
-   SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"
-
-; Download song:
-; NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.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:
-; nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\"
-
-; Delete "$TEMP\Song-I-18.zip"
-
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_song1.nsh"
-
-  SetOutPath "$INSTDIR"
-
- SectionEnd
-
-Section /o "Steven Dunston - Northern Star" g2Section2
-;  AddSize 1500
-   SetOverwrite try
-   SetOutPath "$INSTDIR"
-   CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]"
-   SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\"
-
-; Download song:
-; NSISdl::download /TIMEOUT=30000 ${demosong2} $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:
-; nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\"
-
-; Delete "$TEMP\Song-Northern-Star.zip"
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_song2.nsh"
-
-  SetOutPath "$INSTDIR"
-
- SectionEnd
-
-Section /o "Joshua Morin - On the run" g2Section3
-;  AddSize 2200
-   SetOverwrite try
-   SetOutPath "$INSTDIR"
-   CreateDirectory "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]"
-   SetOutPath "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\"
-
-; Download song:
-; NSISdl::download /TIMEOUT=30000 ${demosong3} $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:
-; nsisunz::Unzip "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\"
-
-; Delete "$TEMP\Song-On-the-run.zip"
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_song3.nsh"
-
-  SetOutPath "$INSTDIR"
-
- SectionEnd
-
- SectionGroupEnd
-
-; ---------------------------------------------------------
-; Section3: Optional Themes
-; ---------------------------------------------------------
-
-LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"
-LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"
-
-LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"
-LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"
-
-LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"
-LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"
-
-LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"
-LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"
-
-LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"
-LangString sec_group ${LANG_GERMAN} "${ger_sec3}"
-
-SectionGroup $(sec_group) Section3
-
- Section "Orange" g1Sec1
-;  AddSize 700
-
-; Download theme orange:
-; NSISdl::download /TIMEOUT=30000 ${dl_orange} $TEMP\Theme-Orange.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:
-; nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\"
-
-; Delete "$TEMP\Theme-Orange.zip"
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_orange.nsh"
-
-  SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section "Streetlight" g1Sec2
-;  AddSize 1000
-
-; Download theme Streetlight:
-; NSISdl::download /TIMEOUT=30000 ${dl_streetlight} $TEMP\Theme-Streetlight.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:
-; nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\"
-
-; Delete "$TEMP\Theme-Streetlight.zip"
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_streetlight.nsh"
-
-  SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section "Vistar" g1Sec3
-;   AddSize 1000
-
-; Download theme Vistar:
-
-; NSISdl::download /TIMEOUT=30000 ${dl_vistar} $TEMP\Theme-Vistar.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:
-; nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\"
-
-; Delete "$TEMP\Theme-Vistar.zip"
-
-  SetOutPath "$INSTDIR"
-
-!include ".\settings\optional\in_vistar.nsh"
-
-  SetOutPath "$INSTDIR"
-
-SectionEnd
-
-
-SectionGroupEnd
-
-; ---------------------------------------------------------
-; Section4: Uninstallation Wizard
-; ---------------------------------------------------------
-
-Section Uninstall
- !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
-
- !include ".\settings\optional\opt_uninstall.nsh"
- !include ".\settings\files_un.nsh"
-
- DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-
-; Unregister from Windows Vista Game Explorer
-
-${If} ${AtLeastWinVista}
-
-${GameExplorer_RemoveGame} $0
-
-${EndIf}
-
-SectionEnd
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-
-;  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
-;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section3} $(DESC_g2Section3)
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-; -----------------------------------------------------------------------
-; Language Strings for Installation / Uninstallation Wizard
-; can be found at .\settings\langstrings.nsh
-; -----------------------------------------------------------------------
-
-!include .\settings\langstrings.nsh
-
-; ------------------------------------------------------------------
-; Functions for the beginning of the installation and uninstallation
-; ------------------------------------------------------------------
-
-; Function for Installation
-
-Function .onInit
-
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'
-
-  Pop $R0
-
-  StrCmp $R0 0 +3
-    MessageBox MB_OK "The installer is already running."
-    Abort
-
-  !insertmacro MUI_LANGDLL_DISPLAY
-
-  ReadRegStr $R0 HKLM \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \
-  "UninstallString"
-  StrCmp $R0 "" done
-
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nAre you sure you want to \
-  install it again?" \
-  IDYES done
-  Abort
-
-
-done:
-
-     !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031"
-     !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1033.ini" "Settings-1033"
-
-FunctionEnd
-
-; Function for Uninstallation
-
-Function un.onInit
-
-        ${nsProcess::FindProcess} "USdx.exe" $R0
-        StrCmp $R0 0 0 +2
-        MessageBox MB_YESNO|MB_ICONEXCLAMATION 'UltraStar Deluxe cannot be uninstalled while its running! Do you want to close it?' IDYES closeit IDNO end
-
-        closeit:
-        ${nsProcess::KillProcess} "USdx.exe" $R0
-        goto continue
-
-        end:
-        ${nsProcess::Unload}
-        Abort
-
-        continue:
-           !insertmacro MUI_LANGDLL_DISPLAY
-
-FunctionEnd
-\ No newline at end of file
diff --git a/Installer/gdf/UltraStar Deluxe.gdf.xml b/Installer/gdf/UltraStar Deluxe.gdf.xml
index 89d7ea16..9b1ee4df 100644
--- a/Installer/gdf/UltraStar Deluxe.gdf.xml
+++ b/Installer/gdf/UltraStar Deluxe.gdf.xml
diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh
index 41464613..91d8f59f 100644
--- a/Installer/settings/files_in.nsh
+++ b/Installer/settings/files_in.nsh
@@ -6,8 +6,9 @@
   CreateDirectory "$INSTDIR\Languages"
   CreateDirectory "$INSTDIR\Plugins"
   CreateDirectory "$INSTDIR\Skins"
-  CreateDirectory "$INSTDIR\Skins\Classic"
+  CreateDirectory "$INSTDIR\Skins\Blue Sensation"
   CreateDirectory "$INSTDIR\Skins\Deluxe"
+  CreateDirectory "$INSTDIR\Skins\iStar"
   CreateDirectory "$INSTDIR\Songs"
   CreateDirectory "$INSTDIR\Sounds"
   CreateDirectory "$INSTDIR\Themes"
@@ -15,21 +16,19 @@
 ; Extract files to the directories:
 
   SetOutPath "$INSTDIR"
-  File "..\InstallerDependencies\dll\bass.dll"
-  File "..\InstallerDependencies\dll\SDL.dll"
-  File "..\InstallerDependencies\dll\sqlite3.dll"
-  File "..\InstallerDependencies\dll\avcodec-51.dll"
-  File "..\InstallerDependencies\dll\avformat-50.dll"
-  File "..\InstallerDependencies\dll\avutil-49.dll"
+  File "..\Game\Output\acinerella.dll"
+  File "..\Game\Output\bass.dll"
+  File "..\Game\Output\SDL.dll"
+  File "..\Game\Output\sqlite3.dll"
 
-  File "..\InstallerDependencies\documents\Changelog.german.txt"
-  File "..\InstallerDependencies\documents\Changelog.txt"
-  File "..\InstallerDependencies\documents\documentation.pdf"
-  File "..\InstallerDependencies\documents\License.txt"
-  File "..\InstallerDependencies\documents\ReadMe.txt"
+  File "..\Game\Output\Changelog.german.txt"
+  File "..\Game\Output\Changelog.txt"
+  File "..\Game\Output\documentation.pdf"
+  File "..\Game\Output\License.txt"
+  File "..\Game\Output\ReadMe.txt"
+  File "..\Game\Output\ReadMe old.txt"
 
-  File "..\ScoreConverter.exe"
-  File "..\${exe}.exe"
+  File "..\Game\Output\${exe}.exe"
 
 ${If} ${AtLeastWinVista}
 
@@ -39,231 +38,396 @@ ${If} ${AtLeastWinVista}
 ${EndIf}
 
   SetOutPath "$INSTDIR\Covers\"
-  File "..\Covers\Covers.ini"
-  File "..\Covers\NoCover.jpg"
+  File "..\Game\Output\Covers\Covers.ini"
+  File "..\Game\Output\Covers\NoCover.jpg"
 
   SetOutPath "$INSTDIR\Languages\"
 
-  File "..\Languages\readme.txt"
+  File "..\Game\Output\Languages\readme.txt"
+  File "..\Game\Output\Languages\Languages.xls"
 
-  File "..\Languages\Catalan.ini"
-  File "..\Languages\Dutch.ini"
-  File "..\Languages\English.ini"
-  File "..\Languages\Euskara.ini"
-  File "..\Languages\French.ini"
-  File "..\Languages\German.ini"
-  File "..\Languages\Italian.ini"
-  File "..\Languages\Norwegian.ini"
-  File "..\Languages\Polish.ini"
-  File "..\Languages\Portuguese.ini"
-  File "..\Languages\Serbian.ini"
-  File "..\Languages\Slovak.ini"
-  File "..\Languages\Spanish.ini"
-  File "..\Languages\Swedish.ini"
+  File "..\Game\Output\Languages\Dutch.ini"
+  File "..\Game\Output\Languages\English.ini"
+  File "..\Game\Output\Languages\German.ini"
+  File "..\Game\Output\Languages\Italian.ini"
 
   SetOutPath "$INSTDIR\Plugins\"
-  File "..\Plugins\Blind.dll"
-  File "..\Plugins\Duell.dll"
-  File "..\Plugins\Hold_The_Line.dll"
-  File "..\Plugins\TeamDuell.dll"
-  File "..\Plugins\Until5000.dll"
-
-  SetOutPath "$INSTDIR\Skins\Classic\"
-  File "..\Skins\Classic\[button]13.jpg"
-  File "..\Skins\Classic\[button]alt.jpg"
-  File "..\Skins\Classic\[button]az.jpg"
-  File "..\Skins\Classic\[button]e.jpg"
-  File "..\Skins\Classic\[button]enter.jpg"
-  File "..\Skins\Classic\[button]esc.jpg"
-  File "..\Skins\Classic\[button]j.jpg"
-  File "..\Skins\Classic\[button]m.jpg"
-  File "..\Skins\Classic\[button]navi.jpg"
-  File "..\Skins\Classic\[button]p.jpg"
-  File "..\Skins\Classic\[effect]goldenNoteStar.jpg"
-  File "..\Skins\Classic\[effect]perfectNoteStar.jpg"
-  File "..\Skins\Classic\[helper]rectangle.jpg"
-  File "..\Skins\Classic\[icon]error.jpg"
-  File "..\Skins\Classic\[icon]question.jpg"
-  File "..\Skins\Classic\[icon]Star.jpg"
-  File "..\Skins\Classic\[icon]stats.jpg"
-  File "..\Skins\Classic\[icon]video.jpg"
-  File "..\Skins\Classic\[main]Bar.jpg"
-  File "..\Skins\Classic\[main]Bar1.jpg"
-  File "..\Skins\Classic\[main]Button.jpg"
-  File "..\Skins\Classic\[main]Button2.jpg"
-  File "..\Skins\Classic\[main]Button3.jpg"
-  File "..\Skins\Classic\[main]ButtonEditor.jpg"
-  File "..\Skins\Classic\[main]Logo.jpg"
-  File "..\Skins\Classic\[main]songCover.jpg"
-  File "..\Skins\Classic\[main]square.jpg"
-  File "..\Skins\Classic\[mainbutton]Exit.jpg"
-  File "..\Skins\Classic\[mainbutton]Multi.jpg"
-  File "..\Skins\Classic\[mainbutton]Options.jpg"
-  File "..\Skins\Classic\[mainbutton]Solo.jpg"
-  File "..\Skins\Classic\[mainbutton]Stats.jpg"
-  File "..\Skins\Classic\[menu]jumpToBg.jpg"
-  File "..\Skins\Classic\[menu]PopUpBg.JPG"
-  File "..\Skins\Classic\[menu]PopUpFg.JPG"
-  File "..\Skins\Classic\[menu]songMenuBg.jpg"
-  File "..\Skins\Classic\[menu]songMenuBorder.jpg"
-  File "..\Skins\Classic\[menu]songMenuButtonBG.jpg"
-  File "..\Skins\Classic\[menu]songMenuSelectBG.jpg"
-  File "..\Skins\Classic\[party]Joker.jpg"
-  File "..\Skins\Classic\[party]playerButton.jpg"
-  File "..\Skins\Classic\[party]playerTeamButton.jpg"
-  File "..\Skins\Classic\[party]pointer.bmp"
-  File "..\Skins\Classic\[party]roundBG1.jpg"
-  File "..\Skins\Classic\[party]roundBG2.jpg"
-  File "..\Skins\Classic\[party]roundBG3.jpg"
-  File "..\Skins\Classic\[party]roundBG4.jpg"
-  File "..\Skins\Classic\[party]roundTeamButton.jpg"
-  File "..\Skins\Classic\[party]scoreBG1.jpg"
-  File "..\Skins\Classic\[party]scoreBG2.jpg"
-  File "..\Skins\Classic\[party]scoreDecoration.jpg"
-  File "..\Skins\Classic\[party]teamPoints.jpg"
-  File "..\Skins\Classic\[party]winDecoration.jpg"
-  File "..\Skins\Classic\[party]winTeamButton1.jpg"
-  File "..\Skins\Classic\[party]winTeamButton2.jpg"
-  File "..\Skins\Classic\[party]winTeamButton3.jpg"
-  File "..\Skins\Classic\[score]box.jpg"
-  File "..\Skins\Classic\[score]level.jpg"
-  File "..\Skins\Classic\[score]levelround.jpg"
-  File "..\Skins\Classic\[score]line.jpg"
-  File "..\Skins\Classic\[sing]lineBonusPopUp.jpg"
-  File "..\Skins\Classic\[sing]LyricsBall.bmp"
-  File "..\Skins\Classic\[sing]lyricsHelpBar.bmp"
-  File "..\Skins\Classic\[sing]notesBgLeft.bmp"
-  File "..\Skins\Classic\[sing]notesBgMid.bmp"
-  File "..\Skins\Classic\[sing]notesBgRight.bmp"
-  File "..\Skins\Classic\[sing]notesLeft.bmp"
-  File "..\Skins\Classic\[sing]notesMid.bmp"
-  File "..\Skins\Classic\[sing]notesRight.bmp"
-  File "..\Skins\Classic\[sing]p.jpg"
-  File "..\Skins\Classic\[sing]scoreBg.jpg"
-  File "..\Skins\Classic\[sing]singBarBack.jpg"
-  File "..\Skins\Classic\[sing]singBarBar.jpg"
-  File "..\Skins\Classic\[sing]singBarFront.jpg"
-  File "..\Skins\Classic\[sing]textBar.jpg"
-  File "..\Skins\Classic\[song]BGFade.jpg"
-  File "..\Skins\Classic\[song]EqualizerBG.jpg"
-  File "..\Skins\Classic\[song]selection.jpg"
-  File "..\Skins\Classic\[stat]detailBG1.jpg"
-  File "..\Skins\Classic\[stat]mainBG1.jpg"
-  File "..\Skins\Classic\[stat]mainBG2.jpg"
-  File "..\Skins\Classic\[stat]mainBG3.jpg"
-  File "..\Skins\Classic\Star.ini"
+  File "..\Game\Output\Plugins\Blind.dll"
+  File "..\Game\Output\Plugins\Duell.dll"
+  File "..\Game\Output\Plugins\Hold_The_Line.dll"
+  File "..\Game\Output\Plugins\TeamDuell.dll"
+  File "..\Game\Output\Plugins\Until5000.dll"
+  File "..\Game\Output\Plugins\HauDenLukas.dll"
+  ;Add more Plugins...
+  
+  SetOutPath "$INSTDIR\Skins\Blue Sensation\"
+  File "..\Game\Output\Skins\Blue Sensation\blue sensation.ini"
+  File "..\Game\Output\Skins\Blue Sensation\blue simple.ini"
+  File "..\Game\Output\Skins\Blue Sensation\city.ini"
+  File "..\Game\Output\Skins\Blue Sensation\flower.ini"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-load]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-load]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-load]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-load]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-main]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-main]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-main]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-main]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-menu]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-menu]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-menu]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-menu]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-option]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-option]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-option]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-option]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-party]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-song]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-song]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-song]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-song]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-top5]blue.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-top5]city.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-top5]flower.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[bg-top5]sensation.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]13.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]alt.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]az.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]enter.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]esc.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]j.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]m.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]navi.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[button]p.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[effect]goldenNoteStar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[effect]perfectNoteStar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[helper]buttonFade.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[helper]buttonFade2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[helper]rectangle.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]calcmedley.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]cd.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]challenge.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]classic.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]error.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]main.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]medley.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]options.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]party.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]question.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]score.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]search.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]songmenu.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]song_duet.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]stats.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[icon]video.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]button.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonf.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu3.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu4.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu5.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu6.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu7.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu8.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu8a.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]buttonmenu9.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]mainBar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]playerNumberBox.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]selectbg.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]songCover.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]songSelection1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[main]songSelection2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[menu]jumpToBg.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[menu]PopUpBg.JPG"
+  File "..\Game\Output\Skins\Blue Sensation\[menu]PopUpFg.JPG"
+  File "..\Game\Output\Skins\Blue Sensation\[menu]songMenuBg.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[menu]songMenuSelectBg.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[option]button.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]Joker.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]playerButton.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]playerTeamButton.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]pointer.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[party]roundBG1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]roundBG2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]roundBG3.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]roundBG4.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]roundTeamButton.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]scoreBG1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]scoreBG2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]scoreDecoration.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]teamPoints.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]winDecoration1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]winTeamButton1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]winTeamButton2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[party]winTeamButton3.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[score]box.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[score]endcap.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[score]level.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[score]levelRound.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[score]Line.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]lineBonusPopUp.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]LyricsBall.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]lyricsHelpBar.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesBgLeft.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesBgMid.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesBgRight.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesLeft.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesMid.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]notesRight.bmp"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]p.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]scoreBg.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]singBarBack.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]singBarBar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]singBarFront.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]textBar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]timeBar.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]timeBar1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[sing]timeBarBG.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[special]bar1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[special]bar2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[stat]detailBG1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[stat]mainBG1.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[stat]mainBG2.jpg"
+  File "..\Game\Output\Skins\Blue Sensation\[stat]mainBG3.jpg"
 
+  
   SetOutPath "$INSTDIR\Skins\Deluxe\"
-  File "..\Skins\Deluxe\[bg-load]blue.jpg"
-  File "..\Skins\Deluxe\[bg-load]fall.jpg"
-  File "..\Skins\Deluxe\[bg-load]summer.jpg"
-  File "..\Skins\Deluxe\[bg-load]winter.jpg"
-  File "..\Skins\Deluxe\[bg-main]blue.jpg"
-  File "..\Skins\Deluxe\[bg-main]fall.jpg"
-  File "..\Skins\Deluxe\[bg-main]summer.jpg"
-  File "..\Skins\Deluxe\[bg-main]winter.jpg"
-  File "..\Skins\Deluxe\[button]13.jpg"
-  File "..\Skins\Deluxe\[button]alt.jpg"
-  File "..\Skins\Deluxe\[button]az.jpg"
-  File "..\Skins\Deluxe\[button]enter.jpg"
-  File "..\Skins\Deluxe\[button]esc.jpg"
-  File "..\Skins\Deluxe\[button]j.jpg"
-  File "..\Skins\Deluxe\[button]m.jpg"
-  File "..\Skins\Deluxe\[button]navi.jpg"
-  File "..\Skins\Deluxe\[button]p.jpg"
-  File "..\Skins\Deluxe\[effect]goldenNoteStar.jpg"
-  File "..\Skins\Deluxe\[effect]perfectNoteStar.jpg"
-  File "..\Skins\Deluxe\[helper]buttonFade.jpg"
-  File "..\Skins\Deluxe\[helper]rectangle.jpg"
-  File "..\Skins\Deluxe\[icon]cd.jpg"
-  File "..\Skins\Deluxe\[icon]error.jpg"
-  File "..\Skins\Deluxe\[icon]main.jpg"
-  File "..\Skins\Deluxe\[icon]options.jpg"
-  File "..\Skins\Deluxe\[icon]party.jpg"
-  File "..\Skins\Deluxe\[icon]question.jpg"
-  File "..\Skins\Deluxe\[icon]score.jpg"
-  File "..\Skins\Deluxe\[icon]search.jpg"
-  File "..\Skins\Deluxe\[icon]songmenu.jpg"
-  File "..\Skins\Deluxe\[icon]stats.jpg"
-  File "..\Skins\Deluxe\[icon]video.jpg"
-  File "..\Skins\Deluxe\[main]button.jpg"
-  File "..\Skins\Deluxe\[main]buttonf.jpg"
-  File "..\Skins\Deluxe\[main]mainBar.jpg"
-  File "..\Skins\Deluxe\[main]playerNumberBox.jpg"
-  File "..\Skins\Deluxe\[main]selectbg.jpg"
-  File "..\Skins\Deluxe\[main]songCover.jpg"
-  File "..\Skins\Deluxe\[main]songSelection1.jpg"
-  File "..\Skins\Deluxe\[main]songSelection2.jpg"
-  File "..\Skins\Deluxe\[menu]jumpToBg.jpg"
-  File "..\Skins\Deluxe\[menu]PopUpBg.JPG"
-  File "..\Skins\Deluxe\[menu]PopUpFg.JPG"
-  File "..\Skins\Deluxe\[menu]songMenuBg.jpg"
-  File "..\Skins\Deluxe\[menu]songMenuSelectBg.jpg"
-  File "..\Skins\Deluxe\[party]Joker.jpg"
-  File "..\Skins\Deluxe\[party]playerButton.jpg"
-  File "..\Skins\Deluxe\[party]playerTeamButton.jpg"
-  File "..\Skins\Deluxe\[party]pointer.bmp"
-  File "..\Skins\Deluxe\[party]roundBG1.jpg"
-  File "..\Skins\Deluxe\[party]roundBG2.jpg"
-  File "..\Skins\Deluxe\[party]roundBG3.jpg"
-  File "..\Skins\Deluxe\[party]roundBG4.jpg"
-  File "..\Skins\Deluxe\[party]roundTeamButton.jpg"
-  File "..\Skins\Deluxe\[party]scoreBG1.jpg"
-  File "..\Skins\Deluxe\[party]scoreBG2.jpg"
-  File "..\Skins\Deluxe\[party]scoreDecoration.jpg"
-  File "..\Skins\Deluxe\[party]teamPoints.jpg"
-  File "..\Skins\Deluxe\[party]winDecoration1.jpg"
-  File "..\Skins\Deluxe\[party]winTeamButton1.jpg"
-  File "..\Skins\Deluxe\[party]winTeamButton2.jpg"
-  File "..\Skins\Deluxe\[party]winTeamButton3.jpg"
-  File "..\Skins\Deluxe\[score]box.jpg"
-  File "..\Skins\Deluxe\[score]endcap.jpg"
-  File "..\Skins\Deluxe\[score]level.jpg"
-  File "..\Skins\Deluxe\[score]levelRound.jpg"
-  File "..\Skins\Deluxe\[score]Line.jpg"
-  File "..\Skins\Deluxe\[sing]lineBonusPopUp.jpg"
-  File "..\Skins\Deluxe\[sing]LyricsBall.bmp"
-  File "..\Skins\Deluxe\[sing]lyricsHelpBar.bmp"
-  File "..\Skins\Deluxe\[sing]notesBgLeft.bmp"
-  File "..\Skins\Deluxe\[sing]notesBgMid.bmp"
-  File "..\Skins\Deluxe\[sing]notesBgRight.bmp"
-  File "..\Skins\Deluxe\[sing]notesLeft.bmp"
-  File "..\Skins\Deluxe\[sing]notesMid.bmp"
-  File "..\Skins\Deluxe\[sing]notesRight.bmp"
-  File "..\Skins\Deluxe\[sing]p.jpg"
-  File "..\Skins\Deluxe\[sing]scoreBg.jpg"
-  File "..\Skins\Deluxe\[sing]singBarBack.jpg"
-  File "..\Skins\Deluxe\[sing]singBarBar.jpg"
-  File "..\Skins\Deluxe\[sing]singBarFront.jpg"
-  File "..\Skins\Deluxe\[sing]textBar.jpg"
-  File "..\Skins\Deluxe\[sing]timeBar.jpg"
-  File "..\Skins\Deluxe\[sing]timeBar1.jpg"
-  File "..\Skins\Deluxe\[sing]timeBarBG.jpg"
-  File "..\Skins\Deluxe\[special]bar1.jpg"
-  File "..\Skins\Deluxe\[special]bar2.jpg"
-  File "..\Skins\Deluxe\[stat]detailBG1.jpg"
-  File "..\Skins\Deluxe\[stat]mainBG1.jpg"
-  File "..\Skins\Deluxe\[stat]mainBG2.jpg"
-  File "..\Skins\Deluxe\[stat]mainBG3.jpg"
-  File "..\Skins\Deluxe\Blue.ini"
-  File "..\Skins\Deluxe\Fall.ini"
-  File "..\Skins\Deluxe\Summer.ini"
-  File "..\Skins\Deluxe\Winter.ini"
-
+  File "..\Game\Output\Skins\Deluxe\Blue.ini"
+  File "..\Game\Output\Skins\Deluxe\Fall.ini"
+  File "..\Game\Output\Skins\Deluxe\Summer.ini"
+  File "..\Game\Output\Skins\Deluxe\Winter.ini"
+  File "..\Game\Output\Skins\Deluxe\[bg-load]blue.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-load]fall.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-load]summer.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-load]winter.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-main]blue.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-main]fall.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-main]summer.jpg"
+  File "..\Game\Output\Skins\Deluxe\[bg-main]winter.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]13.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]alt.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]az.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]enter.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]esc.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]j.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]m.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]navi.jpg"
+  File "..\Game\Output\Skins\Deluxe\[button]p.jpg"
+  File "..\Game\Output\Skins\Deluxe\[effect]goldenNoteStar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[effect]perfectNoteStar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[helper]buttonFade.jpg"
+  File "..\Game\Output\Skins\Deluxe\[helper]rectangle.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]calcmedley.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]cd.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]error.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]main.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]medley.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]options.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]party.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]question.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]score.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]search.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]songmenu.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]song_duet.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]stats.jpg"
+  File "..\Game\Output\Skins\Deluxe\[icon]video.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]button.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]buttonf.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]mainBar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]playerNumberBox.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]selectbg.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]songCover.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]songSelection1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[main]songSelection2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[menu]jumpToBg.jpg"
+  File "..\Game\Output\Skins\Deluxe\[menu]PopUpBg.JPG"
+  File "..\Game\Output\Skins\Deluxe\[menu]PopUpFg.JPG"
+  File "..\Game\Output\Skins\Deluxe\[menu]songMenuBg.jpg"
+  File "..\Game\Output\Skins\Deluxe\[menu]songMenuSelectBg.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]Joker.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]playerButton.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]playerTeamButton.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]pointer.bmp"
+  File "..\Game\Output\Skins\Deluxe\[party]roundBG1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]roundBG2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]roundBG3.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]roundBG4.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]roundTeamButton.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]scoreBG1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]scoreBG2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]scoreDecoration.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]teamPoints.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]winDecoration1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]winTeamButton1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]winTeamButton2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[party]winTeamButton3.jpg"
+  File "..\Game\Output\Skins\Deluxe\[score]box.jpg"
+  File "..\Game\Output\Skins\Deluxe\[score]endcap.jpg"
+  File "..\Game\Output\Skins\Deluxe\[score]level.jpg"
+  File "..\Game\Output\Skins\Deluxe\[score]levelRound.jpg"
+  File "..\Game\Output\Skins\Deluxe\[score]Line.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]lineBonusPopUp.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]LyricsBall.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]lyricsHelpBar.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesBgLeft.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesBgMid.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesBgRight.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesLeft.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesMid.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]notesRight.bmp"
+  File "..\Game\Output\Skins\Deluxe\[sing]p.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]scoreBg.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]singBarBack.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]singBarBar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]singBarFront.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]textBar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]timeBar.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]timeBar1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[sing]timeBarBG.jpg"
+  File "..\Game\Output\Skins\Deluxe\[special]bar1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[special]bar2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[stat]detailBG1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[stat]mainBG1.jpg"
+  File "..\Game\Output\Skins\Deluxe\[stat]mainBG2.jpg"
+  File "..\Game\Output\Skins\Deluxe\[stat]mainBG3.jpg"
+  
+  SetOutPath "$INSTDIR\Skins\iStar\"
+  File "..\Game\Output\Skins\iStar\Apple.ini"
+  File "..\Game\Output\Skins\iStar\[bg-load]blue.jpg"
+  File "..\Game\Output\Skins\iStar\[bg-main]blue.jpg"
+  File "..\Game\Output\Skins\iStar\[bg-menu]blue.jpg"
+  File "..\Game\Output\Skins\iStar\[button]13.jpg"
+  File "..\Game\Output\Skins\iStar\[button]alt.jpg"
+  File "..\Game\Output\Skins\iStar\[button]az.jpg"
+  File "..\Game\Output\Skins\iStar\[button]enter.jpg"
+  File "..\Game\Output\Skins\iStar\[button]esc.jpg"
+  File "..\Game\Output\Skins\iStar\[button]j.jpg"
+  File "..\Game\Output\Skins\iStar\[button]m.jpg"
+  File "..\Game\Output\Skins\iStar\[button]navi.jpg"
+  File "..\Game\Output\Skins\iStar\[button]p.jpg"
+  File "..\Game\Output\Skins\iStar\[effect]goldenNoteStar.jpg"
+  File "..\Game\Output\Skins\iStar\[effect]perfectNoteStar.jpg"
+  File "..\Game\Output\Skins\iStar\[helper]buttonFade.jpg"
+  File "..\Game\Output\Skins\iStar\[helper]buttonFade2.jpg"
+  File "..\Game\Output\Skins\iStar\[helper]buttonFade3.JPG"
+  File "..\Game\Output\Skins\iStar\[helper]buttonFade4.JPG"
+  File "..\Game\Output\Skins\iStar\[helper]rectangle.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]calcmedley.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]cd.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]error.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]main.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]medley.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]options.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]party.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]question.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]score.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]search.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]songmenu.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]song_duet.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]stats.jpg"
+  File "..\Game\Output\Skins\iStar\[icon]video.jpg"
+  File "..\Game\Output\Skins\iStar\[main]button.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonf.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu1.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu2.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu3.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu31.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu32.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu33.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu34.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu4.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu4a.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu4b.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu4c.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu5.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6a.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6b.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6c.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6d.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu6e.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu7.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu8.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu8a.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu8b.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu9.jpg"
+  File "..\Game\Output\Skins\iStar\[main]buttonmenu9a.jpg"
+  File "..\Game\Output\Skins\iStar\[main]mainBar.jpg"
+  File "..\Game\Output\Skins\iStar\[main]playerNumberBox.jpg"
+  File "..\Game\Output\Skins\iStar\[main]selectbg.jpg"
+  File "..\Game\Output\Skins\iStar\[main]songCover.jpg"
+  File "..\Game\Output\Skins\iStar\[main]songSelection1.jpg"
+  File "..\Game\Output\Skins\iStar\[main]songSelection2.jpg"
+  File "..\Game\Output\Skins\iStar\[menu]jumpToBg.jpg"
+  File "..\Game\Output\Skins\iStar\[menu]PopUpBg.JPG"
+  File "..\Game\Output\Skins\iStar\[menu]PopUpFg.JPG"
+  File "..\Game\Output\Skins\iStar\[menu]songMenuBg.jpg"
+  File "..\Game\Output\Skins\iStar\[menu]songMenuSelectBg.jpg"
+  File "..\Game\Output\Skins\iStar\[party]Joker.jpg"
+  File "..\Game\Output\Skins\iStar\[party]playerButton.jpg"
+  File "..\Game\Output\Skins\iStar\[party]playerTeamButton.jpg"
+  File "..\Game\Output\Skins\iStar\[party]pointer.bmp"
+  File "..\Game\Output\Skins\iStar\[party]roundBG1.jpg"
+  File "..\Game\Output\Skins\iStar\[party]roundBG2.jpg"
+  File "..\Game\Output\Skins\iStar\[party]roundBG3.jpg"
+  File "..\Game\Output\Skins\iStar\[party]roundBG4.jpg"
+  File "..\Game\Output\Skins\iStar\[party]roundTeamButton.jpg"
+  File "..\Game\Output\Skins\iStar\[party]scoreBG1.jpg"
+  File "..\Game\Output\Skins\iStar\[party]scoreBG2.jpg"
+  File "..\Game\Output\Skins\iStar\[party]scoreDecoration.jpg"
+  File "..\Game\Output\Skins\iStar\[party]teamPoints.jpg"
+  File "..\Game\Output\Skins\iStar\[party]winDecoration1.jpg"
+  File "..\Game\Output\Skins\iStar\[party]winTeamButton1.jpg"
+  File "..\Game\Output\Skins\iStar\[party]winTeamButton2.jpg"
+  File "..\Game\Output\Skins\iStar\[party]winTeamButton3.jpg"
+  File "..\Game\Output\Skins\iStar\[score]box.jpg"
+  File "..\Game\Output\Skins\iStar\[score]endcap.jpg"
+  File "..\Game\Output\Skins\iStar\[score]level.jpg"
+  File "..\Game\Output\Skins\iStar\[score]levelRound.jpg"
+  File "..\Game\Output\Skins\iStar\[score]Line.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]lineBonusPopUp.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]LyricsBall.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]lyricsHelpBar.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesBgLeft.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesBgMid.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesBgRight.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesLeft.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesMid.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]notesRight.bmp"
+  File "..\Game\Output\Skins\iStar\[sing]p.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]scoreBg.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]singBarBack.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]singBarBar.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]singBarFront.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]textBar.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]timeBar.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]timeBar1.jpg"
+  File "..\Game\Output\Skins\iStar\[sing]timeBarBG.jpg"
+  File "..\Game\Output\Skins\iStar\[special]bar1.jpg"
+  File "..\Game\Output\Skins\iStar\[special]bar2.jpg"
+  File "..\Game\Output\Skins\iStar\[stat]detailBG1.jpg"
+  File "..\Game\Output\Skins\iStar\[stat]mainBG1.jpg"
+  File "..\Game\Output\Skins\iStar\[stat]mainBG2.jpg"
+  File "..\Game\Output\Skins\iStar\[stat]mainBG3.jpg"
+  
   SetOutPath "$INSTDIR\Sounds\"
-  File "..\Sounds\Common back.mp3"
-  File "..\Sounds\Common start.mp3"
-  File "..\Sounds\credits-outro-tune.mp3"
-  File "..\Sounds\dismissed.mp3"
-  File "..\Sounds\menu swoosh.mp3"
-  File "..\Sounds\option change col.mp3"
-  File "..\Sounds\rimshot022b.mp3"
-  File "..\Sounds\select music change music 50.mp3"
-  File "..\Sounds\select music change music.mp3"
-  File "..\Sounds\wome-credits-tune.mp3"
+  File "..\Game\Output\Sounds\Applause.mp3"
+  File "..\Game\Output\Sounds\Common back.mp3"
+  File "..\Game\Output\Sounds\Common start.mp3"
+  File "..\Game\Output\Sounds\credits-outro-tune.mp3"
+  File "..\Game\Output\Sounds\dismissed.mp3"
+  File "..\Game\Output\Sounds\menu swoosh.mp3"
+  File "..\Game\Output\Sounds\option change col.mp3"
+  File "..\Game\Output\Sounds\PLUGIN_HauDenLukas_Bell.mp3"
+  File "..\Game\Output\Sounds\rimshot022b.mp3"
+  File "..\Game\Output\Sounds\select music change music 50.mp3"
+  File "..\Game\Output\Sounds\select music change music.mp3"
+  File "..\Game\Output\Sounds\wome-credits-tune.mp3"
   
   SetOutPath "$INSTDIR\Themes\"
-  File "..\Themes\Classic.ini"
-  File "..\Themes\Deluxe.ini"
+  File "..\Game\Output\Themes\Blue Sensation.ini"
+  File "..\Game\Output\Themes\Deluxe.ini"
+  File "..\Game\Output\Themes\iStar.ini"
 
   SetOutPath "$INSTDIR"
 \ No newline at end of file
diff --git a/Installer/settings/files_un.nsh b/Installer/settings/files_un.nsh
index adaf625b..1025e2ce 100644
--- a/Installer/settings/files_un.nsh
+++ b/Installer/settings/files_un.nsh
@@ -1,27 +1,24 @@
 ; This list contains the files that will be uninstalled
 
 ; Delete provided Game Exe and provided Tools
- Delete "$INSTDIR\ScoreConverter.exe"
  Delete "$INSTDIR\${exe}.exe"
 
 ; Delete other provided/created stuff
+ Delete "$INSTDIR\acinerella.dll"
  Delete "$INSTDIR\bass.dll"
  Delete "$INSTDIR\Changelog.german.txt"
  Delete "$INSTDIR\Changelog.txt"
  Delete "$INSTDIR\documentation.pdf"
  Delete "$INSTDIR\License.txt"
  Delete "$INSTDIR\ReadMe.txt"
+ Delete "$INSTDIR\ReadMe old.txt"
  Delete "$INSTDIR\SDL.dll"
-
  Delete "$INSTDIR\sqlite3.dll"
- Delete "$INSTDIR\avcodec-51.dll"
- Delete "$INSTDIR\avformat-50.dll"
- Delete "$INSTDIR\avutil-49.dll"
 
- Delete "$INSTDIR\sqlite3.dll"
  Delete "$INSTDIR\config.ini"
  Delete "$INSTDIR\Error.log"
  Delete "$INSTDIR\covers.cache"
+ Delete "$INSTDIR\Ultrastar.db"
  Delete "$INSTDIR\Uninstall.exe"
 
 ${If} ${AtLeastWinVista}
@@ -36,113 +33,151 @@ ${EndIf}
  Delete "$INSTDIR\Covers\NoCover.jpg"
 
 ; Delete provided languages
- Delete "$INSTDIR\Languages\Catalan.ini"
+ Delete "$INSTDIR\Languages\readme.txt"
+ Delete "$INSTDIR\Languages\Languages.xls"
  Delete "$INSTDIR\Languages\Dutch.ini"
  Delete "$INSTDIR\Languages\English.ini"
- Delete "$INSTDIR\Languages\Euskara.ini"
- Delete "$INSTDIR\Languages\French.ini"
  Delete "$INSTDIR\Languages\German.ini"
  Delete "$INSTDIR\Languages\Italian.ini"
- Delete "$INSTDIR\Languages\Norwegian.ini"
- Delete "$INSTDIR\Languages\Polish.ini"
- Delete "$INSTDIR\Languages\Portuguese.ini"
- Delete "$INSTDIR\Languages\readme.txt"
- Delete "$INSTDIR\Languages\Serbian.ini"
- Delete "$INSTDIR\Languages\Slovak.ini"
- Delete "$INSTDIR\Languages\Spanish.ini"
- Delete "$INSTDIR\Languages\Swedish.ini"
-
+ 
 ; Delete provided plugins
  Delete "$INSTDIR\Plugins\Blind.dll"
  Delete "$INSTDIR\Plugins\Duell.dll"
  Delete "$INSTDIR\Plugins\Hold_The_Line.dll"
  Delete "$INSTDIR\Plugins\TeamDuell.dll"
  Delete "$INSTDIR\Plugins\Until5000.dll"
-
-; Delete provided Classic Skin
- Delete "$INSTDIR\Skins\Classic\Star.ini"
- Delete "$INSTDIR\Skins\Classic\[button]13.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]alt.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]az.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]e.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]enter.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]esc.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]j.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]m.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]navi.jpg"
- Delete "$INSTDIR\Skins\Classic\[button]p.jpg"
- Delete "$INSTDIR\Skins\Classic\[effect]goldenNoteStar.jpg"
- Delete "$INSTDIR\Skins\Classic\[effect]perfectNoteStar.jpg"
- Delete "$INSTDIR\Skins\Classic\[helper]rectangle.jpg"
- Delete "$INSTDIR\Skins\Classic\[icon]error.jpg"
- Delete "$INSTDIR\Skins\Classic\[icon]question.jpg"
- Delete "$INSTDIR\Skins\Classic\[icon]Star.jpg"
- Delete "$INSTDIR\Skins\Classic\[icon]stats.jpg"
- Delete "$INSTDIR\Skins\Classic\[icon]video.jpg"
- Delete "$INSTDIR\Skins\Classic\[mainbutton]Exit.jpg"
- Delete "$INSTDIR\Skins\Classic\[mainbutton]Multi.jpg"
- Delete "$INSTDIR\Skins\Classic\[mainbutton]Options.jpg"
- Delete "$INSTDIR\Skins\Classic\[mainbutton]Solo.jpg"
- Delete "$INSTDIR\Skins\Classic\[mainbutton]Stats.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Bar.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Bar1.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Button.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Button2.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Button3.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]ButtonEditor.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]Logo.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]songCover.jpg"
- Delete "$INSTDIR\Skins\Classic\[main]square.jpg"
- Delete "$INSTDIR\Skins\Classic\[menu]jumpToBg.jpg"
- Delete "$INSTDIR\Skins\Classic\[menu]PopUpBg.JPG"
- Delete "$INSTDIR\Skins\Classic\[menu]PopUpFg.JPG"
- Delete "$INSTDIR\Skins\Classic\[menu]songMenuBg.jpg"
- Delete "$INSTDIR\Skins\Classic\[menu]songMenuBorder.jpg"
- Delete "$INSTDIR\Skins\Classic\[menu]songMenuButtonBG.jpg"
- Delete "$INSTDIR\Skins\Classic\[menu]songMenuSelectBG.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]Joker.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]playerButton.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]playerTeamButton.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]pointer.bmp"
- Delete "$INSTDIR\Skins\Classic\[party]roundBG1.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]roundBG2.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]roundBG3.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]roundBG4.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]roundTeamButton.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]scoreBG1.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]scoreBG2.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]scoreDecoration.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]teamPoints.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]winDecoration.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]winTeamButton1.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]winTeamButton2.jpg"
- Delete "$INSTDIR\Skins\Classic\[party]winTeamButton3.jpg"
- Delete "$INSTDIR\Skins\Classic\[score]box.jpg"
- Delete "$INSTDIR\Skins\Classic\[score]level.jpg"
- Delete "$INSTDIR\Skins\Classic\[score]levelround.jpg"
- Delete "$INSTDIR\Skins\Classic\[score]line.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]lineBonusPopUp.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]LyricsBall.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]lyricsHelpBar.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesBgLeft.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesBgMid.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesBgRight.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesLeft.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesMid.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]notesRight.bmp"
- Delete "$INSTDIR\Skins\Classic\[sing]p.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]scoreBg.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]singBarBack.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]singBarBar.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]singBarFront.jpg"
- Delete "$INSTDIR\Skins\Classic\[sing]textBar.jpg"
- Delete "$INSTDIR\Skins\Classic\[song]BGFade.jpg"
- Delete "$INSTDIR\Skins\Classic\[song]EqualizerBG.jpg"
- Delete "$INSTDIR\Skins\Classic\[song]selection.jpg"
- Delete "$INSTDIR\Skins\Classic\[stat]detailBG1.jpg"
- Delete "$INSTDIR\Skins\Classic\[stat]mainBG1.jpg"
- Delete "$INSTDIR\Skins\Classic\[stat]mainBG2.jpg"
- Delete "$INSTDIR\Skins\Classic\[stat]mainBG3.jpg"
+ Delete "$INSTDIR\Plugins\HauDenLukas.dll"
+
+; Delete provided Blue Sensation Skin
+ Delete "$INSTDIR\Skins\Blue Sensation\blue sensation.ini"
+ Delete "$INSTDIR\Skins\Blue Sensation\blue simple.ini"
+ Delete "$INSTDIR\Skins\Blue Sensation\city.ini"
+ Delete "$INSTDIR\Skins\Blue Sensation\flower.ini"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-load]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-load]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-load]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-load]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-main]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-main]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-main]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-main]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-menu]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-menu]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-menu]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-menu]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-option]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-option]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-option]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-option]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-party]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-song]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-song]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-song]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-song]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-top5]blue.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-top5]city.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-top5]flower.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[bg-top5]sensation.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]13.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]alt.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]az.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]enter.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]esc.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]j.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]m.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]navi.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[button]p.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[effect]goldenNoteStar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[effect]perfectNoteStar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[helper]buttonFade.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[helper]buttonFade2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[helper]rectangle.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]calcmedley.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]cd.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]challenge.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]classic.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]error.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]main.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]medley.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]options.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]party.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]question.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]score.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]search.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]songmenu.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]song_duet.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]stats.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[icon]video.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]button.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonf.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu3.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu4.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu5.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu6.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu7.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu8.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu8a.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]buttonmenu9.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]mainBar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]playerNumberBox.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]selectbg.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]songCover.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]songSelection1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[main]songSelection2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[menu]jumpToBg.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[menu]PopUpBg.JPG"
+ Delete "$INSTDIR\Skins\Blue Sensation\[menu]PopUpFg.JPG"
+ Delete "$INSTDIR\Skins\Blue Sensation\[menu]songMenuBg.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[menu]songMenuSelectBg.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[option]button.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]Joker.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]playerButton.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]playerTeamButton.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]pointer.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]roundBG1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]roundBG2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]roundBG3.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]roundBG4.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]roundTeamButton.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]scoreBG1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]scoreBG2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]scoreDecoration.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]teamPoints.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]winDecoration1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]winTeamButton1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]winTeamButton2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[party]winTeamButton3.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[score]box.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[score]endcap.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[score]level.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[score]levelRound.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[score]Line.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]lineBonusPopUp.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]LyricsBall.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]lyricsHelpBar.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesBgLeft.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesBgMid.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesBgRight.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesLeft.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesMid.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]notesRight.bmp"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]p.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]scoreBg.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]singBarBack.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]singBarBar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]singBarFront.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]textBar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]timeBar.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]timeBar1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[sing]timeBarBG.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[special]bar1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[special]bar2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[stat]detailBG1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[stat]mainBG1.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[stat]mainBG2.jpg"
+ Delete "$INSTDIR\Skins\Blue Sensation\[stat]mainBG3.jpg"
 
 ; Delete provided Deluxe Skin
  Delete "$INSTDIR\Skins\Deluxe\Blue.ini"
@@ -170,15 +205,18 @@ ${EndIf}
  Delete "$INSTDIR\Skins\Deluxe\[effect]perfectNoteStar.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[helper]buttonFade.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[helper]rectangle.jpg"
+ Delete "$INSTDIR\Skins\Deluxe\[icon]calcmedley.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]cd.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]error.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]main.jpg"
+ Delete "$INSTDIR\Skins\Deluxe\[icon]medley.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]options.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]party.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]question.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]score.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]search.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]songmenu.jpg"
+ Delete "$INSTDIR\Skins\Deluxe\[icon]song_duet.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]stats.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[icon]video.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[main]button.jpg"
@@ -241,7 +279,127 @@ ${EndIf}
  Delete "$INSTDIR\Skins\Deluxe\[stat]mainBG2.jpg"
  Delete "$INSTDIR\Skins\Deluxe\[stat]mainBG3.jpg"
 
+; Delete provided iStar Skin
+ Delete "$INSTDIR\Skins\iStar\Apple.ini"
+ Delete "$INSTDIR\Skins\iStar\[bg-load]blue.jpg"
+ Delete "$INSTDIR\Skins\iStar\[bg-main]blue.jpg"
+ Delete "$INSTDIR\Skins\iStar\[bg-menu]blue.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]13.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]alt.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]az.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]enter.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]esc.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]j.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]m.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]navi.jpg"
+ Delete "$INSTDIR\Skins\iStar\[button]p.jpg"
+ Delete "$INSTDIR\Skins\iStar\[effect]goldenNoteStar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[effect]perfectNoteStar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[helper]buttonFade.jpg"
+ Delete "$INSTDIR\Skins\iStar\[helper]buttonFade2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[helper]buttonFade3.JPG"
+ Delete "$INSTDIR\Skins\iStar\[helper]buttonFade4.JPG"
+ Delete "$INSTDIR\Skins\iStar\[helper]rectangle.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]calcmedley.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]cd.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]error.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]main.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]medley.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]options.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]party.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]question.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]score.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]search.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]songmenu.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]song_duet.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]stats.jpg"
+ Delete "$INSTDIR\Skins\iStar\[icon]video.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]button.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonf.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu3.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu31.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu32.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu33.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu34.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu4.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu4a.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu4b.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu4c.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu5.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6a.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6b.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6c.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6d.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu6e.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu7.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu8.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu8a.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu8b.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu9.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]buttonmenu9a.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]mainBar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]playerNumberBox.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]selectbg.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]songCover.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]songSelection1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[main]songSelection2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[menu]jumpToBg.jpg"
+ Delete "$INSTDIR\Skins\iStar\[menu]PopUpBg.JPG"
+ Delete "$INSTDIR\Skins\iStar\[menu]PopUpFg.JPG"
+ Delete "$INSTDIR\Skins\iStar\[menu]songMenuBg.jpg"
+ Delete "$INSTDIR\Skins\iStar\[menu]songMenuSelectBg.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]Joker.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]playerButton.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]playerTeamButton.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]pointer.bmp"
+ Delete "$INSTDIR\Skins\iStar\[party]roundBG1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]roundBG2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]roundBG3.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]roundBG4.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]roundTeamButton.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]scoreBG1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]scoreBG2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]scoreDecoration.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]teamPoints.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]winDecoration1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]winTeamButton1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]winTeamButton2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[party]winTeamButton3.jpg"
+ Delete "$INSTDIR\Skins\iStar\[score]box.jpg"
+ Delete "$INSTDIR\Skins\iStar\[score]endcap.jpg"
+ Delete "$INSTDIR\Skins\iStar\[score]level.jpg"
+ Delete "$INSTDIR\Skins\iStar\[score]levelRound.jpg"
+ Delete "$INSTDIR\Skins\iStar\[score]Line.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]lineBonusPopUp.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]LyricsBall.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]lyricsHelpBar.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesBgLeft.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesBgMid.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesBgRight.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesLeft.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesMid.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]notesRight.bmp"
+ Delete "$INSTDIR\Skins\iStar\[sing]p.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]scoreBg.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]singBarBack.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]singBarBar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]singBarFront.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]textBar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]timeBar.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]timeBar1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[sing]timeBarBG.jpg"
+ Delete "$INSTDIR\Skins\iStar\[special]bar1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[special]bar2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[stat]detailBG1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[stat]mainBG1.jpg"
+ Delete "$INSTDIR\Skins\iStar\[stat]mainBG2.jpg"
+ Delete "$INSTDIR\Skins\iStar\[stat]mainBG3.jpg"
+
 ; Delete provided sounds
+ Delete "$INSTDIR\Sounds\Applause.mp3"
  Delete "$INSTDIR\Sounds\Common back.mp3"
  Delete "$INSTDIR\Sounds\Common start.mp3"
  Delete "$INSTDIR\Sounds\credits-outro-tune.mp3"
@@ -249,32 +407,15 @@ ${EndIf}
  Delete "$INSTDIR\Sounds\menu swoosh.mp3"
  Delete "$INSTDIR\Sounds\option change col.mp3"
  Delete "$INSTDIR\Sounds\rimshot022b.mp3"
+ Delete "$INSTDIR\Sounds\PLUGIN_HauDenLukas_Bell.mp3"
  Delete "$INSTDIR\Sounds\select music change music 50.mp3"
  Delete "$INSTDIR\Sounds\select music change music.mp3"
  Delete "$INSTDIR\Sounds\wome-credits-tune.mp3"
   
 ; Delete provided Themes
- Delete "$INSTDIR\Themes\Classic.ini"
+ Delete "$INSTDIR\Themes\Blue Sensation.ini"
  Delete "$INSTDIR\Themes\Deluxe.ini"
-
-; Delete provided Songs
- Delete "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [BG].jpg"
- Delete "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18 [CO].jpg"
- Delete "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.ogg"
- Delete "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\Dead Smiling Pirates - I 18.txt"
- Delete "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\License.txt"
-
- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [BG].jpg"
- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star [CO].jpg"
- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.ogg"
- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\Steven Dunston - Northern Star.txt"
- Delete "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\License.txt"
-
- Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\License.txt"
- Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.txt"
- Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [BG].jpg"
- Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run [CO].jpg"
- Delete "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]\Joshua Morin - On the run.ogg"
+ Delete "$INSTDIR\Themes\iStar.ini"
 
 ; Delete only empty directories:
 
@@ -287,22 +428,16 @@ Call un.DeleteIfEmpty
 StrCpy $0 "$INSTDIR\Plugins"
 Call un.DeleteIfEmpty
 
-StrCpy $0 "$INSTDIR\Skins\Classic"
+StrCpy $0 "$INSTDIR\Skins\Blue Sensation"
 Call un.DeleteIfEmpty
 
 StrCpy $0 "$INSTDIR\Skins\Deluxe"
 Call un.DeleteIfEmpty
 
-StrCpy $0 "$INSTDIR\Skins"
-Call un.DeleteIfEmpty
-
-StrCpy $0 "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]"
+StrCpy $0 "$INSTDIR\Skins\iStar"
 Call un.DeleteIfEmpty
 
-StrCpy $0 "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]"
-Call un.DeleteIfEmpty
-
-StrCpy $0 "$INSTDIR\Songs\Joshua Morin - On the run [DEMO]"
+StrCpy $0 "$INSTDIR\Skins"
 Call un.DeleteIfEmpty
 
 StrCpy $0 "$INSTDIR\Songs"
@@ -320,6 +455,12 @@ Call un.DeleteIfEmpty
 StrCpy $0 "$INSTDIR\Playlists"
 Call un.DeleteIfEmpty
 
+StrCpy $0 "$INSTDIR\Recordings"
+Call un.DeleteIfEmpty
+
+StrCpy $0 "$INSTDIR\SessionLog"
+Call un.DeleteIfEmpty
+
 StrCpy $0 "$INSTDIR"
 Call un.DeleteIfEmpty
 
@@ -332,8 +473,8 @@ Call un.DeleteIfEmpty
  Delete "$SMPROGRAMS\$ICONS_GROUP\Deinstallieren.lnk"
  Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
  Delete "$SMPROGRAMS\$ICONS_GROUP\Internetseite.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe spielen.lnk"
- Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\UltraStar Deluxe CMD Edition spielen.lnk"
+ Delete "$SMPROGRAMS\$ICONS_GROUP\Play UltraStar Deluxe CMD Edition.lnk"
  Delete "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk"
  Delete "$SMPROGRAMS\$ICONS_GROUP\Lies mich.lnk"
  Delete "$SMPROGRAMS\$ICONS_GROUP\Lizenz.lnk"
@@ -341,8 +482,8 @@ Call un.DeleteIfEmpty
 
 ; Delete created Icon on Desktop
 
-Delete "$Desktop\Play UltraStar Deluxe.lnk"
-Delete "$Desktop\UltraStar Deluxe spielen.lnk"
+Delete "$Desktop\Play UltraStar Deluxe CMD Edition.lnk"
+Delete "$Desktop\UltraStar Deluxe CMD Edition spielen.lnk"
 
 StrCpy $0 "$SMPROGRAMS\$ICONS_GROUP"
 Call un.DeleteIfEmpty
diff --git a/Installer/settings/functions.nsh b/Installer/settings/functions.nsh
index 147ec76c..d513bbd6 100644
--- a/Installer/settings/functions.nsh
+++ b/Installer/settings/functions.nsh
@@ -1,4 +1,4 @@
-!define exe2 "USdx"					; Current name of start exe
+!define exe2 "UltraStar CMDe"					; Current name of start exe
 ; Creates Desktop Shortcut(s) if 
 ; checked on Finish Page
 
diff --git a/Installer/settings/langstrings.nsh b/Installer/settings/langstrings.nsh
index baed5f94..5ef939d4 100644
--- a/Installer/settings/langstrings.nsh
+++ b/Installer/settings/langstrings.nsh
@@ -1,16 +1,16 @@
 ; Language Strings which are used in the main program
 
-LangString str_continue ${LANG_GERMAN} "Dies wird UltraStar Deluxe installieren. Fortsetzen?"
-LangString str_continue ${LANG_ENGLISH} "This will install UltraStar Deluxe. Continue?"
+LangString str_continue ${LANG_GERMAN} "Dies wird UltraStar Deluxe CMD Edition installieren. Fortsetzen?"
+LangString str_continue ${LANG_ENGLISH} "This will install UltraStar Deluxe CMD Edition. Continue?"
 
 LangString str_abort ${LANG_ENGLISH} "Are you sure to abort Installation?"
 LangString str_abort ${LANG_GERMAN} "Wollen Sie die Installation wirklich abbrechen?"
 
-LangString uninst_begin ${LANG_ENGLISH} "This will uninstall UltraStar Deluxe completely (with Songs!). Continue ?"
-LangString uninst_begin ${LANG_GERMAN} "Dies wird UltraStar Deluxe vollst�ndig deinstallieren (inkl. Songs!). Fortfahren?"
+LangString uninst_begin ${LANG_ENGLISH} "This will uninstall UltraStar Deluxe CMD Edition completely (with Songs!). Continue ?"
+LangString uninst_begin ${LANG_GERMAN} "Dies wird UltraStar Deluxe CMD Edition vollst�ndig deinstallieren (inkl. Songs!). Fortfahren?"
 
-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe. Please leave us a comment why you uninstalled UltraStar Deluxe in our forum: ${forum}. We would also be pleased to recieve your feedback on UltraStar Deluxe there."
-LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe deinstalliert hast: ${forum}. Wir w�rden uns dort ebenso �ber eine R�ckmeldung f�r UltraStar Deluxe freuen."
+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_ENGLISH} "We hope you enjoyed UltraStar Deluxe CMD Edition. Please leave us a comment why you uninstalled UltraStar Deluxe CMD Edition in our forum: ${forum}. We would also be pleased to recieve your feedback on UltraStar Deluxe there."
+LangString MUI_UNTEXT_FINISH_INFO_TEXT ${LANG_GERMAN} "Wir hoffen du hast UltraStar Deluxe CMD Edition genossen. Bitte hinterlasse uns einen Kommentar im Forum, warum du UltraStar Deluxe CMD Edition deinstalliert hast: ${forum}. Wir w�rden uns dort ebenso �ber eine R�ckmeldung f�r UltraStar Deluxe freuen."
 
 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_ENGLISH} "The uninstallation finished successfully!"
 LangString MUI_UNTEXT_FINISH_INFO_TITLE ${LANG_GERMAN} "Die Deinstallation wurde erfolgreich abgeschlossen."
@@ -24,8 +24,8 @@ LangString str_header ${LANG_GERMAN} "Eigene Optionen zur Installation"
 LangString str_header_subtitle ${LANG_ENGLISH} ""
 LangString str_header_subtitle ${LANG_GERMAN} ""
 
-LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe spielen"  ; Name for start Icon in startmenu
-LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe"
+LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe CMD Edition spielen"  ; Name for start Icon in startmenu
+LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar CMD Edition"
 
 LangString sc_desktop ${LANG_GERMAN} "Verkn�pfung auf dem Desktop erstellen?" ; Finish Page: Readme = Create Desktop Shortcut
 LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?"
@@ -47,23 +47,23 @@ LangString sm_readme ${LANG_ENGLISH} "Readme"
 
 LangString Settings_TITLE ${LANG_ENGLISH} " "
 LangString Settings_TITLE ${LANG_GERMAN} " "
-LangString Settings_SUBTITLE ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe"
-LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellungen f�r UltraStar Deluxe fest."
+LangString Settings_SUBTITLE ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe CMD Edition"
+LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellungen f�r UltraStar Deluxe CMD Edition fest."
 
-LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe"	; Title String in Welcome Page
-LangString wp_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard"
+LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe CMD Edition"	; Title String in Welcome Page
+LangString wp_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe CMD Edition Setup Wizard"
 
-LangString wp_text ${LANG_GERMAN} "Dieser Assistent wird Sie 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 wp_text ${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 wp_text ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe CMD Edition 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 wp_text ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar DeluxeCMD Edition . 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 fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)"	; "Show Readme" String in Finish Page
 LangString fp_showreadme ${LANG_ENGLISH} "See documentation (PDF)"
 
-LangString fp_text ${LANG_GERMAN}  "UltraStar Deluxe wurde erfolgreich auf Ihrem System installiert.\n\r\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten."
-LangString fp_text ${LANG_ENGLISH}  "UltraStar Deluxe was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates."
+LangString fp_text ${LANG_GERMAN}  "UltraStar Deluxe CMD Edition wurde erfolgreich auf Ihrem System installiert.\n\r\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten."
+LangString fp_text ${LANG_ENGLISH}  "UltraStar Deluxe CMD Edition was installed successfully on you system.\n\r\n\rVisit out project website to get latest news and updates."
 
 LangString fp_link ${LANG_GERMAN} "Projektwebseite"	; Link to developers website - String in Finish Page
 LangString fp_link ${LANG_ENGLISH} "Project website"
 
-LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent f�r UltraStar Deluxe" 
-LangString uncp_text ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Uninstall Wizard"
-\ No newline at end of file
+LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent f�r UltraStar Deluxe CMD Edition" 
+LangString uncp_text ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe CMD Edition Uninstall Wizard"
+\ No newline at end of file
diff --git a/Installer/settings/settings-1031.ini b/Installer/settings/settings-1031.ini
index 642f577e..f2bdf5f0 100644
--- a/Installer/settings/settings-1031.ini
+++ b/Installer/settings/settings-1031.ini
@@ -51,7 +51,7 @@ Bottom=38
 
 [Field 7]
 Type=Droplist
-ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish
+ListItems=Dutch|English|German|Italian
 Left=71
 Right=161
 Top=48
diff --git a/Installer/settings/settings-1033.ini b/Installer/settings/settings-1033.ini
index 2a3dfdba..7ce54ff3 100644
--- a/Installer/settings/settings-1033.ini
+++ b/Installer/settings/settings-1033.ini
@@ -51,7 +51,7 @@ Bottom=36
 
 [Field 7]
 Type=Droplist
-ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish
+ListItems=Dutch|English|German|Italian
 Left=70
 Right=160
 Top=48
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index 7f41776e..e456d743 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -1,22 +1,22 @@
 ; These are the common used variables
-; for the USdx Installation Wizard
+; for the USdx Challenge, Medley & Duet Edition Installation Wizard
 
-!define version "1.0.1a"						; Current version of UltraStar Deluxe
-!define p_name "UltraStar Deluxe" 				; Just the name of the program
+!define version "r9"						; Current version of UltraStar Deluxe Challenge, Medley & Duet Edition
+!define p_name "UltraStar Deluxe CMD Edition" 				; Just the name of the program
 !define publisher "USDX Team"					; Publisher
 !define homepage "http://www.ultrastardeluxe.org/"		; Project Homepage
 !define forum "http://forum.ultrastardeluxe.org/"		; Forum Homepage
 
-!define exe "USdx"						; Current name of start exe (must also be defined in functions.nsh)
+!define exe "UltraStar CMDe"						; Current name of start exe (must also be defined in functions.nsh)
 
-!define demosong "http://ultrastardeluxe.xtremeweb-hosting.net/installer/songs/song.zip" ; URL from where the demo song "I18" will be downloaded	
-!define demosong2 "http://ultrastardeluxe.xtremeweb-hosting.net/installer/songs/song2.zip"  ; URL from where the demo song "Northern Star" will be downloaded	
+;!define demosong "http://ultrastardeluxe.xtremeweb-hosting.net/installer/songs/song.zip" ; URL from where the demo song "I18" will be downloaded	
+;!define demosong2 "http://ultrastardeluxe.xtremeweb-hosting.net/installer/songs/song2.zip"  ; URL from where the demo song "Northern Star" will be downloaded	
 
 ; Theme URLs:
 
-!define dl_orange "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/orange.zip"
-!define dl_vistar "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/vistar.zip"
-!define dl_streetlight "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/streetlight.zip"
+;!define dl_orange "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/orange.zip"
+;!define dl_vistar "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/vistar.zip"
+;!define dl_streetlight "http://ultrastardeluxe.xtremeweb-hosting.net/installer/themes/streetlight.zip"
 
 ; Other Language Strings (except Section Language Strings)
 ; can be found at .\langstrings.nsh
@@ -24,37 +24,37 @@
 !define eng_sec1_desc "These are the basic files needed by UltraStar Deluxe" 		; English Description of Base components
 !define ger_sec1_desc "Dies sind die von UltraStar Deluxe ben�tigten Grunddateien" 	; German Description of Base components	
 
-!define eng_sec3_desc "You can choose which optional themes should also be installed."  ; English Description of "Optional Themes"-Section
-!define ger_sec3_desc "Hier k�nnen optionale Motive zum Installieren gew�hlt werden."   ; German Description of "Optional Themes"-Section
+;!define eng_sec3_desc "You can choose which optional themes should also be installed."  ; English Description of "Optional Themes"-Section
+;!define ger_sec3_desc "Hier k�nnen optionale Motive zum Installieren gew�hlt werden."   ; German Description of "Optional Themes"-Section
 
-!define eng_g2Section1_desc "Install the demo song 'Dead Smiling Pirates - I 18'."	; English Description of the Example Song "I 18"
-!define ger_g2Section1_desc "Installiert das freie Beispiellied 'Dead Smiling Pirates - I 18'."   	; German Description of the Example Song "I 18"
+;!define eng_g2Section1_desc "Install the demo song 'Dead Smiling Pirates - I 18'."	; English Description of the Example Song "I 18"
+;!define ger_g2Section1_desc "Installiert das freie Beispiellied 'Dead Smiling Pirates - I 18'."   	; German Description of the Example Song "I 18"
 
-!define eng_g2Section2_desc "Install the demo song 'Steven Dunston - Northern Star'."		; English Description of the Example Song "Northern Star"
-!define ger_g2Section2_desc "Installiert das freie Beispiellied 'Steven Dunston - Northern Star'."	; German Description of the Example Song "Northern Star"
+;!define eng_g2Section2_desc "Install the demo song 'Steven Dunston - Northern Star'."		; English Description of the Example Song "Northern Star"
+;!define ger_g2Section2_desc "Installiert das freie Beispiellied 'Steven Dunston - Northern Star'."	; German Description of the Example Song "Northern Star"
 
-!define eng_g2Section3_desc "Install the demo song 'Joshua Morin - On the run'." ; English Description of the Example Song "On the run"
-!define ger_g2Section3_desc "Installiert das freie Beispiellied 'Joshua Morin - On the run'."; German Description of the Example Song "On the run"
+;!define eng_g2Section3_desc "Install the demo song 'Joshua Morin - On the run'." ; English Description of the Example Song "On the run"
+;!define ger_g2Section3_desc "Installiert das freie Beispiellied 'Joshua Morin - On the run'."; German Description of the Example Song "On the run"
 
 !define eng_sec1 "Base components" 							; English Name of the component section1
 !define ger_sec1 "Basiskomponenten" 							; German Name of the component section1
 
-!define eng_sec2 "Demo Songs" 							; English Name of the component section2
-!define ger_sec2 "Beispiellieder" 							; German Name of the component section2
+;!define eng_sec2 "Demo Songs" 							; English Name of the component section2
+;!define ger_sec2 "Beispiellieder" 							; German Name of the component section2
 
-!define eng_sec3 "Optional Themes"							; English Name of the component section group1
-!define ger_sec3 "Optionale Motive"							; German Name of the component section group1
+;!define eng_sec3 "Optional Themes"							; English Name of the component section group1
+;!define ger_sec3 "Optionale Motive"							; German Name of the component section group1
 
 ; Group Section Descriptions:
 
-!define eng_g1Sec1_desc "This will install the optional theme 'Orange' by Skar."
-!define ger_g1Sec1_desc "Dies installiert das optionale Motiv 'Orange' von Skar."
+;!define eng_g1Sec1_desc "This will install the optional theme 'Orange' by Skar."
+;!define ger_g1Sec1_desc "Dies installiert das optionale Motiv 'Orange' von Skar."
 
-!define eng_g1Sec2_desc "This will install the optional theme 'Streetlight' by Skar."
-!define ger_g1Sec2_desc "Dies installiert das optionale Motiv 'Streetlight' von Skar."
+;!define eng_g1Sec2_desc "This will install the optional theme 'Streetlight' by Skar."
+;!define ger_g1Sec2_desc "Dies installiert das optionale Motiv 'Streetlight' von Skar."
 
-!define eng_g1Sec3_desc "This will install the optional theme 'Vistar' by Skar."
-!define ger_g1Sec3_desc "Dies installiert das optionale Motiv 'Vistar' von Skar."
+;!define eng_g1Sec3_desc "This will install the optional theme 'Vistar' by Skar."
+;!define ger_g1Sec3_desc "Dies installiert das optionale Motiv 'Vistar' von Skar."
 
 ; Skin:
 
@@ -67,4 +67,4 @@
 !define directory_bgcolor "FFFFFF"		; RGB Background Color for Directory textbox
 !define smp_bgcolor "FFFFFF"			; RGB Background of Startmenu List and Textbox
 ;!define dets_bgcolor "FFFFFF"			; Background Color of Details Screen while files are being extracted
-!define file_license "..\InstallerDependencies\documents\License.txt"		; Choose the file with the license agreement
-\ No newline at end of file
+!define file_license "..\License.txt"	; Choose the file with the license agreement
+\ No newline at end of file