started to implement the new folder structure (like suggested in the wiki)

-merged Skins and Themes in Themes
-moved some libs to Libraries

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1021 b956fd51-792f-4845-bead-9b4dfca2ff2c

227 files changed, 16 insertions, 16 deletions

diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas
index b6a4fe02..22aa4ad6 100644
--- a/Game/Code/Classes/UMain.pas
+++ b/Game/Code/Classes/UMain.pas
@@ -1094,7 +1094,7 @@ begin
   initialize_path( LogPath         , Platform.GetLogPath                             );
   initialize_path( SoundPath       , Platform.GetGameSharedPath + 'Sounds'      + PathDelim );
   initialize_path( ThemePath       , Platform.GetGameSharedPath + 'Themes'      + PathDelim );
-  initialize_path( SkinsPath       , Platform.GetGameSharedPath + 'Skins'       + PathDelim );
+  initialize_path( SkinsPath       , Platform.GetGameSharedPath + 'Themes'       + PathDelim );
   initialize_path( LanguagesPath   , Platform.GetGameSharedPath + 'Languages'   + PathDelim );
   initialize_path( PluginPath      , Platform.GetGameSharedPath + 'Plugins'     + PathDelim );
   initialize_path( VisualsPath     , Platform.GetGameSharedPath + 'Visuals'     + PathDelim );
diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc
index 749575ec..03f0414b 100644
--- a/Game/Code/config-win.inc
+++ b/Game/Code/config-win.inc
@@ -16,17 +16,17 @@
 
 {$DEFINE HaveFFMpeg}
 {$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)}
-  av__codec = 'avcodec-51';
+  av__codec = 'Libraries\avcodec-51';
   LIBAVCODEC_VERSION_MAJOR   = 51;
   LIBAVCODEC_VERSION_MINOR   = 16;
   LIBAVCODEC_VERSION_RELEASE = 0;
 
-  av__format = 'avformat-50';
+  av__format = 'Libraries\avformat-50';
   LIBAVFORMAT_VERSION_MAJOR   = 50;
   LIBAVFORMAT_VERSION_MINOR   = 5;
   LIBAVFORMAT_VERSION_RELEASE = 0;
 
-  av__util = 'avutil-49';
+  av__util = 'Libraries\avutil-49';
   LIBAVUTIL_VERSION_MAJOR   = 49;
   LIBAVUTIL_VERSION_MINOR   = 0;
   LIBAVUTIL_VERSION_RELEASE = 0;
@@ -34,7 +34,7 @@
 
 {$UNDEF HaveSWScale}
 {$IF Defined(HaveSWScale) and Defined(IncludeConstants)}
-  sw__scale = 'swscale-0';
+  sw__scale = 'Libraries\swscale-0';
   LIBSWSCALE_VERSION_MAJOR   = 0;
   LIBSWSCALE_VERSION_MINOR   = 5;
   LIBSWSCALE_VERSION_RELEASE = 0;
@@ -48,7 +48,7 @@
   {$DEFINE HaveProjectM}
 {$IFEND}
 {$IF Defined(HaveProjectM) and Defined(IncludeConstants)}
-  libprojectM = 'libprojectM';
+  libprojectM = 'Libraries\libprojectM';
   // Note: Un/Define HaveProjectM_0_9 or HaveProjectM_1_0_PLUS accordingly
   PROJECTM_VERSION_MAJOR   = 0;
   PROJECTM_VERSION_MINOR   = 98;
@@ -57,7 +57,7 @@
 
 {$UNDEF HavePortaudio}
 {$IF Defined(HavePortaudio) and Defined(IncludeConstants)}
-  libportaudio = 'portaudio_x86';
+  libportaudio = 'Libraries\portaudio_x86';
   PORTAUDIO_VERSION_MAJOR   = 19;
   PORTAUDIO_VERSION_MINOR   = 0;
   PORTAUDIO_VERSION_RELEASE = 0;
@@ -65,6 +65,6 @@
 
 {$UNDEF HavePortmixer}
 {$IF Defined(HavePortmixer) and Defined(IncludeConstants)}
-  libportmixer = 'portmixer';
+  libportmixer = 'Libraries\portmixer';
 {$IFEND}
 
diff --git a/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas b/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas
index 29bc7123..d2e30270 100644
--- a/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas
+++ b/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas
@@ -357,7 +357,7 @@ uses
 

 const

 {$IFDEF WINDOWS}

-  SDLLibName = 'SDL.dll';

+  SDLLibName = 'Libraries\SDL.dll';

 {$ENDIF}

 

 {$IFDEF UNIX}

diff --git a/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas b/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas
index d0699761..1013e322 100644
--- a/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas
+++ b/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas
@@ -144,7 +144,7 @@ uses
 

 const

 {$IFDEF WINDOWS}

-  SDL_ImageLibName =  'SDL_Image.dll';

+  SDL_ImageLibName =  'Libraries\SDL_Image.dll';

 {$ENDIF}

 

 {$IFDEF UNIX}

diff --git a/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas b/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas
index 88966f82..73001038 100644
--- a/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas
+++ b/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas
@@ -179,7 +179,7 @@ uses
 

 const

 {$IFDEF WINDOWS}

-  SDLttfLibName = 'SDL_ttf.dll';

+  SDLttfLibName = 'Libraries\SDL_ttf.dll';

 {$ENDIF}

 

 {$IFDEF UNIX}

diff --git a/Game/Code/lib/SQLite/SQLite3.pas b/Game/Code/lib/SQLite/SQLite3.pas
index f1b03e08..202aa401 100644
--- a/Game/Code/lib/SQLite/SQLite3.pas
+++ b/Game/Code/lib/SQLite/SQLite3.pas
@@ -15,7 +15,7 @@ interface
 const
 
 {$IFDEF MSWINDOWS}
-  SQLiteDLL = 'sqlite3.dll';
+  SQLiteDLL = 'Libraries\sqlite3.dll';
 {$ENDIF}
 {$IFDEF LINUX}
   SQLiteDLL = 'sqlite3.so';
diff --git a/Game/Code/lib/bass/delphi/bass.pas b/Game/Code/lib/bass/delphi/bass.pas
index ba661699..0339e5a3 100644
--- a/Game/Code/lib/bass/delphi/bass.pas
+++ b/Game/Code/lib/bass/delphi/bass.pas
@@ -771,7 +771,7 @@ type
 

 // Functions

 const

-  bassdll = 'bass.dll';

+  bassdll = 'Libraries\bass.dll';

 

 function BASS_SetConfig(option, value: DWORD): DWORD; stdcall; external bassdll;

 function BASS_GetConfig(option: DWORD): DWORD; stdcall; external bassdll;

diff --git a/Game/Code/lib/libpng/png.pas b/Game/Code/lib/libpng/png.pas
index 0d784140..3d700104 100644
--- a/Game/Code/lib/libpng/png.pas
+++ b/Game/Code/lib/libpng/png.pas
@@ -29,7 +29,7 @@ uses
 const
 {$ifdef MSWINDOWS}
   // use libpng12-0 (Version 1.2.18), delivered wih SDL_Image
-  LibPng = 'libpng12-0'; // 'libpng13';
+  LibPng = 'Libraries\libpng12-0'; // 'libpng13';
   // matching lib version for libpng13.dll, needed for initialization
   PNG_LIBPNG_VER_STRING='1.2.12';
   // define the compiler that was used to built the DLL (necessary for jmp_buf)
diff --git a/Game/Code/lib/projectM/0.9/projectM.pas b/Game/Code/lib/projectM/0.9/projectM.pas
index 609448fd..cf98150e 100644
--- a/Game/Code/lib/projectM/0.9/projectM.pas
+++ b/Game/Code/lib/projectM/0.9/projectM.pas
@@ -16,7 +16,7 @@ uses
 
 const
 {$IFDEF win32}
-  libprojectM = 'libprojectM.dll';
+  libprojectM = 'Libraries\libprojectM';
 {$ELSE}
   libprojectM = 'libprojectM.so';
 {$ENDIF}
diff --git a/Game/Code/lib/projectM/1.0/projectM.pas b/Game/Code/lib/projectM/1.0/projectM.pas
index 47da36cc..c16873af 100644
--- a/Game/Code/lib/projectM/1.0/projectM.pas
+++ b/Game/Code/lib/projectM/1.0/projectM.pas
@@ -16,7 +16,7 @@ uses
 

 const

 {$IFDEF win32}

-  libprojectM = 'projectM-cwrapper.dll';

+  libprojectM = 'Libraries\projectM-cwrapper.dll';

 {$ELSE}

   libprojectM = 'libprojectM-cwrapper.so';

 {$ENDIF}

diff --git a/Skins/Classic/Star.ini b/Themes/Classic/Star.ini
index 47870f71..47870f71 100644
--- a/Skins/Classic/Star.ini
+++ b/Themes/Classic/Star.ini
diff --git a/Skins/Classic/[button]13.jpg b/Themes/Classic/[button]13.jpg
index 5787bb24..5787bb24 100644
--- a/Skins/Classic/[button]13.jpg
+++ b/Themes/Classic/[button]13.jpg
diff --git a/Skins/Classic/[button]alt.jpg b/Themes/Classic/[button]alt.jpg
index ec3e630f..ec3e630f 100644
--- a/Skins/Classic/[button]alt.jpg
+++ b/Themes/Classic/[button]alt.jpg
diff --git a/Skins/Classic/[button]az.jpg b/Themes/Classic/[button]az.jpg
index b486604e..b486604e 100644
--- a/Skins/Classic/[button]az.jpg
+++ b/Themes/Classic/[button]az.jpg
diff --git a/Skins/Classic/[button]e.jpg b/Themes/Classic/[button]e.jpg
index 7b247260..7b247260 100644
--- a/Skins/Classic/[button]e.jpg
+++ b/Themes/Classic/[button]e.jpg
diff --git a/Skins/Classic/[button]enter.jpg b/Themes/Classic/[button]enter.jpg
index 16ee885a..16ee885a 100644
--- a/Skins/Classic/[button]enter.jpg
+++ b/Themes/Classic/[button]enter.jpg
diff --git a/Skins/Classic/[button]esc.jpg b/Themes/Classic/[button]esc.jpg
index 7c40487a..7c40487a 100644
--- a/Skins/Classic/[button]esc.jpg
+++ b/Themes/Classic/[button]esc.jpg
diff --git a/Skins/Classic/[button]j.jpg b/Themes/Classic/[button]j.jpg
index b6eed56c..b6eed56c 100644
--- a/Skins/Classic/[button]j.jpg
+++ b/Themes/Classic/[button]j.jpg
diff --git a/Skins/Classic/[button]m.jpg b/Themes/Classic/[button]m.jpg
index ebb7156e..ebb7156e 100644
--- a/Skins/Classic/[button]m.jpg
+++ b/Themes/Classic/[button]m.jpg
diff --git a/Skins/Classic/[button]navi.jpg b/Themes/Classic/[button]navi.jpg
index 41b44525..41b44525 100644
--- a/Skins/Classic/[button]navi.jpg
+++ b/Themes/Classic/[button]navi.jpg
diff --git a/Skins/Classic/[button]p.jpg b/Themes/Classic/[button]p.jpg
index d2d60c02..d2d60c02 100644
--- a/Skins/Classic/[button]p.jpg
+++ b/Themes/Classic/[button]p.jpg
diff --git a/Skins/Classic/[effect]goldenNoteStar.jpg b/Themes/Classic/[effect]goldenNoteStar.jpg
index 1b31d267..1b31d267 100644
--- a/Skins/Classic/[effect]goldenNoteStar.jpg
+++ b/Themes/Classic/[effect]goldenNoteStar.jpg
diff --git a/Skins/Classic/[effect]perfectNoteStar.jpg b/Themes/Classic/[effect]perfectNoteStar.jpg
index 189a22a3..189a22a3 100644
--- a/Skins/Classic/[effect]perfectNoteStar.jpg
+++ b/Themes/Classic/[effect]perfectNoteStar.jpg
diff --git a/Skins/Classic/[helper]rectangle.jpg b/Themes/Classic/[helper]rectangle.jpg
index e03f98fc..e03f98fc 100644
--- a/Skins/Classic/[helper]rectangle.jpg
+++ b/Themes/Classic/[helper]rectangle.jpg
diff --git a/Skins/Classic/[icon]Star.jpg b/Themes/Classic/[icon]Star.jpg
index ee98f9d7..ee98f9d7 100644
--- a/Skins/Classic/[icon]Star.jpg
+++ b/Themes/Classic/[icon]Star.jpg
diff --git a/Skins/Classic/[icon]error.jpg b/Themes/Classic/[icon]error.jpg
index 5802e312..5802e312 100644
--- a/Skins/Classic/[icon]error.jpg
+++ b/Themes/Classic/[icon]error.jpg
diff --git a/Skins/Classic/[icon]question.jpg b/Themes/Classic/[icon]question.jpg
index e78fe6a8..e78fe6a8 100644
--- a/Skins/Classic/[icon]question.jpg
+++ b/Themes/Classic/[icon]question.jpg
diff --git a/Skins/Classic/[icon]stats.jpg b/Themes/Classic/[icon]stats.jpg
index cd5e03fb..cd5e03fb 100644
--- a/Skins/Classic/[icon]stats.jpg
+++ b/Themes/Classic/[icon]stats.jpg
diff --git a/Skins/Classic/[icon]video.jpg b/Themes/Classic/[icon]video.jpg
index 12d71add..12d71add 100644
--- a/Skins/Classic/[icon]video.jpg
+++ b/Themes/Classic/[icon]video.jpg
diff --git a/Skins/Classic/[main]Bar.jpg b/Themes/Classic/[main]Bar.jpg
index 2453cc3b..2453cc3b 100644
--- a/Skins/Classic/[main]Bar.jpg
+++ b/Themes/Classic/[main]Bar.jpg
diff --git a/Skins/Classic/[main]Bar1.jpg b/Themes/Classic/[main]Bar1.jpg
index 4e9693e3..4e9693e3 100644
--- a/Skins/Classic/[main]Bar1.jpg
+++ b/Themes/Classic/[main]Bar1.jpg
diff --git a/Skins/Classic/[main]Button.jpg b/Themes/Classic/[main]Button.jpg
index e6191a95..e6191a95 100644
--- a/Skins/Classic/[main]Button.jpg
+++ b/Themes/Classic/[main]Button.jpg
diff --git a/Skins/Classic/[main]Button2.jpg b/Themes/Classic/[main]Button2.jpg
index e3e9679a..e3e9679a 100644
--- a/Skins/Classic/[main]Button2.jpg
+++ b/Themes/Classic/[main]Button2.jpg
diff --git a/Skins/Classic/[main]Button3.jpg b/Themes/Classic/[main]Button3.jpg
index 3ac1f442..3ac1f442 100644
--- a/Skins/Classic/[main]Button3.jpg
+++ b/Themes/Classic/[main]Button3.jpg
diff --git a/Skins/Classic/[main]ButtonEditor.jpg b/Themes/Classic/[main]ButtonEditor.jpg
index 32e455ef..32e455ef 100644
--- a/Skins/Classic/[main]ButtonEditor.jpg
+++ b/Themes/Classic/[main]ButtonEditor.jpg
diff --git a/Skins/Classic/[main]Logo.jpg b/Themes/Classic/[main]Logo.jpg
index 1902cb02..1902cb02 100644
--- a/Skins/Classic/[main]Logo.jpg
+++ b/Themes/Classic/[main]Logo.jpg
diff --git a/Skins/Classic/[main]songCover.jpg b/Themes/Classic/[main]songCover.jpg
index 426bf22d..426bf22d 100644
--- a/Skins/Classic/[main]songCover.jpg
+++ b/Themes/Classic/[main]songCover.jpg
diff --git a/Skins/Classic/[main]square.jpg b/Themes/Classic/[main]square.jpg
index 8af62b71..8af62b71 100644
--- a/Skins/Classic/[main]square.jpg
+++ b/Themes/Classic/[main]square.jpg
diff --git a/Skins/Classic/[mainbutton]Exit.jpg b/Themes/Classic/[mainbutton]Exit.jpg
index 55494e65..55494e65 100644
--- a/Skins/Classic/[mainbutton]Exit.jpg
+++ b/Themes/Classic/[mainbutton]Exit.jpg
diff --git a/Skins/Classic/[mainbutton]Multi.jpg b/Themes/Classic/[mainbutton]Multi.jpg
index ad5980d7..ad5980d7 100644
--- a/Skins/Classic/[mainbutton]Multi.jpg
+++ b/Themes/Classic/[mainbutton]Multi.jpg
diff --git a/Skins/Classic/[mainbutton]Options.jpg b/Themes/Classic/[mainbutton]Options.jpg
index 5e1bff71..5e1bff71 100644
--- a/Skins/Classic/[mainbutton]Options.jpg
+++ b/Themes/Classic/[mainbutton]Options.jpg
diff --git a/Skins/Classic/[mainbutton]Solo.jpg b/Themes/Classic/[mainbutton]Solo.jpg
index a7e3d82a..a7e3d82a 100644
--- a/Skins/Classic/[mainbutton]Solo.jpg
+++ b/Themes/Classic/[mainbutton]Solo.jpg
diff --git a/Skins/Classic/[mainbutton]Stats.jpg b/Themes/Classic/[mainbutton]Stats.jpg
index 71cc13ad..71cc13ad 100644
--- a/Skins/Classic/[mainbutton]Stats.jpg
+++ b/Themes/Classic/[mainbutton]Stats.jpg
diff --git a/Skins/Classic/[menu]PopUpBg.JPG b/Themes/Classic/[menu]PopUpBg.JPG
index 1a23a90c..1a23a90c 100644
--- a/Skins/Classic/[menu]PopUpBg.JPG
+++ b/Themes/Classic/[menu]PopUpBg.JPG
diff --git a/Skins/Classic/[menu]PopUpFg.JPG b/Themes/Classic/[menu]PopUpFg.JPG
index 530d4cf9..530d4cf9 100644
--- a/Skins/Classic/[menu]PopUpFg.JPG
+++ b/Themes/Classic/[menu]PopUpFg.JPG
diff --git a/Skins/Classic/[menu]jumpToBg.jpg b/Themes/Classic/[menu]jumpToBg.jpg
index d0cd1da8..d0cd1da8 100644
--- a/Skins/Classic/[menu]jumpToBg.jpg
+++ b/Themes/Classic/[menu]jumpToBg.jpg
diff --git a/Skins/Classic/[menu]songMenuBg.jpg b/Themes/Classic/[menu]songMenuBg.jpg
index e4242fc5..e4242fc5 100644
--- a/Skins/Classic/[menu]songMenuBg.jpg
+++ b/Themes/Classic/[menu]songMenuBg.jpg
diff --git a/Skins/Classic/[menu]songMenuBorder.jpg b/Themes/Classic/[menu]songMenuBorder.jpg
index 11dd0604..11dd0604 100644
--- a/Skins/Classic/[menu]songMenuBorder.jpg
+++ b/Themes/Classic/[menu]songMenuBorder.jpg
diff --git a/Skins/Classic/[menu]songMenuButtonBG.jpg b/Themes/Classic/[menu]songMenuButtonBG.jpg
index 53f0da59..53f0da59 100644
--- a/Skins/Classic/[menu]songMenuButtonBG.jpg
+++ b/Themes/Classic/[menu]songMenuButtonBG.jpg
diff --git a/Skins/Classic/[menu]songMenuSelectBG.jpg b/Themes/Classic/[menu]songMenuSelectBG.jpg
index cd3041e2..cd3041e2 100644
--- a/Skins/Classic/[menu]songMenuSelectBG.jpg
+++ b/Themes/Classic/[menu]songMenuSelectBG.jpg
diff --git a/Skins/Classic/[party]Joker.jpg b/Themes/Classic/[party]Joker.jpg
index 78b66936..78b66936 100644
--- a/Skins/Classic/[party]Joker.jpg
+++ b/Themes/Classic/[party]Joker.jpg
diff --git a/Skins/Classic/[party]playerButton.jpg b/Themes/Classic/[party]playerButton.jpg
index 15a34c66..15a34c66 100644
--- a/Skins/Classic/[party]playerButton.jpg
+++ b/Themes/Classic/[party]playerButton.jpg
diff --git a/Skins/Classic/[party]playerTeamButton.jpg b/Themes/Classic/[party]playerTeamButton.jpg
index 2faf9c4b..2faf9c4b 100644
--- a/Skins/Classic/[party]playerTeamButton.jpg
+++ b/Themes/Classic/[party]playerTeamButton.jpg
diff --git a/Skins/Classic/[party]pointer.bmp b/Themes/Classic/[party]pointer.bmp
index 88bbcc3d..88bbcc3d 100644
--- a/Skins/Classic/[party]pointer.bmp
+++ b/Themes/Classic/[party]pointer.bmp
diff --git a/Skins/Classic/[party]roundBG1.jpg b/Themes/Classic/[party]roundBG1.jpg
index 464aabea..464aabea 100644
--- a/Skins/Classic/[party]roundBG1.jpg
+++ b/Themes/Classic/[party]roundBG1.jpg
diff --git a/Skins/Classic/[party]roundBG2.jpg b/Themes/Classic/[party]roundBG2.jpg
index 3413958f..3413958f 100644
--- a/Skins/Classic/[party]roundBG2.jpg
+++ b/Themes/Classic/[party]roundBG2.jpg
diff --git a/Skins/Classic/[party]roundBG3.jpg b/Themes/Classic/[party]roundBG3.jpg
index c6b53caf..c6b53caf 100644
--- a/Skins/Classic/[party]roundBG3.jpg
+++ b/Themes/Classic/[party]roundBG3.jpg
diff --git a/Skins/Classic/[party]roundBG4.jpg b/Themes/Classic/[party]roundBG4.jpg
index 5e4da0ac..5e4da0ac 100644
--- a/Skins/Classic/[party]roundBG4.jpg
+++ b/Themes/Classic/[party]roundBG4.jpg
diff --git a/Skins/Classic/[party]roundTeamButton.jpg b/Themes/Classic/[party]roundTeamButton.jpg
index 692db1bd..692db1bd 100644
--- a/Skins/Classic/[party]roundTeamButton.jpg
+++ b/Themes/Classic/[party]roundTeamButton.jpg
diff --git a/Skins/Classic/[party]scoreBG1.jpg b/Themes/Classic/[party]scoreBG1.jpg
index f558425d..f558425d 100644
--- a/Skins/Classic/[party]scoreBG1.jpg
+++ b/Themes/Classic/[party]scoreBG1.jpg
diff --git a/Skins/Classic/[party]scoreBG2.jpg b/Themes/Classic/[party]scoreBG2.jpg
index 47239d85..47239d85 100644
--- a/Skins/Classic/[party]scoreBG2.jpg
+++ b/Themes/Classic/[party]scoreBG2.jpg
diff --git a/Skins/Classic/[party]scoreDecoration.jpg b/Themes/Classic/[party]scoreDecoration.jpg
index 49204e19..49204e19 100644
--- a/Skins/Classic/[party]scoreDecoration.jpg
+++ b/Themes/Classic/[party]scoreDecoration.jpg
diff --git a/Skins/Classic/[party]teamPoints.jpg b/Themes/Classic/[party]teamPoints.jpg
index 96855bc9..96855bc9 100644
--- a/Skins/Classic/[party]teamPoints.jpg
+++ b/Themes/Classic/[party]teamPoints.jpg
diff --git a/Skins/Classic/[party]winDecoration.jpg b/Themes/Classic/[party]winDecoration.jpg
index 1d48ddb3..1d48ddb3 100644
--- a/Skins/Classic/[party]winDecoration.jpg
+++ b/Themes/Classic/[party]winDecoration.jpg
diff --git a/Skins/Classic/[party]winTeamButton1.jpg b/Themes/Classic/[party]winTeamButton1.jpg
index 10c8d80f..10c8d80f 100644
--- a/Skins/Classic/[party]winTeamButton1.jpg
+++ b/Themes/Classic/[party]winTeamButton1.jpg
diff --git a/Skins/Classic/[party]winTeamButton2.jpg b/Themes/Classic/[party]winTeamButton2.jpg
index fbd85056..fbd85056 100644
--- a/Skins/Classic/[party]winTeamButton2.jpg
+++ b/Themes/Classic/[party]winTeamButton2.jpg
diff --git a/Skins/Classic/[party]winTeamButton3.jpg b/Themes/Classic/[party]winTeamButton3.jpg
index e8dd9566..e8dd9566 100644
--- a/Skins/Classic/[party]winTeamButton3.jpg
+++ b/Themes/Classic/[party]winTeamButton3.jpg
diff --git a/Skins/Classic/[score]box.jpg b/Themes/Classic/[score]box.jpg
index b37f7e46..b37f7e46 100644
--- a/Skins/Classic/[score]box.jpg
+++ b/Themes/Classic/[score]box.jpg
diff --git a/Skins/Classic/[score]level.jpg b/Themes/Classic/[score]level.jpg
index e47280cb..e47280cb 100644
--- a/Skins/Classic/[score]level.jpg
+++ b/Themes/Classic/[score]level.jpg
diff --git a/Skins/Classic/[score]levelround.jpg b/Themes/Classic/[score]levelround.jpg
index dbc5b5af..dbc5b5af 100644
--- a/Skins/Classic/[score]levelround.jpg
+++ b/Themes/Classic/[score]levelround.jpg
diff --git a/Skins/Classic/[score]line.jpg b/Themes/Classic/[score]line.jpg
index 2fd951aa..2fd951aa 100644
--- a/Skins/Classic/[score]line.jpg
+++ b/Themes/Classic/[score]line.jpg
diff --git a/Skins/Classic/[sing]LyricsBall.png b/Themes/Classic/[sing]LyricsBall.png
index aa4401dd..aa4401dd 100644
--- a/Skins/Classic/[sing]LyricsBall.png
+++ b/Themes/Classic/[sing]LyricsBall.png
diff --git a/Skins/Classic/[sing]lineBonusPopUp.jpg b/Themes/Classic/[sing]lineBonusPopUp.jpg
index 58d93130..58d93130 100644
--- a/Skins/Classic/[sing]lineBonusPopUp.jpg
+++ b/Themes/Classic/[sing]lineBonusPopUp.jpg
diff --git a/Skins/Classic/[sing]lyricsHelpBar.bmp b/Themes/Classic/[sing]lyricsHelpBar.bmp
index 24fa2b52..24fa2b52 100644
--- a/Skins/Classic/[sing]lyricsHelpBar.bmp
+++ b/Themes/Classic/[sing]lyricsHelpBar.bmp
diff --git a/Skins/Classic/[sing]notesBgLeft.bmp b/Themes/Classic/[sing]notesBgLeft.bmp
index 776e567c..776e567c 100644
--- a/Skins/Classic/[sing]notesBgLeft.bmp
+++ b/Themes/Classic/[sing]notesBgLeft.bmp
diff --git a/Skins/Classic/[sing]notesBgMid.bmp b/Themes/Classic/[sing]notesBgMid.bmp
index 759ac8a3..759ac8a3 100644
--- a/Skins/Classic/[sing]notesBgMid.bmp
+++ b/Themes/Classic/[sing]notesBgMid.bmp
diff --git a/Skins/Classic/[sing]notesBgRight.bmp b/Themes/Classic/[sing]notesBgRight.bmp
index 9b1ffc18..9b1ffc18 100644
--- a/Skins/Classic/[sing]notesBgRight.bmp
+++ b/Themes/Classic/[sing]notesBgRight.bmp
diff --git a/Skins/Classic/[sing]notesLeft.bmp b/Themes/Classic/[sing]notesLeft.bmp
index c819849b..c819849b 100644
--- a/Skins/Classic/[sing]notesLeft.bmp
+++ b/Themes/Classic/[sing]notesLeft.bmp
diff --git a/Skins/Classic/[sing]notesMid.bmp b/Themes/Classic/[sing]notesMid.bmp
index 2fdce32d..2fdce32d 100644
--- a/Skins/Classic/[sing]notesMid.bmp
+++ b/Themes/Classic/[sing]notesMid.bmp
diff --git a/Skins/Classic/[sing]notesRight.bmp b/Themes/Classic/[sing]notesRight.bmp
index 3241beeb..3241beeb 100644
--- a/Skins/Classic/[sing]notesRight.bmp
+++ b/Themes/Classic/[sing]notesRight.bmp
diff --git a/Skins/Classic/[sing]p.jpg b/Themes/Classic/[sing]p.jpg
index 5217c6b1..5217c6b1 100644
--- a/Skins/Classic/[sing]p.jpg
+++ b/Themes/Classic/[sing]p.jpg
diff --git a/Skins/Classic/[sing]scoreBg.jpg b/Themes/Classic/[sing]scoreBg.jpg
index 01d3ca75..01d3ca75 100644
--- a/Skins/Classic/[sing]scoreBg.jpg
+++ b/Themes/Classic/[sing]scoreBg.jpg
diff --git a/Skins/Classic/[sing]singBarBack.jpg b/Themes/Classic/[sing]singBarBack.jpg
index d7dcd791..d7dcd791 100644
--- a/Skins/Classic/[sing]singBarBack.jpg
+++ b/Themes/Classic/[sing]singBarBack.jpg
diff --git a/Skins/Classic/[sing]singBarBar.jpg b/Themes/Classic/[sing]singBarBar.jpg
index 4fd9bde9..4fd9bde9 100644
--- a/Skins/Classic/[sing]singBarBar.jpg
+++ b/Themes/Classic/[sing]singBarBar.jpg
diff --git a/Skins/Classic/[sing]singBarFront.jpg b/Themes/Classic/[sing]singBarFront.jpg
index eec27b79..eec27b79 100644
--- a/Skins/Classic/[sing]singBarFront.jpg
+++ b/Themes/Classic/[sing]singBarFront.jpg
diff --git a/Skins/Classic/[sing]textBar.jpg b/Themes/Classic/[sing]textBar.jpg
index e2734bce..e2734bce 100644
--- a/Skins/Classic/[sing]textBar.jpg
+++ b/Themes/Classic/[sing]textBar.jpg
diff --git a/Skins/Classic/[song]BGFade.jpg b/Themes/Classic/[song]BGFade.jpg
index 1d6b80ff..1d6b80ff 100644
--- a/Skins/Classic/[song]BGFade.jpg
+++ b/Themes/Classic/[song]BGFade.jpg
diff --git a/Skins/Classic/[song]EqualizerBG.jpg b/Themes/Classic/[song]EqualizerBG.jpg
index 54ff27f2..54ff27f2 100644
--- a/Skins/Classic/[song]EqualizerBG.jpg
+++ b/Themes/Classic/[song]EqualizerBG.jpg
diff --git a/Skins/Classic/[song]selection.jpg b/Themes/Classic/[song]selection.jpg
index b6c0065e..b6c0065e 100644
--- a/Skins/Classic/[song]selection.jpg
+++ b/Themes/Classic/[song]selection.jpg
diff --git a/Skins/Classic/[stat]detailBG1.jpg b/Themes/Classic/[stat]detailBG1.jpg
index 120dc483..120dc483 100644
--- a/Skins/Classic/[stat]detailBG1.jpg
+++ b/Themes/Classic/[stat]detailBG1.jpg
diff --git a/Skins/Classic/[stat]mainBG1.jpg b/Themes/Classic/[stat]mainBG1.jpg
index a937b24a..a937b24a 100644
--- a/Skins/Classic/[stat]mainBG1.jpg
+++ b/Themes/Classic/[stat]mainBG1.jpg
diff --git a/Skins/Classic/[stat]mainBG2.jpg b/Themes/Classic/[stat]mainBG2.jpg
index 201d49b8..201d49b8 100644
--- a/Skins/Classic/[stat]mainBG2.jpg
+++ b/Themes/Classic/[stat]mainBG2.jpg
diff --git a/Skins/Classic/[stat]mainBG3.jpg b/Themes/Classic/[stat]mainBG3.jpg
index 812a8d78..812a8d78 100644
--- a/Skins/Classic/[stat]mainBG3.jpg
+++ b/Themes/Classic/[stat]mainBG3.jpg
diff --git a/Skins/Deluxe/Ani.ini b/Themes/Deluxe/Ani.ini
index 376630b8..376630b8 100644
--- a/Skins/Deluxe/Ani.ini
+++ b/Themes/Deluxe/Ani.ini
diff --git a/Skins/Deluxe/Blue.ini b/Themes/Deluxe/Blue.ini
index 201597b3..201597b3 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Themes/Deluxe/Blue.ini
diff --git a/Skins/Deluxe/Fall.ini b/Themes/Deluxe/Fall.ini
index 1ee00947..1ee00947 100644
--- a/Skins/Deluxe/Fall.ini
+++ b/Themes/Deluxe/Fall.ini
diff --git a/Skins/Deluxe/Summer.ini b/Themes/Deluxe/Summer.ini
index 8c5f1771..8c5f1771 100644
--- a/Skins/Deluxe/Summer.ini
+++ b/Themes/Deluxe/Summer.ini
diff --git a/Skins/Deluxe/Winter.ini b/Themes/Deluxe/Winter.ini
index 056ed868..056ed868 100644
--- a/Skins/Deluxe/Winter.ini
+++ b/Themes/Deluxe/Winter.ini
diff --git a/Skins/Deluxe/[bg-load]blue.jpg b/Themes/Deluxe/[bg-load]blue.jpg
index bea672c4..bea672c4 100644
--- a/Skins/Deluxe/[bg-load]blue.jpg
+++ b/Themes/Deluxe/[bg-load]blue.jpg
diff --git a/Skins/Deluxe/[bg-load]fall.jpg b/Themes/Deluxe/[bg-load]fall.jpg
index d205a4e4..d205a4e4 100644
--- a/Skins/Deluxe/[bg-load]fall.jpg
+++ b/Themes/Deluxe/[bg-load]fall.jpg
diff --git a/Skins/Deluxe/[bg-load]summer.jpg b/Themes/Deluxe/[bg-load]summer.jpg
index af7fdaa7..af7fdaa7 100644
--- a/Skins/Deluxe/[bg-load]summer.jpg
+++ b/Themes/Deluxe/[bg-load]summer.jpg
diff --git a/Skins/Deluxe/[bg-load]winter.jpg b/Themes/Deluxe/[bg-load]winter.jpg
index 826c22a7..826c22a7 100644
--- a/Skins/Deluxe/[bg-load]winter.jpg
+++ b/Themes/Deluxe/[bg-load]winter.jpg
diff --git a/Skins/Deluxe/[bg-main]blue.jpg b/Themes/Deluxe/[bg-main]blue.jpg
index 67c4cbbe..67c4cbbe 100644
--- a/Skins/Deluxe/[bg-main]blue.jpg
+++ b/Themes/Deluxe/[bg-main]blue.jpg
diff --git a/Skins/Deluxe/[bg-main]fall.jpg b/Themes/Deluxe/[bg-main]fall.jpg
index e4736d99..e4736d99 100644
--- a/Skins/Deluxe/[bg-main]fall.jpg
+++ b/Themes/Deluxe/[bg-main]fall.jpg
diff --git a/Skins/Deluxe/[bg-main]summer.jpg b/Themes/Deluxe/[bg-main]summer.jpg
index 9939dfcd..9939dfcd 100644
--- a/Skins/Deluxe/[bg-main]summer.jpg
+++ b/Themes/Deluxe/[bg-main]summer.jpg
diff --git a/Skins/Deluxe/[bg-main]winter.jpg b/Themes/Deluxe/[bg-main]winter.jpg
index 75cefa82..75cefa82 100644
--- a/Skins/Deluxe/[bg-main]winter.jpg
+++ b/Themes/Deluxe/[bg-main]winter.jpg
diff --git a/Skins/Deluxe/[bg_video]_ocean.avi b/Themes/Deluxe/[bg_video]_ocean.avi
index 357ddb21..357ddb21 100644
--- a/Skins/Deluxe/[bg_video]_ocean.avi
+++ b/Themes/Deluxe/[bg_video]_ocean.avi
diff --git a/Skins/Deluxe/[button]13.png b/Themes/Deluxe/[button]13.png
index 8e4694c4..8e4694c4 100644
--- a/Skins/Deluxe/[button]13.png
+++ b/Themes/Deluxe/[button]13.png
diff --git a/Skins/Deluxe/[button]alt.png b/Themes/Deluxe/[button]alt.png
index b3db5380..b3db5380 100644
--- a/Skins/Deluxe/[button]alt.png
+++ b/Themes/Deluxe/[button]alt.png
diff --git a/Skins/Deluxe/[button]az.png b/Themes/Deluxe/[button]az.png
index fe070495..fe070495 100644
--- a/Skins/Deluxe/[button]az.png
+++ b/Themes/Deluxe/[button]az.png
diff --git a/Skins/Deluxe/[button]enter.png b/Themes/Deluxe/[button]enter.png
index 0a2ad46c..0a2ad46c 100644
--- a/Skins/Deluxe/[button]enter.png
+++ b/Themes/Deluxe/[button]enter.png
diff --git a/Skins/Deluxe/[button]esc.png b/Themes/Deluxe/[button]esc.png
index fdf025eb..fdf025eb 100644
--- a/Skins/Deluxe/[button]esc.png
+++ b/Themes/Deluxe/[button]esc.png
diff --git a/Skins/Deluxe/[button]j.png b/Themes/Deluxe/[button]j.png
index 5a2f2087..5a2f2087 100644
--- a/Skins/Deluxe/[button]j.png
+++ b/Themes/Deluxe/[button]j.png
diff --git a/Skins/Deluxe/[button]m.png b/Themes/Deluxe/[button]m.png
index 97070b5f..97070b5f 100644
--- a/Skins/Deluxe/[button]m.png
+++ b/Themes/Deluxe/[button]m.png
diff --git a/Skins/Deluxe/[button]navi.png b/Themes/Deluxe/[button]navi.png
index 998aae22..998aae22 100644
--- a/Skins/Deluxe/[button]navi.png
+++ b/Themes/Deluxe/[button]navi.png
diff --git a/Skins/Deluxe/[button]p.png b/Themes/Deluxe/[button]p.png
index e597ddda..e597ddda 100644
--- a/Skins/Deluxe/[button]p.png
+++ b/Themes/Deluxe/[button]p.png
diff --git a/Skins/Deluxe/[effect]goldenNoteStar.png b/Themes/Deluxe/[effect]goldenNoteStar.png
index 7bd6225f..7bd6225f 100644
--- a/Skins/Deluxe/[effect]goldenNoteStar.png
+++ b/Themes/Deluxe/[effect]goldenNoteStar.png
diff --git a/Skins/Deluxe/[effect]perfectNoteStar.png b/Themes/Deluxe/[effect]perfectNoteStar.png
index 99132c39..99132c39 100644
--- a/Skins/Deluxe/[effect]perfectNoteStar.png
+++ b/Themes/Deluxe/[effect]perfectNoteStar.png
diff --git a/Skins/Deluxe/[helper]buttonFade.png b/Themes/Deluxe/[helper]buttonFade.png
index fbb7ffa0..fbb7ffa0 100644
--- a/Skins/Deluxe/[helper]buttonFade.png
+++ b/Themes/Deluxe/[helper]buttonFade.png
diff --git a/Skins/Deluxe/[helper]rectangle.jpg b/Themes/Deluxe/[helper]rectangle.jpg
index 1521bdea..1521bdea 100644
--- a/Skins/Deluxe/[helper]rectangle.jpg
+++ b/Themes/Deluxe/[helper]rectangle.jpg
diff --git a/Skins/Deluxe/[icon]cd.png b/Themes/Deluxe/[icon]cd.png
index 2633d235..2633d235 100644
--- a/Skins/Deluxe/[icon]cd.png
+++ b/Themes/Deluxe/[icon]cd.png
diff --git a/Skins/Deluxe/[icon]error.png b/Themes/Deluxe/[icon]error.png
index f952f3fa..f952f3fa 100644
--- a/Skins/Deluxe/[icon]error.png
+++ b/Themes/Deluxe/[icon]error.png
diff --git a/Skins/Deluxe/[icon]main.png b/Themes/Deluxe/[icon]main.png
index f7d50067..f7d50067 100644
--- a/Skins/Deluxe/[icon]main.png
+++ b/Themes/Deluxe/[icon]main.png
diff --git a/Skins/Deluxe/[icon]options.png b/Themes/Deluxe/[icon]options.png
index 9fac0bfd..9fac0bfd 100644
--- a/Skins/Deluxe/[icon]options.png
+++ b/Themes/Deluxe/[icon]options.png
diff --git a/Skins/Deluxe/[icon]party.png b/Themes/Deluxe/[icon]party.png
index e23230e3..e23230e3 100644
--- a/Skins/Deluxe/[icon]party.png
+++ b/Themes/Deluxe/[icon]party.png
diff --git a/Skins/Deluxe/[icon]question.png b/Themes/Deluxe/[icon]question.png
index a72a5c43..a72a5c43 100644
--- a/Skins/Deluxe/[icon]question.png
+++ b/Themes/Deluxe/[icon]question.png
diff --git a/Skins/Deluxe/[icon]score.png b/Themes/Deluxe/[icon]score.png
index ccc3d8ff..ccc3d8ff 100644
--- a/Skins/Deluxe/[icon]score.png
+++ b/Themes/Deluxe/[icon]score.png
diff --git a/Skins/Deluxe/[icon]search.png b/Themes/Deluxe/[icon]search.png
index f91bd284..f91bd284 100644
--- a/Skins/Deluxe/[icon]search.png
+++ b/Themes/Deluxe/[icon]search.png
diff --git a/Skins/Deluxe/[icon]songmenu.png b/Themes/Deluxe/[icon]songmenu.png
index 623d5339..623d5339 100644
--- a/Skins/Deluxe/[icon]songmenu.png
+++ b/Themes/Deluxe/[icon]songmenu.png
diff --git a/Skins/Deluxe/[icon]stats.png b/Themes/Deluxe/[icon]stats.png
index d8e5eac1..d8e5eac1 100644
--- a/Skins/Deluxe/[icon]stats.png
+++ b/Themes/Deluxe/[icon]stats.png
diff --git a/Skins/Deluxe/[icon]video.png b/Themes/Deluxe/[icon]video.png
index 9bd65f86..9bd65f86 100644
--- a/Skins/Deluxe/[icon]video.png
+++ b/Themes/Deluxe/[icon]video.png
diff --git a/Skins/Deluxe/[main]button.png b/Themes/Deluxe/[main]button.png
index 65251816..65251816 100644
--- a/Skins/Deluxe/[main]button.png
+++ b/Themes/Deluxe/[main]button.png
diff --git a/Skins/Deluxe/[main]buttonf.jpg b/Themes/Deluxe/[main]buttonf.jpg
index d844add5..d844add5 100644
--- a/Skins/Deluxe/[main]buttonf.jpg
+++ b/Themes/Deluxe/[main]buttonf.jpg
diff --git a/Skins/Deluxe/[main]mainBar.png b/Themes/Deluxe/[main]mainBar.png
index 29239cb2..29239cb2 100644
--- a/Skins/Deluxe/[main]mainBar.png
+++ b/Themes/Deluxe/[main]mainBar.png
diff --git a/Skins/Deluxe/[main]playerNumberBox.png b/Themes/Deluxe/[main]playerNumberBox.png
index 3336ef56..3336ef56 100644
--- a/Skins/Deluxe/[main]playerNumberBox.png
+++ b/Themes/Deluxe/[main]playerNumberBox.png
diff --git a/Skins/Deluxe/[main]selectbg.png b/Themes/Deluxe/[main]selectbg.png
index 56c31041..56c31041 100644
--- a/Skins/Deluxe/[main]selectbg.png
+++ b/Themes/Deluxe/[main]selectbg.png
diff --git a/Skins/Deluxe/[main]songCover.jpg b/Themes/Deluxe/[main]songCover.jpg
index 426bf22d..426bf22d 100644
--- a/Skins/Deluxe/[main]songCover.jpg
+++ b/Themes/Deluxe/[main]songCover.jpg
diff --git a/Skins/Deluxe/[main]songSelection1.png b/Themes/Deluxe/[main]songSelection1.png
index 7d7b3939..7d7b3939 100644
--- a/Skins/Deluxe/[main]songSelection1.png
+++ b/Themes/Deluxe/[main]songSelection1.png
diff --git a/Skins/Deluxe/[main]songSelection2.png b/Themes/Deluxe/[main]songSelection2.png
index 2a1808ac..2a1808ac 100644
--- a/Skins/Deluxe/[main]songSelection2.png
+++ b/Themes/Deluxe/[main]songSelection2.png
diff --git a/Skins/Deluxe/[menu]PopUpBg.png b/Themes/Deluxe/[menu]PopUpBg.png
index ed032349..ed032349 100644
--- a/Skins/Deluxe/[menu]PopUpBg.png
+++ b/Themes/Deluxe/[menu]PopUpBg.png
diff --git a/Skins/Deluxe/[menu]PopUpFg.png b/Themes/Deluxe/[menu]PopUpFg.png
index 2c9785b4..2c9785b4 100644
--- a/Skins/Deluxe/[menu]PopUpFg.png
+++ b/Themes/Deluxe/[menu]PopUpFg.png
diff --git a/Skins/Deluxe/[menu]jumpToBg.png b/Themes/Deluxe/[menu]jumpToBg.png
index 8e3a3a00..8e3a3a00 100644
--- a/Skins/Deluxe/[menu]jumpToBg.png
+++ b/Themes/Deluxe/[menu]jumpToBg.png
diff --git a/Skins/Deluxe/[menu]songMenuBg.png b/Themes/Deluxe/[menu]songMenuBg.png
index 92beff8e..92beff8e 100644
--- a/Skins/Deluxe/[menu]songMenuBg.png
+++ b/Themes/Deluxe/[menu]songMenuBg.png
diff --git a/Skins/Deluxe/[menu]songMenuSelectBg.png b/Themes/Deluxe/[menu]songMenuSelectBg.png
index 8ff5eef8..8ff5eef8 100644
--- a/Skins/Deluxe/[menu]songMenuSelectBg.png
+++ b/Themes/Deluxe/[menu]songMenuSelectBg.png
diff --git a/Skins/Deluxe/[party]Joker.png b/Themes/Deluxe/[party]Joker.png
index 6f7c1208..6f7c1208 100644
--- a/Skins/Deluxe/[party]Joker.png
+++ b/Themes/Deluxe/[party]Joker.png
diff --git a/Skins/Deluxe/[party]playerButton.png b/Themes/Deluxe/[party]playerButton.png
index e1247e50..e1247e50 100644
--- a/Skins/Deluxe/[party]playerButton.png
+++ b/Themes/Deluxe/[party]playerButton.png
diff --git a/Skins/Deluxe/[party]playerTeamButton.png b/Themes/Deluxe/[party]playerTeamButton.png
index add685d0..add685d0 100644
--- a/Skins/Deluxe/[party]playerTeamButton.png
+++ b/Themes/Deluxe/[party]playerTeamButton.png
diff --git a/Skins/Deluxe/[party]pointer.bmp b/Themes/Deluxe/[party]pointer.bmp
index 88bbcc3d..88bbcc3d 100644
--- a/Skins/Deluxe/[party]pointer.bmp
+++ b/Themes/Deluxe/[party]pointer.bmp
diff --git a/Skins/Deluxe/[party]roundBG1.png b/Themes/Deluxe/[party]roundBG1.png
index 64df6329..64df6329 100644
--- a/Skins/Deluxe/[party]roundBG1.png
+++ b/Themes/Deluxe/[party]roundBG1.png
diff --git a/Skins/Deluxe/[party]roundBG2.png b/Themes/Deluxe/[party]roundBG2.png
index a2780e2f..a2780e2f 100644
--- a/Skins/Deluxe/[party]roundBG2.png
+++ b/Themes/Deluxe/[party]roundBG2.png
diff --git a/Skins/Deluxe/[party]roundBG3.png b/Themes/Deluxe/[party]roundBG3.png
index 7a1d02d9..7a1d02d9 100644
--- a/Skins/Deluxe/[party]roundBG3.png
+++ b/Themes/Deluxe/[party]roundBG3.png
diff --git a/Skins/Deluxe/[party]roundBG4.png b/Themes/Deluxe/[party]roundBG4.png
index 81ccfd8e..81ccfd8e 100644
--- a/Skins/Deluxe/[party]roundBG4.png
+++ b/Themes/Deluxe/[party]roundBG4.png
diff --git a/Skins/Deluxe/[party]roundTeamButton.png b/Themes/Deluxe/[party]roundTeamButton.png
index f31d4296..f31d4296 100644
--- a/Skins/Deluxe/[party]roundTeamButton.png
+++ b/Themes/Deluxe/[party]roundTeamButton.png
diff --git a/Skins/Deluxe/[party]scoreBG1.png b/Themes/Deluxe/[party]scoreBG1.png
index 28496bcf..28496bcf 100644
--- a/Skins/Deluxe/[party]scoreBG1.png
+++ b/Themes/Deluxe/[party]scoreBG1.png
diff --git a/Skins/Deluxe/[party]scoreBG2.png b/Themes/Deluxe/[party]scoreBG2.png
index e6417915..e6417915 100644
--- a/Skins/Deluxe/[party]scoreBG2.png
+++ b/Themes/Deluxe/[party]scoreBG2.png
diff --git a/Skins/Deluxe/[party]scoreDecoration.png b/Themes/Deluxe/[party]scoreDecoration.png
index 388077e6..388077e6 100644
--- a/Skins/Deluxe/[party]scoreDecoration.png
+++ b/Themes/Deluxe/[party]scoreDecoration.png
diff --git a/Skins/Deluxe/[party]teamPoints.png b/Themes/Deluxe/[party]teamPoints.png
index 83c4f7a8..83c4f7a8 100644
--- a/Skins/Deluxe/[party]teamPoints.png
+++ b/Themes/Deluxe/[party]teamPoints.png
diff --git a/Skins/Deluxe/[party]winDecoration.png b/Themes/Deluxe/[party]winDecoration.png
index f84dbc8a..f84dbc8a 100644
--- a/Skins/Deluxe/[party]winDecoration.png
+++ b/Themes/Deluxe/[party]winDecoration.png
diff --git a/Skins/Deluxe/[party]winTeamButton1.png b/Themes/Deluxe/[party]winTeamButton1.png
index 9e7dba31..9e7dba31 100644
--- a/Skins/Deluxe/[party]winTeamButton1.png
+++ b/Themes/Deluxe/[party]winTeamButton1.png
diff --git a/Skins/Deluxe/[party]winTeamButton2.png b/Themes/Deluxe/[party]winTeamButton2.png
index 229dbbd3..229dbbd3 100644
--- a/Skins/Deluxe/[party]winTeamButton2.png
+++ b/Themes/Deluxe/[party]winTeamButton2.png
diff --git a/Skins/Deluxe/[party]winTeamButton3.png b/Themes/Deluxe/[party]winTeamButton3.png
index 53bc487a..53bc487a 100644
--- a/Skins/Deluxe/[party]winTeamButton3.png
+++ b/Themes/Deluxe/[party]winTeamButton3.png
diff --git a/Skins/Deluxe/[score]Line.png b/Themes/Deluxe/[score]Line.png
index 954caf94..954caf94 100644
--- a/Skins/Deluxe/[score]Line.png
+++ b/Themes/Deluxe/[score]Line.png
diff --git a/Skins/Deluxe/[score]bar_box_dark.png b/Themes/Deluxe/[score]bar_box_dark.png
index e4fbfa41..e4fbfa41 100644
--- a/Skins/Deluxe/[score]bar_box_dark.png
+++ b/Themes/Deluxe/[score]bar_box_dark.png
diff --git a/Skins/Deluxe/[score]bar_box_light.png b/Themes/Deluxe/[score]bar_box_light.png
index ddc17ed8..ddc17ed8 100644
--- a/Skins/Deluxe/[score]bar_box_light.png
+++ b/Themes/Deluxe/[score]bar_box_light.png
diff --git a/Skins/Deluxe/[score]bar_box_lightest.png b/Themes/Deluxe/[score]bar_box_lightest.png
index 995bb9ef..995bb9ef 100644
--- a/Skins/Deluxe/[score]bar_box_lightest.png
+++ b/Themes/Deluxe/[score]bar_box_lightest.png
diff --git a/Skins/Deluxe/[score]box.png b/Themes/Deluxe/[score]box.png
index 71a0cee6..71a0cee6 100644
--- a/Skins/Deluxe/[score]box.png
+++ b/Themes/Deluxe/[score]box.png
diff --git a/Skins/Deluxe/[score]endcap.png b/Themes/Deluxe/[score]endcap.png
index 3cccd2e1..3cccd2e1 100644
--- a/Skins/Deluxe/[score]endcap.png
+++ b/Themes/Deluxe/[score]endcap.png
diff --git a/Skins/Deluxe/[score]glass_box.png b/Themes/Deluxe/[score]glass_box.png
index c0cf2a9c..c0cf2a9c 100644
--- a/Skins/Deluxe/[score]glass_box.png
+++ b/Themes/Deluxe/[score]glass_box.png
diff --git a/Skins/Deluxe/[score]level.png b/Themes/Deluxe/[score]level.png
index 1f627560..1f627560 100644
--- a/Skins/Deluxe/[score]level.png
+++ b/Themes/Deluxe/[score]level.png
diff --git a/Skins/Deluxe/[score]levelRound.png b/Themes/Deluxe/[score]levelRound.png
index 2bc7a6b8..2bc7a6b8 100644
--- a/Skins/Deluxe/[score]levelRound.png
+++ b/Themes/Deluxe/[score]levelRound.png
diff --git a/Skins/Deluxe/[score]level_dark.png b/Themes/Deluxe/[score]level_dark.png
index da4fd407..da4fd407 100644
--- a/Skins/Deluxe/[score]level_dark.png
+++ b/Themes/Deluxe/[score]level_dark.png
diff --git a/Skins/Deluxe/[score]level_dark_round.png b/Themes/Deluxe/[score]level_dark_round.png
index de239cb2..de239cb2 100644
--- a/Skins/Deluxe/[score]level_dark_round.png
+++ b/Themes/Deluxe/[score]level_dark_round.png
diff --git a/Skins/Deluxe/[score]level_light.png b/Themes/Deluxe/[score]level_light.png
index 1c1c8a4d..1c1c8a4d 100644
--- a/Skins/Deluxe/[score]level_light.png
+++ b/Themes/Deluxe/[score]level_light.png
diff --git a/Skins/Deluxe/[score]level_light_round.png b/Themes/Deluxe/[score]level_light_round.png
index 641151a5..641151a5 100644
--- a/Skins/Deluxe/[score]level_light_round.png
+++ b/Themes/Deluxe/[score]level_light_round.png
diff --git a/Skins/Deluxe/[score]level_lightest.png b/Themes/Deluxe/[score]level_lightest.png
index f02fdf7b..f02fdf7b 100644
--- a/Skins/Deluxe/[score]level_lightest.png
+++ b/Themes/Deluxe/[score]level_lightest.png
diff --git a/Skins/Deluxe/[score]level_lightest_round.png b/Themes/Deluxe/[score]level_lightest_round.png
index 9f1bb09e..9f1bb09e 100644
--- a/Skins/Deluxe/[score]level_lightest_round.png
+++ b/Themes/Deluxe/[score]level_lightest_round.png
diff --git a/Skins/Deluxe/[score]rating_0.png b/Themes/Deluxe/[score]rating_0.png
index feb7e472..feb7e472 100644
--- a/Skins/Deluxe/[score]rating_0.png
+++ b/Themes/Deluxe/[score]rating_0.png
diff --git a/Skins/Deluxe/[score]rating_1.png b/Themes/Deluxe/[score]rating_1.png
index 4a143d83..4a143d83 100644
--- a/Skins/Deluxe/[score]rating_1.png
+++ b/Themes/Deluxe/[score]rating_1.png
diff --git a/Skins/Deluxe/[score]rating_2.png b/Themes/Deluxe/[score]rating_2.png
index 67258e22..67258e22 100644
--- a/Skins/Deluxe/[score]rating_2.png
+++ b/Themes/Deluxe/[score]rating_2.png
diff --git a/Skins/Deluxe/[score]rating_3.png b/Themes/Deluxe/[score]rating_3.png
index fe0b1662..fe0b1662 100644
--- a/Skins/Deluxe/[score]rating_3.png
+++ b/Themes/Deluxe/[score]rating_3.png
diff --git a/Skins/Deluxe/[score]rating_4.png b/Themes/Deluxe/[score]rating_4.png
index 5695f8fd..5695f8fd 100644
--- a/Skins/Deluxe/[score]rating_4.png
+++ b/Themes/Deluxe/[score]rating_4.png
diff --git a/Skins/Deluxe/[score]rating_5.png b/Themes/Deluxe/[score]rating_5.png
index 38ed92c3..38ed92c3 100644
--- a/Skins/Deluxe/[score]rating_5.png
+++ b/Themes/Deluxe/[score]rating_5.png
diff --git a/Skins/Deluxe/[score]rating_6.png b/Themes/Deluxe/[score]rating_6.png
index f8706de3..f8706de3 100644
--- a/Skins/Deluxe/[score]rating_6.png
+++ b/Themes/Deluxe/[score]rating_6.png
diff --git a/Skins/Deluxe/[sing.player1]lyric_active.png b/Themes/Deluxe/[sing.player1]lyric_active.png
index 089c8c5e..089c8c5e 100644
--- a/Skins/Deluxe/[sing.player1]lyric_active.png
+++ b/Themes/Deluxe/[sing.player1]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player1]lyric_inactive.png b/Themes/Deluxe/[sing.player1]lyric_inactive.png
index a349007d..a349007d 100644
--- a/Skins/Deluxe/[sing.player1]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player1]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing.player2]lyric_active.png b/Themes/Deluxe/[sing.player2]lyric_active.png
index 509767fa..509767fa 100644
--- a/Skins/Deluxe/[sing.player2]lyric_active.png
+++ b/Themes/Deluxe/[sing.player2]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player2]lyric_inactive.png b/Themes/Deluxe/[sing.player2]lyric_inactive.png
index ac40ec61..ac40ec61 100644
--- a/Skins/Deluxe/[sing.player2]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player2]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing.player3]lyric_active.png b/Themes/Deluxe/[sing.player3]lyric_active.png
index 7b130ac5..7b130ac5 100644
--- a/Skins/Deluxe/[sing.player3]lyric_active.png
+++ b/Themes/Deluxe/[sing.player3]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player3]lyric_inactive.png b/Themes/Deluxe/[sing.player3]lyric_inactive.png
index c5a00600..c5a00600 100644
--- a/Skins/Deluxe/[sing.player3]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player3]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing.player4]lyric_active.png b/Themes/Deluxe/[sing.player4]lyric_active.png
index 993041fd..993041fd 100644
--- a/Skins/Deluxe/[sing.player4]lyric_active.png
+++ b/Themes/Deluxe/[sing.player4]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player4]lyric_inactive.png b/Themes/Deluxe/[sing.player4]lyric_inactive.png
index f09669b2..f09669b2 100644
--- a/Skins/Deluxe/[sing.player4]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player4]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing.player5]lyric_active.png b/Themes/Deluxe/[sing.player5]lyric_active.png
index 631dc9c3..631dc9c3 100644
--- a/Skins/Deluxe/[sing.player5]lyric_active.png
+++ b/Themes/Deluxe/[sing.player5]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player5]lyric_inactive.png b/Themes/Deluxe/[sing.player5]lyric_inactive.png
index 716071e8..716071e8 100644
--- a/Skins/Deluxe/[sing.player5]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player5]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing.player6]lyric_active.png b/Themes/Deluxe/[sing.player6]lyric_active.png
index 65133d03..65133d03 100644
--- a/Skins/Deluxe/[sing.player6]lyric_active.png
+++ b/Themes/Deluxe/[sing.player6]lyric_active.png
diff --git a/Skins/Deluxe/[sing.player6]lyric_inactive.png b/Themes/Deluxe/[sing.player6]lyric_inactive.png
index 0c5f34d3..0c5f34d3 100644
--- a/Skins/Deluxe/[sing.player6]lyric_inactive.png
+++ b/Themes/Deluxe/[sing.player6]lyric_inactive.png
diff --git a/Skins/Deluxe/[sing]LyricsBall.png b/Themes/Deluxe/[sing]LyricsBall.png
index aa4401dd..aa4401dd 100644
--- a/Skins/Deluxe/[sing]LyricsBall.png
+++ b/Themes/Deluxe/[sing]LyricsBall.png
diff --git a/Skins/Deluxe/[sing]lineBonusPopUp.png b/Themes/Deluxe/[sing]lineBonusPopUp.png
index c7bd0a41..c7bd0a41 100644
--- a/Skins/Deluxe/[sing]lineBonusPopUp.png
+++ b/Themes/Deluxe/[sing]lineBonusPopUp.png
diff --git a/Skins/Deluxe/[sing]lyricsHelpBar.bmp b/Themes/Deluxe/[sing]lyricsHelpBar.bmp
index 87a22b6b..87a22b6b 100644
--- a/Skins/Deluxe/[sing]lyricsHelpBar.bmp
+++ b/Themes/Deluxe/[sing]lyricsHelpBar.bmp
diff --git a/Skins/Deluxe/[sing]notesBgLeft.png b/Themes/Deluxe/[sing]notesBgLeft.png
index 9fe2621c..9fe2621c 100644
--- a/Skins/Deluxe/[sing]notesBgLeft.png
+++ b/Themes/Deluxe/[sing]notesBgLeft.png
diff --git a/Skins/Deluxe/[sing]notesBgMid.png b/Themes/Deluxe/[sing]notesBgMid.png
index 612da5d3..612da5d3 100644
--- a/Skins/Deluxe/[sing]notesBgMid.png
+++ b/Themes/Deluxe/[sing]notesBgMid.png
diff --git a/Skins/Deluxe/[sing]notesBgRight.png b/Themes/Deluxe/[sing]notesBgRight.png
index a6f42c33..a6f42c33 100644
--- a/Skins/Deluxe/[sing]notesBgRight.png
+++ b/Themes/Deluxe/[sing]notesBgRight.png
diff --git a/Skins/Deluxe/[sing]notesLeft.png b/Themes/Deluxe/[sing]notesLeft.png
index 3a404b9c..3a404b9c 100644
--- a/Skins/Deluxe/[sing]notesLeft.png
+++ b/Themes/Deluxe/[sing]notesLeft.png
diff --git a/Skins/Deluxe/[sing]notesMid.png b/Themes/Deluxe/[sing]notesMid.png
index 8769d01a..8769d01a 100644
--- a/Skins/Deluxe/[sing]notesMid.png
+++ b/Themes/Deluxe/[sing]notesMid.png
diff --git a/Skins/Deluxe/[sing]notesPlainLeft.png b/Themes/Deluxe/[sing]notesPlainLeft.png
index 1a94a9d8..1a94a9d8 100644
--- a/Skins/Deluxe/[sing]notesPlainLeft.png
+++ b/Themes/Deluxe/[sing]notesPlainLeft.png
diff --git a/Skins/Deluxe/[sing]notesPlainMid.png b/Themes/Deluxe/[sing]notesPlainMid.png
index 7fc64282..7fc64282 100644
--- a/Skins/Deluxe/[sing]notesPlainMid.png
+++ b/Themes/Deluxe/[sing]notesPlainMid.png
diff --git a/Skins/Deluxe/[sing]notesPlainRight.png b/Themes/Deluxe/[sing]notesPlainRight.png
index ff8bb502..ff8bb502 100644
--- a/Skins/Deluxe/[sing]notesPlainRight.png
+++ b/Themes/Deluxe/[sing]notesPlainRight.png
diff --git a/Skins/Deluxe/[sing]notesRight.png b/Themes/Deluxe/[sing]notesRight.png
index 8dc40cc8..8dc40cc8 100644
--- a/Skins/Deluxe/[sing]notesRight.png
+++ b/Themes/Deluxe/[sing]notesRight.png
diff --git a/Skins/Deluxe/[sing]p.png b/Themes/Deluxe/[sing]p.png
index 7458d8e5..7458d8e5 100644
--- a/Skins/Deluxe/[sing]p.png
+++ b/Themes/Deluxe/[sing]p.png
diff --git a/Skins/Deluxe/[sing]pause.png b/Themes/Deluxe/[sing]pause.png
index f5ab158c..f5ab158c 100644
--- a/Skins/Deluxe/[sing]pause.png
+++ b/Themes/Deluxe/[sing]pause.png
diff --git a/Skins/Deluxe/[sing]scoreBg.jpg b/Themes/Deluxe/[sing]scoreBg.jpg
index 4a4459f6..4a4459f6 100644
--- a/Skins/Deluxe/[sing]scoreBg.jpg
+++ b/Themes/Deluxe/[sing]scoreBg.jpg
diff --git a/Skins/Deluxe/[sing]scoreBg.png b/Themes/Deluxe/[sing]scoreBg.png
index db6ba67f..db6ba67f 100644
--- a/Skins/Deluxe/[sing]scoreBg.png
+++ b/Themes/Deluxe/[sing]scoreBg.png
diff --git a/Skins/Deluxe/[sing]singBarBack.png b/Themes/Deluxe/[sing]singBarBack.png
index 14d2ba42..14d2ba42 100644
--- a/Skins/Deluxe/[sing]singBarBack.png
+++ b/Themes/Deluxe/[sing]singBarBack.png
diff --git a/Skins/Deluxe/[sing]singBarBar.jpg b/Themes/Deluxe/[sing]singBarBar.jpg
index 4fd9bde9..4fd9bde9 100644
--- a/Skins/Deluxe/[sing]singBarBar.jpg
+++ b/Themes/Deluxe/[sing]singBarBar.jpg
diff --git a/Skins/Deluxe/[sing]singBarBar.png b/Themes/Deluxe/[sing]singBarBar.png
index 9c57057b..9c57057b 100644
--- a/Skins/Deluxe/[sing]singBarBar.png
+++ b/Themes/Deluxe/[sing]singBarBar.png
diff --git a/Skins/Deluxe/[sing]singBarFront.png b/Themes/Deluxe/[sing]singBarFront.png
index 42477c5a..42477c5a 100644
--- a/Skins/Deluxe/[sing]singBarFront.png
+++ b/Themes/Deluxe/[sing]singBarFront.png
diff --git a/Skins/Deluxe/[sing]textBar.png b/Themes/Deluxe/[sing]textBar.png
index 377cd0c2..377cd0c2 100644
--- a/Skins/Deluxe/[sing]textBar.png
+++ b/Themes/Deluxe/[sing]textBar.png
diff --git a/Skins/Deluxe/[sing]timeBar.jpg b/Themes/Deluxe/[sing]timeBar.jpg
index cc5cb552..cc5cb552 100644
--- a/Skins/Deluxe/[sing]timeBar.jpg
+++ b/Themes/Deluxe/[sing]timeBar.jpg
diff --git a/Skins/Deluxe/[sing]timeBarBG.png b/Themes/Deluxe/[sing]timeBarBG.png
index 6094fdf3..6094fdf3 100644
--- a/Skins/Deluxe/[sing]timeBarBG.png
+++ b/Themes/Deluxe/[sing]timeBarBG.png
diff --git a/Skins/Deluxe/[special]bar1.png b/Themes/Deluxe/[special]bar1.png
index 00afb41d..00afb41d 100644
--- a/Skins/Deluxe/[special]bar1.png
+++ b/Themes/Deluxe/[special]bar1.png
diff --git a/Skins/Deluxe/[special]bar2.png b/Themes/Deluxe/[special]bar2.png
index c828a8e1..c828a8e1 100644
--- a/Skins/Deluxe/[special]bar2.png
+++ b/Themes/Deluxe/[special]bar2.png
diff --git a/Skins/Deluxe/[special]bg_fade.png b/Themes/Deluxe/[special]bg_fade.png
index dc3248ef..dc3248ef 100644
--- a/Skins/Deluxe/[special]bg_fade.png
+++ b/Themes/Deluxe/[special]bg_fade.png
diff --git a/Skins/Deluxe/[stat]detailBG1.png b/Themes/Deluxe/[stat]detailBG1.png
index 8abdcfec..8abdcfec 100644
--- a/Skins/Deluxe/[stat]detailBG1.png
+++ b/Themes/Deluxe/[stat]detailBG1.png
diff --git a/Skins/Deluxe/[stat]mainBG1.png b/Themes/Deluxe/[stat]mainBG1.png
index 3f5a4190..3f5a4190 100644
--- a/Skins/Deluxe/[stat]mainBG1.png
+++ b/Themes/Deluxe/[stat]mainBG1.png
diff --git a/Skins/Deluxe/[stat]mainBG2.png b/Themes/Deluxe/[stat]mainBG2.png
index b88ecaf8..b88ecaf8 100644
--- a/Skins/Deluxe/[stat]mainBG2.png
+++ b/Themes/Deluxe/[stat]mainBG2.png
diff --git a/Skins/Deluxe/[stat]mainBG3.png b/Themes/Deluxe/[stat]mainBG3.png
index 28c39392..28c39392 100644
--- a/Skins/Deluxe/[stat]mainBG3.png
+++ b/Themes/Deluxe/[stat]mainBG3.png
diff --git a/Skins/Deluxe/deluxe.mov b/Themes/Deluxe/deluxe.mov
index 077ac35b..077ac35b 100644
--- a/Skins/Deluxe/deluxe.mov
+++ b/Themes/Deluxe/deluxe.mov
diff --git a/Skins/Deluxe/ocean.ini b/Themes/Deluxe/ocean.ini
index 3d9fbb65..3d9fbb65 100644
--- a/Skins/Deluxe/ocean.ini
+++ b/Themes/Deluxe/ocean.ini