medley mod: Themes modifications. This is considered the last part of the medley mod.

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

10 files changed, 277 insertions, 257 deletions

diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index c0133d25..53b4b6b0 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -422,7 +422,7 @@ Y = 120
 W = 325
 H = 200
 Reflections = 1
-Style=5
+Style = 5
 
 [SongEqualizer]
 Visible = 1
@@ -451,6 +451,30 @@ Type = Transparent
 Reflection = 1
 ReflectionSpacing = 22
 
+[SongMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_medley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
+[SongCalculatedMedleyIcon]
+X = 335
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_calcmedley
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
 [SongStatic3]
 X = 278
 Y = 120
@@ -962,15 +986,14 @@ TexY1 = 0
 TexX2 = 1
 TexY2 = 1
 
-
 [Sing]
 Texts = 1
 
 [SingBackground]
-Type=color
-ColR=1
-ColB=1
-ColG=1
+Type = color
+ColR = 1
+ColB = 1
+ColG = 1
 
 [SingText1]
 Text = SING_TIME
@@ -1278,6 +1301,24 @@ Y = 95
 W = 100
 H = 8
 
+[SingSongNameStatic]
+Tex = SongName
+X = 10
+Y = 10
+W = 780
+H = 29
+Color = White
+Type = Transparent
+
+[SingSongNameText]
+Text = SongNameText
+X = 400
+Y = 13
+Font = 0
+Size = 25
+Color = Black
+Align = 1
+
 [Score]
 Texts = 1
 
@@ -2533,6 +2574,30 @@ Tex = ScoreLine
 Type = Colorized
 Color = White
 
+[ScoreStaticNavigate]
+X = 440
+Y = 545
+W = 32
+H = 30
+Z = 0.5
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[ScoreTextNavigate]
+X = 480
+Y = 548
+Z = 0.5
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_LEGEND_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 13
+
 [Options]
 Texts = 6
 Fade = 2
@@ -2641,8 +2706,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = SING_LEGEND_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
 
 [OptionsStatic6]
 X = 550
@@ -4661,7 +4726,6 @@ Size = 42
 Align = 2
 Text = 00000
 
-
 [Top5TextDate1]
 X = 760
 Y = 190
@@ -4855,8 +4919,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = SING_EDIT_SELECT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
 
 # Esc button text
 [EditText5]
@@ -4867,8 +4931,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = SING_EDIT_EXIT
-Reflection=1
-ReflectionSpacing=13
+Reflection = 1
+ReflectionSpacing = 13
 
 [EditTextDescription]
 X = 95
@@ -5663,7 +5727,6 @@ Color = P3Light
 Reflection = 1
 ReflectionSpacing = 2
 
-
 [PartyNewRoundTextRound1]
 X = 460
 Y = 133
@@ -5952,7 +6015,6 @@ Size = 30
 Text = Player 3
 Align = 1
 
-
 [PartyScore]
 Texts = 5
 
@@ -6489,7 +6551,6 @@ Color = P1Dark
 Reflection = 1
 ReflectionSpacing = 2
 
-
 [PartyWinStaticTeam1Deco]
 Tex = PartyWinDeco1
 X = 91
@@ -6911,7 +6972,6 @@ STColor = White
 STDColor = GrayDark
 
 
-
 [PartyPlayer]
 Texts = 6
 
@@ -7136,7 +7196,6 @@ SBGDColor = P3Light
 STColor = White
 STDColor = GrayDark
 
-
 [PartyPlayerTeam1Name]
 Tex = PartyTeamButton2
 X = 45
@@ -7466,7 +7525,6 @@ Text = Player 12
 Color = White
 
 
-
 [PartyRoundsBackground]
 Tex = PartyBG
 
@@ -7755,15 +7813,14 @@ STColor = White
 STDColor = GrayDark
 
 
-
 [SongMenu]
 
 [SongMenuBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
 
 [SongMenuStatic1]
 Tex = interface_dialog_background
@@ -7907,11 +7964,11 @@ Z = 0.97
 [SongJumpto]
 
 [SongJumptoBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.5
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.5
 
 [SongJumptoStatic1]
 Tex = interface_dialog_background
@@ -7991,7 +8048,6 @@ Text = SONG_JUMPTO_HELP
 Align = 0
 Z = 0.97
 
-
 [StatMain]
 Texts = 0
 Statics = 0
@@ -8545,11 +8601,11 @@ Text = SING_LEGEND_ESC
 [CheckPopup]
 
 [CheckPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
 
 [CheckPopupStatic1]
 Tex = interface_dialog_background
@@ -8629,15 +8685,14 @@ Text = NO
 Align = 1
 Z = 1
 
-
 [ErrorPopup]
 
 [ErrorPopupBackground]
-Type=Fade
-ColR=0
-ColG=0
-ColB=0
-Alpha=0.4
+Type = Fade
+ColR = 0
+ColG = 0
+ColB = 0
+Alpha = 0.4
 
 [ErrorPopupStatic1]
 Tex = interface_dialog_background
diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 3ebc04ff..7e31c570 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Blue
-Color=Blue
+Theme = Deluxe
+Name  = Blue
+Color = Blue
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -189,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 4502be61..3191daf8 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Fall
-Color=Orange
+Theme = Deluxe
+Name  = Fall
+Color = Orange
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -189,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index 8af41f20..a998874a 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Ocean
-Color=Blue
+Theme = Deluxe
+Name  = Ocean
+Color = Blue
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -189,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index 06a4dd41..357582c0 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Ribbon
-Color=Any
+Theme = Deluxe
+Name  = Ribbon
+Color = Any
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,27 +143,26 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
 # # # S T A T S # # #
@@ -171,7 +171,6 @@ StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -188,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -207,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index 660a5ec7..4aaebac1 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Summer
-Color=Red
+Theme = Deluxe
+Name  = Summer
+Color = Red
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -189,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 71b4dfaa..d738c32f 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -4,9 +4,9 @@
 ;don't be suprised it doesn't work good with newer releases
 
 [Skin]
-Theme=Deluxe
-Name=Winter
-Color=Blue
+Theme = Deluxe
+Name  = Winter
+Color = Blue
 
 [Textures]
 /**
@@ -24,7 +24,8 @@ Cursor_Pressed = [interface]cursor_pressed.png
 icon_song_menu   = [icon]song_menu.png
 icon_song_search = [icon]song_search.png
 icon_song_video  = [icon]song_video.png
-
+icon_song_medley = [icon]song_medley.png
+icon_song_calcmedley = [icon]song_calcmedley.png
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -32,7 +33,7 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowLeft  = [interface]select_arrow_left.png
 Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
@@ -60,13 +61,11 @@ VideoIcon      = [icon]video.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
 SongCover      = [main]songCover.jpg
 
-
 # # # S I N G # # #
 #the bar where the lyrics reside
 LyricBar       = [sing]textBar.png
@@ -75,10 +74,10 @@ LyricBar       = [sing]textBar.png
 LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar1      = [sing]timeBarBG.png
+TimeBar1       = [sing]timeBarBG.png
 
 #the time progress bar  (not skinned in this theme :P )
-TimeBar      = [sing]timeBar.jpg
+TimeBar        = [sing]timeBar.jpg
 
 #linebonus, the thing that pop ups at the score
 LineBonusBack  = [sing]lineBonusPopUp.png
@@ -97,6 +96,8 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+#Song name for medley mode
+SongName       = [sing]SongName.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
@@ -142,37 +143,34 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
-Joker             =[party]Joker.png
-PartyPlayerButton =[party]playerButton.png
-PartyTeamButton1  =[party]roundTeamButton.png
-PartyTeamButton2  =[party]playerTeamButton.png
-PartyTeamButton3  =[party]winTeamButton1.png
-PartyTeamButton4  =[party]winTeamButton2.png
-PartyTeamButton5  =[party]winTeamButton3.png
-PartyRoundBG1     =[party]roundBG1.png
-PartyRoundBG2     =[party]roundBG2.png
-PartyRoundBG3     =[party]roundBG3.png
-PartyRoundBG4     =[party]roundBG4.png
-HDL_Pointer       =[party]pointer.png
-PartyTeamPoints   =[party]teamPoints.png
-PartyScoreDeco    =[party]scoreDecoration.png
-PartyScoreBG1     =[party]scoreBG1.png
-PartyScoreBG2     =[party]scoreBG2.png
-PartyWinDeco1     =[party]winDecoration.png
-PartyWinDeco2     =[party]winDecoration.png
-PartyWinDeco3     =[party]winDecoration.png
+Joker               = [party]Joker.png
+PartyPlayerButton   = [party]playerButton.png
+PartyTeamButton1    = [party]roundTeamButton.png
+PartyTeamButton2    = [party]playerTeamButton.png
+PartyTeamButton3    = [party]winTeamButton1.png
+PartyTeamButton4    = [party]winTeamButton2.png
+PartyTeamButton5    = [party]winTeamButton3.png
+PartyRoundBG1       = [party]roundBG1.png
+PartyRoundBG2       = [party]roundBG2.png
+PartyRoundBG3       = [party]roundBG3.png
+PartyRoundBG4       = [party]roundBG4.png
+HDL_Pointer         = [party]pointer.png
+PartyTeamPoints     = [party]teamPoints.png
+PartyScoreDeco      = [party]scoreDecoration.png
+PartyScoreBG1       = [party]scoreBG1.png
+PartyScoreBG2       = [party]scoreBG2.png
+PartyWinDeco1       = [party]winDecoration.png
+PartyWinDeco2       = [party]winDecoration.png
+PartyWinDeco3       = [party]winDecoration.png
 PartyPlayerSelectBG = [party]playerselectbg.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
 StatMainBG3 = [stat]mainBG3.png
 StatDetailBG1 = [stat]detailBG1.png
 
-
 # # # N A V I # # #
 ButtonP     = [button]p.png
 ButtonM     = [button]m.png
@@ -189,10 +187,9 @@ Leiste2     = [special]bar2.png
 
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
-SongMenuSelectBG  = [menu]songMenuSelectBg.png
+SongMenuSelectBG = [menu]songMenuSelectBg.png
 PopUpBG     = [menu]popUpBG.png
 
-
 # # # N O T E S # # #
 # sung notes - colorized with playercolors
 GrayLeft       = [sing]notesLeft.png
@@ -208,18 +205,15 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
-
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
 
-
 # # # dirty helpers # # #
 Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
diff --git a/game/themes/Deluxe/[icon]song_calcmedley.png b/game/themes/Deluxe/[icon]song_calcmedley.png
new file mode 100755
index 00000000..30a13ea0
--- /dev/null
+++ b/game/themes/Deluxe/[icon]song_calcmedley.png
diff --git a/game/themes/Deluxe/[icon]song_medley.png b/game/themes/Deluxe/[icon]song_medley.png
new file mode 100755
index 00000000..ac7b25bb
--- /dev/null
+++ b/game/themes/Deluxe/[icon]song_medley.png
diff --git a/game/themes/Deluxe/[sing]SongName.png b/game/themes/Deluxe/[sing]SongName.png
new file mode 100755
index 00000000..530fed3f
--- /dev/null
+++ b/game/themes/Deluxe/[sing]SongName.png