57 files changed, 792 insertions, 234 deletions
diff --git a/Languages/German.ini b/Languages/German.ini
index a4c46742..6459dbdd 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -2,6 +2,7 @@
 SING_LOADING=Lade...
 
 SING_CHOOSE_MODE=Modus w�hlen
+
 SING_SING=Singen
 SING_SING_DESC=Singen
 
@@ -80,7 +81,7 @@ SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitz�hlen
 SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Songauswahl
 
 SING_LEGEND_SELECT=AUSW�HLEN
-SING_LEGEND_NAVIGATE=NAVIGIEREN
+SING_LEGEND_NAVIGATE=Navigieren
 
 SING_LEGEND_CONTINUE=weiter
 
@@ -161,7 +162,6 @@ SONG_MENU_JOKER=Joker
 
 SONG_MENU_NAME_PARTY_JOKER=Joker spielen
 
-
 SONG_JUMPTO_DESC=Jump to Song
 SONG_JUMPTO_TYPE_DESC=Suchen in:
 SONG_JUMPTO_TYPE1=Allem
@@ -172,44 +172,61 @@ SONG_JUMPTO_NOSONGSFOUND=Keinen Song gefunden
 SONG_JUMPTO_HELP=Text eingeben um zu suchen
 SONG_JUMPTO_CATTEXT=Suche nach: %s
 
-PARTY_ROUND=Runde
-PARTY_ROUND_WINNER=Sieger
 
-PARTY_SCORE_WINS=%s hat gewonnen!
-PARTY_OPTIONS_DESC=Party Modus
-PARTY_OPTIONS_OPTIONS=Party Optionen
-PARTY_OPTIONS_OPTIONS_DESC=Macht eure Einstellungen
+PARTY_MODE=Party Modus
 PARTY_DIFFICULTY=Schwierigkeit
 PARTY_PLAYLIST=Playlist Modus
-PARTY_ROUNDS=Runden
-PARTY_TEAMS=Teams
-PARTY_TEAMS_PLAYER1=Spieler Team1
-PARTY_TEAMS_PLAYER2=Spieler Team2
-PARTY_TEAMS_PLAYER3=Spieler Team3
-PARTY_SELECT_PLAYER=Gebt eure Team- und Spielernamen ein!
 PARTY_PLAYLIST_ALL=Alle Lieder
 PARTY_PLAYLIST_CATEGORY=Ordner
 PARTY_PLAYLIST_PLAYLIST=Playlist
+PARTY_ROUNDS=Runden
+PARTY_TEAMS=Teams
+PARTY_TEAMS_PLAYER1=Spieler Team 1
+PARTY_TEAMS_PLAYER2=Spieler Team 2
+PARTY_TEAMS_PLAYER3=Spieler Team 3
 
-PARTY_MODE=Party Modus
+PARTY_LEGEND_CONTINUE=weiter
 
-NEXT_ROUND=N�chste Runde:
-NEXT_ROUND_PLAYER=N�chste Runde spielt:
+PARTY_OPTIONS_DESC=Einstellungen f�r das Partyspiel.
+PARTY_OPTIONS_WHEREAMI=Party Optionen
 
-PARTY_DISMISSED=Ausgeschieden
+PARTY_PLAYER_DESC=Team- und Spielernamen eingeben.
+PARTY_PLAYER_WHEREAMI=Party Spielernamen
+PARTY_PLAYER_ENTER_NAME=Namen eingeben
+PARTY_PLAYER_LEGEND_CONTINUE=Party-Spiel starten
+
+PARTY_ROUND_DESC=Die n�chsten Spieler an die Micros!
+PARTY_ROUND_WHEREAMI=Party n�chste Runde
+PARTY_ROUND_LEGEND_CONTINUE=Runde starten
+
+PARTY_SCORE_DESC=Punkte der letzten Runde.
+PARTY_SCORE_WHEREAMI=Party Punkte
+
+PARTY_WIN_DESC=Gewinner des Partyspiels.
+PARTY_WIN_WHEREAMI=Party Gewinner
+PARTY_WIN_LEGEND_CONTINUE=zur�ck zum Hauptmenue
+
+PARTY_ROUND=Runde
+PARTY_ROUND_WINNER=Sieger
 PARTY_NOTPLAYEDYET=Noch nicht gespielt
 PARTY_NOBODY=Niemand
+NEXT_ROUND=N�chste Runde:
+
+PARTY_DISMISSED=Ausgeschieden
+PARTY_SCORE_WINS=Team %s hat gewonnen!
 
 PLUGIN_HDL_NAME=Balken halten
 PLUGIN_HDL_DESC=Halte die Bewertugnsanzeige im angezeigten Bereich
+
 PLUGIN_UNTIL5000_NAME=Bis 5000
 PLUGIN_UNTIL5000_DESC=Wer zuerst 5000 Punkte hat gewinnt.
+
 PLUGIN_DUELL_NAME=Duell
 PLUGIN_DUELL_DESC=Normales Spiel. H�chste Punkzahl gewinnt.
+
 PLUGIN_BLIND_NAME=Blind Mode
 PLUGIN_BLIND_DESC=Erreiche Blind die h�chste Punktzahl.
 
-
 STAT_MAIN_DESC=Statistiken
 
 STAT_OVERVIEW_INTRO=%0:s Statistiken. \n Letzter Reset am %1:.2d.%2:.2d.%3:d
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index b7c3c7b2..bab91903 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -9,23 +9,21 @@ Name=Blue
 Color=Blue
 
 [Textures]
-MainBar=Main Bar.jpg
-Logo=Main Bar2.jpg
-Bar=Bar.jpg
-ButtonF=Buttonf.jpg
-HDL_Pointer=Pointer.BMP
+
 
 # # # M A I N # # #
-Button=Button.jpg
+Button         = [main]button.jpg
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.jpg
 
 #Backgrounds
-LoadingBG      = LoadingBackground.jpg
-MainBG         = Blue.jpg
-SongBG         = Blue.jpg
-ScoreScreenBG  = Blue.jpg
-Top5BG         = Blue.jpg
-OptionsBG      = Blue.jpg
-PartyBG        = Blue.jpg
+LoadingBG      = x_[bg-load]blue.jpg
+MainBG         = x_[bg-main]blue.jpg
+SongBG         = x_[bg-main]blue.jpg
+ScoreScreenBG  = x_[bg-main]blue.jpg
+Top5BG         = x_[bg-main]blue.jpg
+OptionsBG      = x_[bg-main]blue.jpg
+PartyBG        = x_[bg-main]blue.jpg
 
 #Icons on screen
 SongCD         = [icon]cd.jpg
@@ -36,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg
 PartyIcon      = [icon]party.jpg
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.jpg
 SongSelection2 = [main]songSelection2.jpg
@@ -44,62 +43,68 @@ SongCover      = [main]songCover.jpg
 
 # # # S I N G # # #
 #the bar where the lyrics reside
-LyricBar      = [sing]textBar.jpg
+LyricBar       = [sing]textBar.jpg
 
 #this one slides in, to tell you that singing starts immediately
-LyricHelpBar  = [sing]lyricsHelpBar.bmp
+LyricHelpBar   = [sing]lyricsHelpBar.bmp
+
+#this one resides behind the timer-text
+Bar            = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
-LineBonusBack = [sing]lineBonusPopUp.jpg
+LineBonusBack  = [sing]lineBonusPopUp.jpg
 
 #Singbar (the thing beneath the scores)
-SingBarBack   = [sing]singBarBack.jpg
-SingBarBar    = [sing]singBarBar.jpg
-SingBarFront  = [sing]singBarFront.jpg
+SingBarBack    = [sing]singBarBack.jpg
+SingBarBar     = [sing]singBarBar.jpg
+SingBarFront   = [sing]singBarFront.jpg
 
 #Background for scores
-ScoreBG       = [sing]scoreBg.jpg
+ScoreBG        = [sing]scoreBg.jpg
 
 #Background for the P1, P2 and so on
-P             = [sing]p.jpg
+P              = [sing]p.jpg
 
 #Pointer for lyrics
-Ball          = Ball.bmp
+Ball           = [sing]LyricsBall.bmp
 
 
 # # # S C O R E / T O P 5 # # #
-ScoreBox        = Score Box.jpg
-ScoreLevel      = Score Level.jpg
-ScoreLevelRound = Score Level Round.jpg
+ScoreBox        = [score]box.jpg
+ScoreLevel      = [score]level.jpg
+ScoreLevelRound = [score]levelRound.jpg
 ScoreEndCap     = [score]endcap.jpg
-ScoreLine       = [main]scoreLine.jpg
+ScoreLine       = [score]line.jpg
 PlayerNumberBox = [main]playerNumberBox.jpg
 
 
 # # # P A R T Y # # #
-Joker=Joker.jpg
-[BG]PartyRound=[BG]PartyRound.jpg
-PartyPlayerButton=[party]playerButton.jpg
-PartyTeamButton1=[party]roundTeamButton.jpg
-PartyTeamButton2=[party]playerTeamButton.jpg
-PartyRoundBG1=[party]roundBG1.jpg
-PartyRoundBG2=[party]roundBG2.jpg
-PartyRoundBG3=[party]roundBG3.jpg
-PartyRoundBG4=[party]roundBG4.jpg
+Joker             =[party]Joker.jpg
+PartyPlayerButton =[party]playerButton.jpg
+PartyTeamButton1  =[party]roundTeamButton.jpg
+PartyTeamButton2  =[party]playerTeamButton.jpg
+PartyRoundBG1     =[party]roundBG1.jpg
+PartyRoundBG2     =[party]roundBG2.jpg
+PartyRoundBG3     =[party]roundBG3.jpg
+PartyRoundBG4     =[party]roundBG4.jpg
+HDL_Pointer       =[party]pointer.bmp
+
 
 # # # N A V I # # #
-ButtonP    = button_p.jpg
-ButtonM    = button_m.jpg
-ButtonJ    = button_j.jpg
-ButtonAlt  = button_alt.jpg
-ButtonAZ   = button_az.jpg
-ButtonEnter= button_enter.jpg
+ButtonP     = [button]p.jpg
+ButtonM     = [button]m.jpg
+ButtonJ     = [button]j.jpg
+ButtonAlt   = [button]alt.jpg
+ButtonAZ    = [button]az.jpg
+ButtonEnter = [button]enter.jpg
+ButtonNavi  = [button]navi.jpg
+
+Leiste1     = [special]bar1.jpg
+Leiste2     = [special]bar2.jpg
 
-Leiste1    = [special]bar1.jpg
-Leiste2    = [special]bar2.jpg
+JumpToBG    = [menu]jumpToBg.jpg
+SongMenuBG  = [menu]songMenuBg.jpg
 
-JumpToBG   = [menu]jumpToBg.jpg
-SongMenuBG = [menu]songMenuBg.jpg
 
 # # # N O T E S # # #
 GrayLeft    = [sing]notesLeft.bmp
@@ -115,6 +120,6 @@ NoteStar        = [effect]goldenNoteStar.jpg
 NotePerfectStar = [effect]perfectNoteStar.jpg
 
 
-#dirty helpers
-Rectangle = Rectangle.jpg
-ButtonFade = ButtonFade.jpg
-\ No newline at end of file
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.jpg
+\ No newline at end of file
diff --git a/Skins/Deluxe/Blue.jpg b/Skins/Deluxe/Blue.jpg
deleted file mode 100644
index 27b31463..00000000
--- a/Skins/Deluxe/Blue.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Joker.bak.jpg b/Skins/Deluxe/Joker.bak.jpg
deleted file mode 100644
index b1f469df..00000000
--- a/Skins/Deluxe/Joker.bak.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Left gray.bmp b/Skins/Deluxe/Left gray.bmp
deleted file mode 100644
index 328e0122..00000000
--- a/Skins/Deluxe/Left gray.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/Line.jpg b/Skins/Deluxe/Line.jpg
deleted file mode 100644
index b3540a60..00000000
--- a/Skins/Deluxe/Line.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/LoadingBackground.jpg b/Skins/Deluxe/LoadingBackground.jpg
deleted file mode 100644
index b05a1ab1..00000000
--- a/Skins/Deluxe/LoadingBackground.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/MainBG_Blue.jpg b/Skins/Deluxe/MainBG_Blue.jpg
deleted file mode 100644
index 27b31463..00000000
--- a/Skins/Deluxe/MainBG_Blue.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Mid gray.bmp b/Skins/Deluxe/Mid gray.bmp
deleted file mode 100644
index 90d97860..00000000
--- a/Skins/Deluxe/Mid gray.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/Note BG Left.bmp b/Skins/Deluxe/Note BG Left.bmp
deleted file mode 100644
index 83e61525..00000000
--- a/Skins/Deluxe/Note BG Left.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/Note BG Mid.bmp b/Skins/Deluxe/Note BG Mid.bmp
deleted file mode 100644
index bc85ede9..00000000
--- a/Skins/Deluxe/Note BG Mid.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/Note BG Right.bmp b/Skins/Deluxe/Note BG Right.bmp
deleted file mode 100644
index 62682410..00000000
--- a/Skins/Deluxe/Note BG Right.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/P.bak.jpg b/Skins/Deluxe/P.bak.jpg
deleted file mode 100644
index 6df17a72..00000000
--- a/Skins/Deluxe/P.bak.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/P.jpg b/Skins/Deluxe/P.jpg
deleted file mode 100644
index cb6ac136..00000000
--- a/Skins/Deluxe/P.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Right gray.bmp b/Skins/Deluxe/Right gray.bmp
deleted file mode 100644
index a4cbc1ae..00000000
--- a/Skins/Deluxe/Right gray.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/RoundPartyBG.JPG b/Skins/Deluxe/RoundPartyBG.JPG
deleted file mode 100644
index 7186b3ac..00000000
--- a/Skins/Deluxe/RoundPartyBG.JPG
+++ /dev/null
diff --git a/Skins/Deluxe/Score Line.jpg b/Skins/Deluxe/Score Line.jpg
deleted file mode 100644
index 2fd951aa..00000000
--- a/Skins/Deluxe/Score Line.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Sing Score BG.jpg b/Skins/Deluxe/Sing Score BG.jpg
deleted file mode 100644
index 9a1cc5e0..00000000
--- a/Skins/Deluxe/Sing Score BG.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Song Fade.jpg b/Skins/Deluxe/Song Fade.jpg
deleted file mode 100644
index 1d6b80ff..00000000
--- a/Skins/Deluxe/Song Fade.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Square.jpg b/Skins/Deluxe/Square.jpg
deleted file mode 100644
index 8af62b71..00000000
--- a/Skins/Deluxe/Square.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/Text Bar.jpg b/Skins/Deluxe/Text Bar.jpg
deleted file mode 100644
index 83f20f4f..00000000
--- a/Skins/Deluxe/Text Bar.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/W&C.ini b/Skins/Deluxe/W&C-Summer.ini
index 9fbc403b..4fc5533f 100644
--- a/Skins/Deluxe/W&C.ini
+++ b/Skins/Deluxe/W&C-Summer.ini
@@ -5,18 +5,16 @@
 
 [Skin]
 Theme=Deluxe
-Name=W & C
+Name=W&C-Summer
 Color=Blue
 
 [Textures]
-MainBar=Main Bar.jpg
-Logo=Main Bar2.jpg
-Bar=Bar.jpg
-ButtonF=Buttonf.jpg
-HDL_Pointer=Pointer.BMP
+
 
 # # # M A I N # # #
-Button=Button.jpg
+Button         = [main]button.jpg
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.jpg
 
 #Backgrounds
 LoadingBG      = [bg-load]summer.jpg
@@ -36,6 +34,7 @@ IconSongMenu   = [icon]songmenu.jpg
 ScoreIcon      = [icon]score.jpg
 PartyIcon      = [icon]party.jpg
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.jpg
 SongSelection2 = [main]songSelection2.jpg
@@ -44,62 +43,68 @@ SongCover      = [main]songCover.jpg
 
 # # # S I N G # # #
 #the bar where the lyrics reside
-LyricBar      = [sing]textBar.jpg
+LyricBar       = [sing]textBar.jpg
 
 #this one slides in, to tell you that singing starts immediately
-LyricHelpBar  = [sing]lyricsHelpBar.bmp
+LyricHelpBar   = [sing]lyricsHelpBar.bmp
+
+#this one resides behind the timer-text
+Bar            = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
-LineBonusBack = [sing]lineBonusPopUp.jpg
+LineBonusBack  = [sing]lineBonusPopUp.jpg
 
 #Singbar (the thing beneath the scores)
-SingBarBack   = [sing]singBarBack.jpg
-SingBarBar    = [sing]singBarBar.jpg
-SingBarFront  = [sing]singBarFront.jpg
+SingBarBack    = [sing]singBarBack.jpg
+SingBarBar     = [sing]singBarBar.jpg
+SingBarFront   = [sing]singBarFront.jpg
 
 #Background for scores
-ScoreBG       = [sing]scoreBg.jpg
+ScoreBG        = [sing]scoreBg.jpg
 
 #Background for the P1, P2 and so on
-P             = [sing]p.jpg
+P              = [sing]p.jpg
 
 #Pointer for lyrics
-Ball          = Ball.bmp
+Ball           = [sing]LyricsBall.bmp
 
 
 # # # S C O R E / T O P 5 # # #
-ScoreBox        = Score Box.jpg
-ScoreLevel      = Score Level.jpg
-ScoreLevelRound = Score Level Round.jpg
+ScoreBox        = [score]box.jpg
+ScoreLevel      = [score]level.jpg
+ScoreLevelRound = [score]levelRound.jpg
 ScoreEndCap     = [score]endcap.jpg
-ScoreLine       = [main]scoreLine.jpg
+ScoreLine       = [score]line.jpg
 PlayerNumberBox = [main]playerNumberBox.jpg
 
 
 # # # P A R T Y # # #
-Joker=Joker.jpg
-[BG]PartyRound=[BG]PartyRound.jpg
-PartyPlayerButton=[party]playerButton.jpg
-PartyTeamButton1=[party]roundTeamButton.jpg
-PartyTeamButton2=[party]playerTeamButton.jpg
-PartyRoundBG1=[party]roundBG1.jpg
-PartyRoundBG2=[party]roundBG2.jpg
-PartyRoundBG3=[party]roundBG3.jpg
-PartyRoundBG4=[party]roundBG4.jpg
+Joker             =[party]Joker.jpg
+PartyPlayerButton =[party]playerButton.jpg
+PartyTeamButton1  =[party]roundTeamButton.jpg
+PartyTeamButton2  =[party]playerTeamButton.jpg
+PartyRoundBG1     =[party]roundBG1.jpg
+PartyRoundBG2     =[party]roundBG2.jpg
+PartyRoundBG3     =[party]roundBG3.jpg
+PartyRoundBG4     =[party]roundBG4.jpg
+HDL_Pointer       =[party]pointer.bmp
+
 
 # # # N A V I # # #
-ButtonP    = button_p.jpg
-ButtonM    = button_m.jpg
-ButtonJ    = button_j.jpg
-ButtonAlt  = button_alt.jpg
-ButtonAZ   = button_az.jpg
-ButtonEnter= button_enter.jpg
+ButtonP     = [button]p.jpg
+ButtonM     = [button]m.jpg
+ButtonJ     = [button]j.jpg
+ButtonAlt   = [button]alt.jpg
+ButtonAZ    = [button]az.jpg
+ButtonEnter = [button]enter.jpg
+ButtonNavi  = [button]navi.jpg
+
+Leiste1     = [special]bar1.jpg
+Leiste2     = [special]bar2.jpg
 
-Leiste1    = [special]bar1.jpg
-Leiste2    = [special]bar2.jpg
+JumpToBG    = [menu]jumpToBg.jpg
+SongMenuBG  = [menu]songMenuBg.jpg
 
-JumpToBG   = [menu]jumpToBg.jpg
-SongMenuBG = [menu]songMenuBg.jpg
 
 # # # N O T E S # # #
 GrayLeft    = [sing]notesLeft.bmp
@@ -115,6 +120,6 @@ NoteStar        = [effect]goldenNoteStar.jpg
 NotePerfectStar = [effect]perfectNoteStar.jpg
 
 
-#dirty helpers
-Rectangle = Rectangle.jpg
-ButtonFade = ButtonFade.jpg
-\ No newline at end of file
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.jpg
+\ No newline at end of file
diff --git a/Skins/Deluxe/[BG]PartyRound.jpg b/Skins/Deluxe/[BG]PartyRound.jpg
deleted file mode 100644
index 164b1686..00000000
--- a/Skins/Deluxe/[BG]PartyRound.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[BG]PartyRounds.jpg b/Skins/Deluxe/[BG]PartyRounds.jpg
deleted file mode 100644
index 207e9c47..00000000
--- a/Skins/Deluxe/[BG]PartyRounds.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/button_alt.jpg b/Skins/Deluxe/[button]alt.jpg
index 193b8415..193b8415 100644
--- a/Skins/Deluxe/button_alt.jpg
+++ b/Skins/Deluxe/[button]alt.jpg
diff --git a/Skins/Deluxe/button_az.jpg b/Skins/Deluxe/[button]az.jpg
index d2c80a87..d2c80a87 100644
--- a/Skins/Deluxe/button_az.jpg
+++ b/Skins/Deluxe/[button]az.jpg
diff --git a/Skins/Deluxe/button_enter.jpg b/Skins/Deluxe/[button]enter.jpg
index 5de8decd..5de8decd 100644
--- a/Skins/Deluxe/button_enter.jpg
+++ b/Skins/Deluxe/[button]enter.jpg
diff --git a/Skins/Deluxe/button_j.jpg b/Skins/Deluxe/[button]j.jpg
index 7a1d5122..7a1d5122 100644
--- a/Skins/Deluxe/button_j.jpg
+++ b/Skins/Deluxe/[button]j.jpg
diff --git a/Skins/Deluxe/button_m.jpg b/Skins/Deluxe/[button]m.jpg
index 186ec4e8..186ec4e8 100644
--- a/Skins/Deluxe/button_m.jpg
+++ b/Skins/Deluxe/[button]m.jpg
diff --git a/Skins/Deluxe/[button]navi.jpg b/Skins/Deluxe/[button]navi.jpg
new file mode 100644
index 00000000..92e420c2
--- /dev/null
+++ b/Skins/Deluxe/[button]navi.jpg
diff --git a/Skins/Deluxe/button_p.jpg b/Skins/Deluxe/[button]p.jpg
index c5da3d9e..c5da3d9e 100644
--- a/Skins/Deluxe/button_p.jpg
+++ b/Skins/Deluxe/[button]p.jpg
diff --git a/Skins/Deluxe/ButtonFade.jpg b/Skins/Deluxe/[helper]buttonFade.jpg
index 6de293f7..6de293f7 100644
--- a/Skins/Deluxe/ButtonFade.jpg
+++ b/Skins/Deluxe/[helper]buttonFade.jpg
diff --git a/Skins/Deluxe/rectangle.jpg b/Skins/Deluxe/[helper]rectangle.jpg
index e03f98fc..e03f98fc 100644
--- a/Skins/Deluxe/rectangle.jpg
+++ b/Skins/Deluxe/[helper]rectangle.jpg
diff --git a/Skins/Deluxe/Button.jpg b/Skins/Deluxe/[main]button.jpg
index 15a34c66..15a34c66 100644
--- a/Skins/Deluxe/Button.jpg
+++ b/Skins/Deluxe/[main]button.jpg
diff --git a/Skins/Deluxe/Buttonf.jpg b/Skins/Deluxe/[main]buttonf.jpg
index d844add5..d844add5 100644
--- a/Skins/Deluxe/Buttonf.jpg
+++ b/Skins/Deluxe/[main]buttonf.jpg
diff --git a/Skins/Deluxe/Main Bar.jpg b/Skins/Deluxe/[main]mainBar.jpg
index fa4cbd78..fa4cbd78 100644
--- a/Skins/Deluxe/Main Bar.jpg
+++ b/Skins/Deluxe/[main]mainBar.jpg
diff --git a/Skins/Deluxe/Joker.jpg b/Skins/Deluxe/[party]Joker.jpg
index e2a18684..e2a18684 100644
--- a/Skins/Deluxe/Joker.jpg
+++ b/Skins/Deluxe/[party]Joker.jpg
diff --git a/Skins/Deluxe/Pointer.bmp b/Skins/Deluxe/[party]pointer.bmp
index 88bbcc3d..88bbcc3d 100644
--- a/Skins/Deluxe/Pointer.bmp
+++ b/Skins/Deluxe/[party]pointer.bmp
diff --git a/Skins/Deluxe/[main]scoreLine.jpg b/Skins/Deluxe/[score]Line.jpg
index 61cf33f5..61cf33f5 100644
--- a/Skins/Deluxe/[main]scoreLine.jpg
+++ b/Skins/Deluxe/[score]Line.jpg
diff --git a/Skins/Deluxe/Score Box.jpg b/Skins/Deluxe/[score]box.jpg
index b37f7e46..b37f7e46 100644
--- a/Skins/Deluxe/Score Box.jpg
+++ b/Skins/Deluxe/[score]box.jpg
diff --git a/Skins/Deluxe/Score Level.jpg b/Skins/Deluxe/[score]level.jpg
index 9e9c4086..9e9c4086 100644
--- a/Skins/Deluxe/Score Level.jpg
+++ b/Skins/Deluxe/[score]level.jpg
diff --git a/Skins/Deluxe/Score Level Round.jpg b/Skins/Deluxe/[score]levelRound.jpg
index 38cfddea..38cfddea 100644
--- a/Skins/Deluxe/Score Level Round.jpg
+++ b/Skins/Deluxe/[score]levelRound.jpg
diff --git a/Skins/Deluxe/Ball3.bmp b/Skins/Deluxe/[sing]LyricsBall.bmp
index 5b7d7943..5b7d7943 100644
--- a/Skins/Deluxe/Ball3.bmp
+++ b/Skins/Deluxe/[sing]LyricsBall.bmp
diff --git a/Skins/Deluxe/[sing]lyricsHelpBar.bak.bmp b/Skins/Deluxe/[sing]lyricsHelpBar.bak.bmp
deleted file mode 100644
index 5c5a85f6..00000000
--- a/Skins/Deluxe/[sing]lyricsHelpBar.bak.bmp
+++ /dev/null
diff --git a/Skins/Deluxe/Bar.jpg b/Skins/Deluxe/[sing]timeBar.jpg
index e6191a95..e6191a95 100644
--- a/Skins/Deluxe/Bar.jpg
+++ b/Skins/Deluxe/[sing]timeBar.jpg
diff --git a/Skins/Deluxe/[special]bar1.jpg b/Skins/Deluxe/[special]bar1.jpg
index e73fdb54..e264440a 100644
--- a/Skins/Deluxe/[special]bar1.jpg
+++ b/Skins/Deluxe/[special]bar1.jpg
diff --git a/Skins/Deluxe/x_W&C-Autum.ini b/Skins/Deluxe/x_W&C-Autum.ini
new file mode 100644
index 00000000..eba30c44
--- /dev/null
+++ b/Skins/Deluxe/x_W&C-Autum.ini
@@ -0,0 +1,125 @@
+;0.5.1
+;experimental version
+;if you are using this as a sample for your theme
+;don't be suprised it doesn't work good with newer releases
+
+[Skin]
+Theme=Deluxe
+Name=W&C-Autum
+Color=Orange
+
+[Textures]
+
+
+# # # M A I N # # #
+Button         = [main]button.jpg
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.jpg
+
+#Backgrounds
+LoadingBG      = x_[bg-load]autum.jpg
+MainBG         = x_[bg-main]autum.jpg
+SongBG         = x_[bg-main]autum.jpg
+ScoreScreenBG  = x_[bg-main]autum.jpg
+Top5BG         = x_[bg-main]autum.jpg
+OptionsBG      = x_[bg-main]autum.jpg
+PartyBG        = x_[bg-main]autum.jpg
+
+#Icons on screen
+SongCD         = [icon]cd.jpg
+MainIcon       = [icon]main.jpg
+MainSearch     = [icon]search.jpg
+IconOption     = [icon]options.jpg
+IconSongMenu   = [icon]songmenu.jpg
+ScoreIcon      = [icon]score.jpg
+PartyIcon      = [icon]party.jpg
+
+
+# # # S O N G S E L E C E T # # #
+SongSelection1 = [main]songSelection1.jpg
+SongSelection2 = [main]songSelection2.jpg
+SongCover      = [main]songCover.jpg
+
+
+# # # S I N G # # #
+#the bar where the lyrics reside
+LyricBar       = [sing]textBar.jpg
+
+#this one slides in, to tell you that singing starts immediately
+LyricHelpBar   = [sing]lyricsHelpBar.bmp
+
+#this one resides behind the timer-text
+Bar            = [sing]timeBar.jpg
+
+#linebonus, the thing that pop ups at the score
+LineBonusBack  = [sing]lineBonusPopUp.jpg
+
+#Singbar (the thing beneath the scores)
+SingBarBack    = [sing]singBarBack.jpg
+SingBarBar     = [sing]singBarBar.jpg
+SingBarFront   = [sing]singBarFront.jpg
+
+#Background for scores
+ScoreBG        = [sing]scoreBg.jpg
+
+#Background for the P1, P2 and so on
+P              = [sing]p.jpg
+
+#Pointer for lyrics
+Ball           = [sing]LyricsBall.bmp
+
+
+# # # S C O R E / T O P 5 # # #
+ScoreBox        = [score]box.jpg
+ScoreLevel      = [score]level.jpg
+ScoreLevelRound = [score]levelRound.jpg
+ScoreEndCap     = [score]endcap.jpg
+ScoreLine       = [score]line.jpg
+PlayerNumberBox = [main]playerNumberBox.jpg
+
+
+# # # P A R T Y # # #
+Joker             =[party]Joker.jpg
+PartyPlayerButton =[party]playerButton.jpg
+PartyTeamButton1  =[party]roundTeamButton.jpg
+PartyTeamButton2  =[party]playerTeamButton.jpg
+PartyRoundBG1     =[party]roundBG1.jpg
+PartyRoundBG2     =[party]roundBG2.jpg
+PartyRoundBG3     =[party]roundBG3.jpg
+PartyRoundBG4     =[party]roundBG4.jpg
+HDL_Pointer       =[party]pointer.bmp
+
+
+# # # N A V I # # #
+ButtonP     = [button]p.jpg
+ButtonM     = [button]m.jpg
+ButtonJ     = [button]j.jpg
+ButtonAlt   = [button]alt.jpg
+ButtonAZ    = [button]az.jpg
+ButtonEnter = [button]enter.jpg
+ButtonNavi  = [button]navi.jpg
+
+Leiste1     = [special]bar1.jpg
+Leiste2     = [special]bar2.jpg
+
+JumpToBG    = [menu]jumpToBg.jpg
+SongMenuBG  = [menu]songMenuBg.jpg
+
+
+# # # N O T E S # # #
+GrayLeft    = [sing]notesLeft.bmp
+GrayMid     = [sing]notesMid.bmp
+GrayRight   = [sing]notesRight.bmp
+NoteBGLeft  = [sing]notesBgLeft.bmp
+NoteBGMid   = [sing]notesBgMid.bmp
+NoteBGRight = [sing]notesBgRight.bmp
+
+
+# # # E F F E C T S # # #
+NoteStar        = [effect]goldenNoteStar.jpg
+NotePerfectStar = [effect]perfectNoteStar.jpg
+
+
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.jpg
+\ No newline at end of file
diff --git a/Skins/Deluxe/x_W&C-Winter.ini b/Skins/Deluxe/x_W&C-Winter.ini
new file mode 100644
index 00000000..e7800aac
--- /dev/null
+++ b/Skins/Deluxe/x_W&C-Winter.ini
@@ -0,0 +1,125 @@
+;0.5.1
+;experimental version
+;if you are using this as a sample for your theme
+;don't be suprised it doesn't work good with newer releases
+
+[Skin]
+Theme=Deluxe
+Name=W&C-Winter
+Color=Blue
+
+[Textures]
+
+
+# # # M A I N # # #
+Button         = [main]button.jpg
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.jpg
+
+#Backgrounds
+LoadingBG      = x_[bg-load]winter.jpg
+MainBG         = x_[bg-main]winter.jpg
+SongBG         = x_[bg-main]winter.jpg
+ScoreScreenBG  = x_[bg-main]winter.jpg
+Top5BG         = x_[bg-main]winter.jpg
+OptionsBG      = x_[bg-main]winter.jpg
+PartyBG        = x_[bg-main]winter.jpg
+
+#Icons on screen
+SongCD         = [icon]cd.jpg
+MainIcon       = [icon]main.jpg
+MainSearch     = [icon]search.jpg
+IconOption     = [icon]options.jpg
+IconSongMenu   = [icon]songmenu.jpg
+ScoreIcon      = [icon]score.jpg
+PartyIcon      = [icon]party.jpg
+
+
+# # # S O N G S E L E C E T # # #
+SongSelection1 = [main]songSelection1.jpg
+SongSelection2 = [main]songSelection2.jpg
+SongCover      = [main]songCover.jpg
+
+
+# # # S I N G # # #
+#the bar where the lyrics reside
+LyricBar       = [sing]textBar.jpg
+
+#this one slides in, to tell you that singing starts immediately
+LyricHelpBar   = [sing]lyricsHelpBar.bmp
+
+#this one resides behind the timer-text
+Bar            = [sing]timeBar.jpg
+
+#linebonus, the thing that pop ups at the score
+LineBonusBack  = [sing]lineBonusPopUp.jpg
+
+#Singbar (the thing beneath the scores)
+SingBarBack    = [sing]singBarBack.jpg
+SingBarBar     = [sing]singBarBar.jpg
+SingBarFront   = [sing]singBarFront.jpg
+
+#Background for scores
+ScoreBG        = [sing]scoreBg.jpg
+
+#Background for the P1, P2 and so on
+P              = [sing]p.jpg
+
+#Pointer for lyrics
+Ball           = [sing]LyricsBall.bmp
+
+
+# # # S C O R E / T O P 5 # # #
+ScoreBox        = [score]box.jpg
+ScoreLevel      = [score]level.jpg
+ScoreLevelRound = [score]levelRound.jpg
+ScoreEndCap     = [score]endcap.jpg
+ScoreLine       = [score]line.jpg
+PlayerNumberBox = [main]playerNumberBox.jpg
+
+
+# # # P A R T Y # # #
+Joker             =[party]Joker.jpg
+PartyPlayerButton =[party]playerButton.jpg
+PartyTeamButton1  =[party]roundTeamButton.jpg
+PartyTeamButton2  =[party]playerTeamButton.jpg
+PartyRoundBG1     =[party]roundBG1.jpg
+PartyRoundBG2     =[party]roundBG2.jpg
+PartyRoundBG3     =[party]roundBG3.jpg
+PartyRoundBG4     =[party]roundBG4.jpg
+HDL_Pointer       =[party]pointer.bmp
+
+
+# # # N A V I # # #
+ButtonP     = [button]p.jpg
+ButtonM     = [button]m.jpg
+ButtonJ     = [button]j.jpg
+ButtonAlt   = [button]alt.jpg
+ButtonAZ    = [button]az.jpg
+ButtonEnter = [button]enter.jpg
+ButtonNavi  = [button]navi.jpg
+
+Leiste1     = [special]bar1.jpg
+Leiste2     = [special]bar2.jpg
+
+JumpToBG    = [menu]jumpToBg.jpg
+SongMenuBG  = [menu]songMenuBg.jpg
+
+
+# # # N O T E S # # #
+GrayLeft    = [sing]notesLeft.bmp
+GrayMid     = [sing]notesMid.bmp
+GrayRight   = [sing]notesRight.bmp
+NoteBGLeft  = [sing]notesBgLeft.bmp
+NoteBGMid   = [sing]notesBgMid.bmp
+NoteBGRight = [sing]notesBgRight.bmp
+
+
+# # # E F F E C T S # # #
+NoteStar        = [effect]goldenNoteStar.jpg
+NotePerfectStar = [effect]perfectNoteStar.jpg
+
+
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.jpg
+\ No newline at end of file
diff --git a/Skins/Deluxe/x_[bg-load]autum.jpg b/Skins/Deluxe/x_[bg-load]autum.jpg
new file mode 100644
index 00000000..6ddc97ce
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-load]autum.jpg
diff --git a/Skins/Deluxe/x_[bg-load]blue.jpg b/Skins/Deluxe/x_[bg-load]blue.jpg
new file mode 100644
index 00000000..b341ea96
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-load]blue.jpg
diff --git a/Skins/Deluxe/x_[bg-load]winter.jpg b/Skins/Deluxe/x_[bg-load]winter.jpg
new file mode 100644
index 00000000..b2dc9b34
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-load]winter.jpg
diff --git a/Skins/Deluxe/x_[bg-main]autum.jpg b/Skins/Deluxe/x_[bg-main]autum.jpg
new file mode 100644
index 00000000..60e215e5
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-main]autum.jpg
diff --git a/Skins/Deluxe/x_[bg-main]blue.jpg b/Skins/Deluxe/x_[bg-main]blue.jpg
new file mode 100644
index 00000000..856ec781
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-main]blue.jpg
diff --git a/Skins/Deluxe/x_[bg-main]winter.jpg b/Skins/Deluxe/x_[bg-main]winter.jpg
new file mode 100644
index 00000000..06f905b6
--- /dev/null
+++ b/Skins/Deluxe/x_[bg-main]winter.jpg
diff --git a/Skins/Deluxe/x_[button]esc.jpg b/Skins/Deluxe/x_[button]esc.jpg
new file mode 100644
index 00000000..a27259c2
--- /dev/null
+++ b/Skins/Deluxe/x_[button]esc.jpg
diff --git a/Skins/Deluxe/x_[icon]stats.jpg b/Skins/Deluxe/x_[icon]stats.jpg
new file mode 100644
index 00000000..505a6709
--- /dev/null
+++ b/Skins/Deluxe/x_[icon]stats.jpg
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index a0a6abb9..f278491d 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -54,30 +54,12 @@ Align=0
 Text=US_VERSION
 
 [Main]
-Texts =1
-Statics=2
+Texts =2
+Statics=4
 
 [MainBackground]
 Tex=MainBG
 
-[MainText1]
-X =120
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=0
-Text=SING_MENU
-
-[MainTextDescriptionLong]
-X =300
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=0
-Text=
-
 [MainStatic1]
 X =0
 Y =549
@@ -101,23 +83,51 @@ Reflection=1
 ReflectionSpacing=1
 
 [MainStatic3]
-X =600
+X =260
 Y =553
-W =22
+W =26
 H =22
-Tex=ButtonM
+Tex=ButtonNavi
+Color =White
+Type=Plain
+Style=5
+
+[MainStatic4]
+X =384
+Y =553
+W =26
+H =22
+Tex=ButtonEnter
 Color =White
 Type=Plain
 Style=5
 
+[MainText1]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=SING_MENU
+
 [MainText2]
-X =625
+X =290
 Y =552
 Color=Black
 Font =0
 Size =7
 Align=0
-Text=PARTY_OPTIONS_DESC
+Text=SING_LEGEND_NAVIGATE
+
+[MainTextDescriptionLong]
+X =414
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=
 
 [MainButtonSolo]
 X =180
@@ -324,7 +334,7 @@ PieceW=6
 PieceH=6
 Space=1
 Bands=5
-Length=16
+Length=18
 
 [SongText1]
 X =70
@@ -354,12 +364,12 @@ Tex =SongCD
 Type=Font Black
 
 [SongText2]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=SING_SONGSELECTION
 
 [SongStatic2]
@@ -1087,12 +1097,12 @@ Reflection=1
 ReflectionSpacing=1
 
 [ScoreText2]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=song score
 
 [ScoreStatic4]
@@ -2396,12 +2406,12 @@ Reflection=1
 ReflectionSpacing=1
 
 [OptionsText2]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=SING_OPTIONS
 
 [OptionsText3]
@@ -3560,12 +3570,12 @@ Reflection=1
 ReflectionSpacing=1
 
 [Top5Text2]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=SING_TOP_5_CHARTS
 
 [Top5Static4]
@@ -3822,12 +3832,12 @@ Tex =MainIcon
 Type=Font Black
 
 [LevelText3]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=SING_SING_MODE
 
 [LevelText4]
@@ -3931,12 +3941,12 @@ Reflection=1
 ReflectionSpacing=1
 
 [NameText2]
-X =120
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
+Align=2
 Text=SING_OPTIONS_GAME_PLAYERS
 
 [NameText3]
@@ -4094,21 +4104,81 @@ Color=White
 Text=
 
 [PartyNewRound]
-Texts =8
+Texts =7
 
 [PartyNewRoundBackground]
 Tex=MainBG
 
+[PartyNewRoundStatic1]
+X =0
+Y =549
+W =252
+H =28
+Tex=Leiste1
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyNewRoundStatic2]
+X =254
+Y =549
+W =548
+H =28
+Tex=Leiste2
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyNewRoundStatic3]
+X =40
+Y =22
+W =27
+H =27
+Color =White
+Tex =PartyIcon
+Type=Font Black
+
 [PartyNewRoundText1]
 X =70
 Y =6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 20
 Color =White
+Text=PARTY_MODE
+
+[PartyNewRoundText2]
+X =70
+Y =53
+Color=White
 Font =0
-Size =20
-Text =Party Modus
+Size =10
+Align =0
+Text=PARTY_ROUND_DESC
+
+[PartyNewRoundText3]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=PARTY_ROUND_WHEREAMI
+
+[PartyNewRoundText4]
+X =290
+Y =552
+Color=Black
+Font =0
+Size =7
 Align=0
+Text=PARTY_ROUND_LEGEND_CONTINUE
 
-[PartyNewRoundText2]
+[PartyNewRoundText5]
 X =460
 Y =100
 Color =White
@@ -4117,7 +4187,7 @@ Size =10
 Text =PARTY_ROUND
 Align=0
 
-[PartyNewRoundText3]
+[PartyNewRoundText6]
 X =600
 Y =100
 Color =White
@@ -4126,16 +4196,7 @@ Size =10
 Text =PARTY_ROUND_WINNER
 Align=0
 
-[PartyNewRoundText4]
-X =290
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=0
-Text=PARTY_ROUND_DESC
-
-[PartyNewRoundText5]
+[PartyNewRoundText7]
 X =448
 Y =350
 Color =White
@@ -4171,7 +4232,7 @@ Size =7
 Align=0
 Text=Dummytext, Player2, Player3, Player4
 
-[PartyNewRoundStatic1]
+[PartyNewRoundStatic4]
 Tex =PartyRoundBG1
 X =450
 Y =103
@@ -4181,29 +4242,7 @@ Int=1
 Color =DarkBlue
 Type=Font Black
 
-[PartyNewRoundStatic2]
-X =0
-Y =549
-W =252
-H =28
-Tex=Leiste1
-Color =White
-Type=Plain
-Reflection=1
-ReflectionSpacing=1
-
-[PartyNewRoundStatic3]
-X =254
-Y =549
-W =548
-H =28
-Tex=Leiste2
-Color =White
-Type=Plain
-Reflection=1
-ReflectionSpacing=1
-
-[PartyNewRoundStatic4]
+[PartyNewRoundStatic5]
 X =260
 Y =553
 W =26
@@ -4212,15 +4251,6 @@ Tex=ButtonEnter
 Color =White
 Type=Plain
 
-[PartyNewRoundStatic5]
-X =40
-Y =22
-W =27
-H =27
-Color =White
-Tex =PartyIcon
-Type=Font Black
-
 [PartyNewRoundStatic6]
 Tex =PartyRoundBG3
 X =250
@@ -4601,11 +4631,89 @@ Align=1
 
 
 [PartyScore]
-Texts=0
+Texts=4
 
 [PartyScoreBackground]
 Tex=PartyBG
 
+[PartyScoreStatic1]
+X =0
+Y =549
+W =252
+H =28
+Tex=Leiste1
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyScoreStatic2]
+X =254
+Y =549
+W =548
+H =28
+Tex=Leiste2
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyScoreStatic3]
+X =40
+Y =22
+W =27
+H =27
+Color =White
+Tex =PartyIcon
+Type=Font Black
+
+[PartyScoreStatic4]
+X =260
+Y =553
+W =26
+H =22
+Tex=ButtonEnter
+Color =White
+Type=Plain
+
+[PartyScoreText1]
+X =70
+Y =6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 20
+Color =White
+Text=PARTY_MODE
+
+[PartyScoreText2]
+X =70
+Y =53
+Color=White
+Font =0
+Size =10
+Align =0
+Text=PARTY_SCORE_DESC
+
+[PartyScoreText3]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=PARTY_SCORE_WHEREAMI
+
+[PartyScoreText4]
+X =290
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=PARTY_LEGEND_CONTINUE
+
 [PartyScoreTextWinner]
 X =150
 Y =20
@@ -4700,11 +4808,89 @@ Int = 1
 Type=Font Black
 
 [PartyWin]
-Texts=0
+Texts=4
 
 [PartyWinBackground]
 Tex=PartyBG
 
+[PartyWinStatic1]
+X =0
+Y =549
+W =252
+H =28
+Tex=Leiste1
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyWinStatic2]
+X =254
+Y =549
+W =548
+H =28
+Tex=Leiste2
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[PartyWinStatic3]
+X =40
+Y =22
+W =27
+H =27
+Color =White
+Tex =PartyIcon
+Type=Font Black
+
+[PartyWinStatic4]
+X =260
+Y =553
+W =26
+H =22
+Tex=ButtonEnter
+Color =White
+Type=Plain
+
+[PartyWinText1]
+X =70
+Y =6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 20
+Color =White
+Text=PARTY_MODE
+
+[PartyWinText2]
+X =70
+Y =53
+Color=White
+Font =0
+Size =10
+Align =0
+Text=PARTY_WIN_DESC
+
+[PartyWinText3]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=PARTY_WIN_WHEREAMI
+
+[PartyWinText4]
+X =290
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=PARTY_WIN_LEGEND_CONTINUE
+
 [PartyWinTextWinner]
 X =150
 Y =20
@@ -4800,7 +4986,7 @@ Type=Font Black
 
 
 [PartyOptions]
-Texts = 3
+Texts = 5
 
 [PartyOptionsBackground]
 Tex=PartyBG
@@ -4836,6 +5022,26 @@ Color =White
 Tex =PartyIcon
 Type=Font Black
 
+[PartyOptionsStatic4]
+X =260
+Y =553
+W =26
+H =22
+Tex=ButtonNavi
+Color =White
+Type=Plain
+Style=5
+
+[PartyOptionsStatic5]
+X =384
+Y =553
+W =26
+H =22
+Tex=ButtonEnter
+Color =White
+Type=Plain
+Style=5
+
 [PartyOptionsText1]
 X =70
 Y =6
@@ -4845,25 +5051,43 @@ ColB = 0.7
 Font = 0
 Size = 20
 Color =White
-Text=PARTY_OPTIONS_DESC
+Text=PARTY_MODE
 
 [PartyOptionsText2]
-X =120
+X =70
+Y =53
+Color=White
+Font =0
+Size =10
+Align =0
+Text=PARTY_OPTIONS_DESC
+
+[PartyOptionsText3]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=PARTY_OPTIONS_WHEREAMI
+
+[PartyOptionsText4]
+X =290
 Y =552
 Color=Black
 Font =0
 Size =7
 Align=0
-Text=PARTY_OPTIONS_OPTIONS
+Text=SING_LEGEND_NAVIGATE
 
-[PartyOptionsText3]
-X =300
+[PartyOptionsText5]
+X =414
 Y =552
 Color=Black
 Font =0
 Size =7
 Align=0
-Text=PARTY_OPTIONS_OPTIONS_DESC
+Text=SING_LEGEND_CONTINUE
 
 [PartyOptionsSelectLevel]
 Tex = MainBar
@@ -5036,40 +5260,11 @@ STDColor = GrayDark
 
 
 [PartyPlayer]
-Texts=3
+Texts=6
 
 [PartyPlayerBackground]
 Tex=PartyBG
 
-[PartyPlayerText1]
-X =70
-Y =6
-ColR = 0.7
-ColG = 0.7
-ColB = 0.7
-Font = 0
-Size = 20
-Color =White
-Text=PARTY_OPTIONS_DESC
-
-[PartyPlayerText2]
-X =120
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=0
-Text=SING_OPTIONS_GAME_PLAYERS
-
-[PartyPlayerText3]
-X =300
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=0
-Text=PARTY_SELECT_PLAYER
-
 [PartyPlayerStatic1]
 X =0
 Y =549
@@ -5101,6 +5296,92 @@ Color =White
 Tex =PartyIcon
 Type=Font Black
 
+[PartyPlayerStatic4]
+X =260
+Y =553
+W =26
+H =22
+Tex=ButtonNavi
+Color =White
+Type=Plain
+Style=5
+
+[PartyPlayerStatic5]
+X =384
+Y =553
+W =26
+H =22
+Tex=ButtonAZ
+Color =White
+Type=Plain
+Style=5
+
+[PartyPlayerStatic6]
+X =552
+Y =553
+W =26
+H =22
+Tex=ButtonEnter
+Color =White
+Type=Plain
+Style=5
+
+[PartyPlayerText1]
+X =70
+Y =6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 20
+Color =White
+Text=PARTY_MODE
+
+[PartyPlayerText2]
+X =70
+Y =53
+Color=White
+Font =0
+Size =10
+Align =0
+Text=PARTY_PLAYER_DESC
+
+[PartyPlayerText3]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=PARTY_PLAYER_WHEREAMI
+
+[PartyPlayerText4]
+X =290
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=SING_LEGEND_NAVIGATE
+
+[PartyPlayerText5]
+X =414
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=PARTY_PLAYER_ENTER_NAME
+
+[PartyPlayerText6]
+X =582
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=PARTY_PLAYER_LEGEND_CONTINUE
+
 [PartyPlayerTeam1Name]
 Tex=PartyTeamButton2
 X=85