merged r1830 trunk (current) in this branch

add some files to svn:ignore


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

13 files changed, 441 insertions, 32 deletions

diff --git a/unicode/game/themes/Classic.ini b/unicode/game/themes/Classic.ini
index 144448f2..1ea83f5e 100644
--- a/unicode/game/themes/Classic.ini
+++ b/unicode/game/themes/Classic.ini
@@ -7457,4 +7457,19 @@ H =44
 Z =1
 Int=1
 Color =Black
-Type=Font Black
\ No newline at end of file
+Type=Font Black
+
+
+[SingLyricsUpperBar]
+X = 80
+W = 640
+Y = 493
+H = 41
+;YOffSet (+/-) for the Sing-Indicator
+IndicatorYOffset = 3
+
+[SingLyricsLowerBar]
+X = 80
+W = 640
+Y = 535
+H = 41
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe.ini b/unicode/game/themes/Deluxe.ini
index 5f47c215..e128ae54 100644
--- a/unicode/game/themes/Deluxe.ini
+++ b/unicode/game/themes/Deluxe.ini
@@ -1072,7 +1072,7 @@ Align = 0
 X = 680
 Y = 136
 W = 100
-H = 13
+H = 8
 
 #Player Two
 [SingP2RStatic]
@@ -8150,7 +8150,6 @@ Text = OK
 Align = 1
 Z = 1
 
-
 [PausePopUpStatic]
 Tex = Pause
 X = 0
@@ -8159,4 +8158,18 @@ W = 800
 H = 600
 Z = 0.95
 Color = White
-Type = Colorized
\ No newline at end of file
+Type = Colorized
+
+[SingLyricsUpperBar]
+X = 80
+W = 640
+Y = 493
+H = 41
+;YOffSet (+/-) for the Sing-Indicator
+IndicatorYOffset = 3
+
+[SingLyricsLowerBar]
+X = 80
+W = 640
+Y = 535
+H = 41
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Blue.ini b/unicode/game/themes/Deluxe/Blue.ini
index 30c68e3e..10017fb3 100644
--- a/unicode/game/themes/Deluxe/Blue.ini
+++ b/unicode/game/themes/Deluxe/Blue.ini
@@ -15,6 +15,9 @@ Color=Blue
 interface_selectbg_search   = interface/selectbg_search.png
 interface_dialog_background = interface/dialog_background.png
 
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
 /**
  * Icons
  */
@@ -29,6 +32,9 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]blue.jpg
 MainBG         = [bg-main]blue.jpg
@@ -43,8 +49,7 @@ PartyBG        = [bg-main]blue.jpg
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 IconOption     = [icon]options.png
-IconEdit     = [icon]options.png
-
+IconEdit       = [icon]options.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
@@ -52,6 +57,7 @@ StatIcon       = [icon]stats.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
@@ -88,11 +94,12 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
-ScoreLevelRound = [score]levelround.png
+ScoreLevelRound = [score]levelRound.png
 
 ScoreLevel_Dark           = [score]level_dark.png
 ScoreLevel_Dark_Round     = [score]level_dark_round.png
@@ -132,6 +139,7 @@ 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
@@ -153,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -205,6 +214,7 @@ 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
@@ -217,4 +227,4 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Fall.ini b/unicode/game/themes/Deluxe/Fall.ini
index 72d9021b..38f25cdb 100644
--- a/unicode/game/themes/Deluxe/Fall.ini
+++ b/unicode/game/themes/Deluxe/Fall.ini
@@ -9,12 +9,32 @@ Name=Fall
 Color=Orange
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]fall.jpg
 MainBG         = [bg-main]fall.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]fall.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-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
@@ -76,9 +94,10 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -120,6 +139,7 @@ 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
@@ -141,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -165,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -183,6 +203,7 @@ 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
@@ -192,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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
+LyricIcon_P2  = [sing.player2]lyric_active.png
+LyricIconD_P2 = [sing.player2]lyric_inactive.png
+LyricIcon_P3  = [sing.player3]lyric_active.png
+LyricIconD_P3 = [sing.player3]lyric_inactive.png
+LyricIcon_P4  = [sing.player4]lyric_active.png
+LyricIconD_P4 = [sing.player4]lyric_inactive.png
+LyricIcon_P5  = [sing.player5]lyric_active.png
+LyricIconD_P5 = [sing.player5]lyric_inactive.png
+LyricIcon_P6  = [sing.player6]lyric_active.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Ocean.ini b/unicode/game/themes/Deluxe/Ocean.ini
new file mode 100644
index 00000000..bdc90979
--- /dev/null
+++ b/unicode/game/themes/Deluxe/Ocean.ini
@@ -0,0 +1,230 @@
+;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=Ocean
+Color=Blue
+
+[Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
+# # # M A I N # # #
+Button         = [main]button.png
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.png
+SelectBG       = [main]selectbg.png
+
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
+#Backgrounds
+LoadingBG      = [bg-load]blue.jpg
+MainBG         = [bg-video]_ocean.avi
+SongBG         = [bg-video]_ocean.avi
+ScoreScreenBG  = [bg-video]_ocean.avi
+Top5BG         = [bg-video]_ocean.avi
+OptionsBG      = [bg-video]_ocean.avi
+EditBG         = [bg-video]_ocean.avi
+PartyBG        = [bg-video]_ocean.avi
+
+#Icons on screen
+SongCD         = [icon]cd.png
+MainIcon       = [icon]main.png
+IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
+ScoreIcon      = [icon]score.png
+PartyIcon      = [icon]party.png
+StatIcon       = [icon]stats.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
+
+#this one slides in, to tell you that singing starts immediately
+LyricHelpBar   = [sing]lyricsHelpBar.png
+
+#the bar behind the timestuff
+TimeBar1      = [sing]timeBarBG.png
+
+#the time progress bar  (not skinned in this theme :P )
+TimeBar      = [sing]timeBar.jpg
+
+#linebonus, the thing that pop ups at the score
+LineBonusBack  = [sing]lineBonusPopUp.png
+
+#Singbar (the thing beneath the scores)
+SingBarBack    = [sing]singBarBack.png
+SingBarBar     = [sing]singBarBar.png
+SingBarFront   = [sing]singBarFront.png
+
+#Background for scores
+ScoreBG        = [sing]scoreBg.png
+
+#Background for the P1, P2 and so on
+P              = [sing]p.png
+
+#Pointer for lyrics
+Ball           = [sing]LyricsBall.png
+
+
+# # # S C O R E / T O P 5 # # #
+ScoreBox        = [score]box.png
+ScoreGlassBox   = [score]glass_box.png
+ScoreLevel      = [score]level.png
+ScoreLevelRound = [score]levelRound.png
+
+ScoreLevel_Dark           = [score]level_dark.png
+ScoreLevel_Dark_Round     = [score]level_dark_round.png
+
+ScoreLevel_Light          = [score]level_light.png
+ScoreLevel_Light_Round    = [score]level_light_round.png
+
+ScoreLevel_Lightest       = [score]level_lightest.png
+ScoreLevel_Lightest_Round = [score]level_lightest_round.png
+
+# Boxes near the text, that show what color is for which bar
+ScoreBar_box_lightest = [score]bar_box_lightest.png
+ScoreBar_box_light    = [score]bar_box_light.png
+ScoreBar_box_dark     = [score]bar_box_dark.png
+
+ScoreEndCap     = [score]endcap.png
+ScoreLine       = [score]line.png
+PlayerNumberBox = [main]playerNumberBox.png
+
+PlayerIDBox01 = [sing.player1]lyric_active.png
+PlayerIDBox02 = [sing.player2]lyric_active.png
+PlayerIDBox03 = [sing.player3]lyric_active.png
+PlayerIDBox04 = [sing.player4]lyric_active.png
+PlayerIDBox05 = [sing.player5]lyric_active.png
+PlayerIDBox06 = [sing.player6]lyric_active.png
+
+# these icons are part of the tango icon set
+# licensed under Creative Commons Attribution Share-Alike license
+# http://tango.freedesktop.org
+Rating_0 = [score]rating_0.png
+Rating_1 = [score]rating_1.png
+Rating_2 = [score]rating_2.png
+Rating_3 = [score]rating_3.png
+Rating_4 = [score]rating_4.png
+Rating_5 = [score]rating_5.png
+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
+
+
+# # # 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
+ButtonJ     = [button]j.png
+ButtonAlt   = [button]alt.png
+ButtonAZ    = [button]az.png
+ButtonEnter = [button]enter.png
+ButtonNavi  = [button]navi.png
+ButtonEsc   = [button]esc.png
+Button13    = [button]13.png
+
+Leiste1     = [special]bar1.png
+Leiste2     = [special]bar2.png
+
+JumpToBG    = [menu]jumpToBg.png
+SongMenuBG  = [menu]songMenuBg.png
+SongMenuSelectBG  = [menu]songMenuSelectBg.png
+
+
+# # # N O T E S # # #
+# sung notes - colorized with playercolors
+GrayLeft       = [sing]notesLeft.png
+GrayMid        = [sing]notesMid.png
+GrayRight      = [sing]notesRight.png
+# unsung notes - colorized with playercolors
+NotePlainLeft  = [sing]notesPlainLeft.png
+NotePlainMid   = [sing]notesPlainMid.png
+NotePlainRight = [sing]notesPlainRight.png
+# the glow around unsung/sung notes - colorized with playercolors
+NoteBGLeft     = [sing]notesBgLeft.png
+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
+LyricIcon_P2  = [sing.player2]lyric_active.png
+LyricIconD_P2 = [sing.player2]lyric_inactive.png
+LyricIcon_P3  = [sing.player3]lyric_active.png
+LyricIconD_P3 = [sing.player3]lyric_inactive.png
+LyricIcon_P4  = [sing.player4]lyric_active.png
+LyricIconD_P4 = [sing.player4]lyric_inactive.png
+LyricIcon_P5  = [sing.player5]lyric_active.png
+LyricIconD_P5 = [sing.player5]lyric_inactive.png
+LyricIcon_P6  = [sing.player6]lyric_active.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Ribbon.ini b/unicode/game/themes/Deluxe/Ribbon.ini
index 1631183e..73cae2ab 100644
--- a/unicode/game/themes/Deluxe/Ribbon.ini
+++ b/unicode/game/themes/Deluxe/Ribbon.ini
@@ -1,4 +1,4 @@
-never;0.5.1

+;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

@@ -6,9 +6,25 @@ never;0.5.1
 [Skin]

 Theme=Deluxe

 Name=Ribbon

-Color=Ani

+Color=Any

 

 [Textures]

+/**

+ * Interface

+ */

+interface_selectbg_search   = interface/selectbg_search.png

+interface_dialog_background = interface/dialog_background.png

+

+Cursor = interface/cursor.png

+Cursor_Pressed = interface/cursor_pressed.png

+

+/**

+ * Icons

+ */

+icon_song_menu   = icon/song_menu.png

+icon_song_search = icon/song_search.png

+icon_song_video  = icon/song_video.png

+

 

 # # # M A I N # # #

 Button         = [main]button.png

@@ -16,6 +32,9 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png

 SelectBG       = [main]selectbg.png

 

+Select_ArrowLeft = interface/select_arrow_left.png

+Select_ArrowRight = interface/select_arrow_right.png

+

 #Backgrounds

 LoadingBG      = [bg-video]ribbon.mov

 MainBG         = [bg-video]ribbon.mov

@@ -29,18 +48,16 @@ PartyBG        = [bg-video]ribbon.mov
 #Icons on screen

 SongCD         = [icon]cd.png

 MainIcon       = [icon]main.png

-MainSearch     = [icon]search.png

 IconOption     = [icon]options.png

 IconEdit       = [icon]options.png

-IconSongMenu   = [icon]songmenu.png

 ScoreIcon      = [icon]score.png

 PartyIcon      = [icon]party.png

 StatIcon       = [icon]stats.png

-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

@@ -80,9 +97,9 @@ Ball           = [sing]LyricsBall.png
 

 # # # S C O R E / T O P 5 # # #

 ScoreBox        = [score]box.png

-ScoreGlassBox   = [score]glass_box.png 

+ScoreGlassBox   = [score]glass_box.png

 ScoreLevel      = [score]level.png

-ScoreLevelRound = [score]levelround.png

+ScoreLevelRound = [score]levelRound.png

 

 ScoreLevel_Dark           = [score]level_dark.png

 ScoreLevel_Dark_Round     = [score]level_dark_round.png

@@ -122,6 +139,7 @@ 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

@@ -143,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png

 PartyWinDeco3     =[party]winDecoration.png

 

+

 # # # S T A T S # # #

 StatMainBG1 = [stat]mainBG1.png

 StatMainBG2 = [stat]mainBG2.png

@@ -167,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png

 SongMenuBG  = [menu]songMenuBg.png

 SongMenuSelectBG  = [menu]songMenuSelectBg.png

-PopUpBG     = [menu]popUpBG.png

 

 

 # # # N O T E S # # #

@@ -183,6 +201,7 @@ NotePlainRight = [sing]notesPlainRight.png
 NoteBGLeft     = [sing]notesBgLeft.png

 NoteBGMid      = [sing]notesBgMid.png

 NoteBGRight    = [sing]notesBgRight.png

+Pause          = [sing]pause.png

 

 

 # # # E F F E C T S # # #

@@ -194,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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

+LyricIcon_P2  = [sing.player2]lyric_active.png

+LyricIconD_P2 = [sing.player2]lyric_inactive.png

+LyricIcon_P3  = [sing.player3]lyric_active.png

+LyricIconD_P3 = [sing.player3]lyric_inactive.png

+LyricIcon_P4  = [sing.player4]lyric_active.png

+LyricIconD_P4 = [sing.player4]lyric_inactive.png

+LyricIcon_P5  = [sing.player5]lyric_active.png

+LyricIconD_P5 = [sing.player5]lyric_inactive.png

+LyricIcon_P6  = [sing.player6]lyric_active.png

+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Summer.ini b/unicode/game/themes/Deluxe/Summer.ini
index 3d40c2f8..36e9f5d7 100644
--- a/unicode/game/themes/Deluxe/Summer.ini
+++ b/unicode/game/themes/Deluxe/Summer.ini
@@ -9,12 +9,32 @@ Name=Summer
 Color=Blue
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]summer.jpg
 MainBG         = [bg-main]summer.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]summer.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-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
@@ -76,9 +94,10 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -120,6 +139,7 @@ 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
@@ -141,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -165,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -183,6 +203,7 @@ 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
@@ -192,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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
+LyricIcon_P2  = [sing.player2]lyric_active.png
+LyricIconD_P2 = [sing.player2]lyric_inactive.png
+LyricIcon_P3  = [sing.player3]lyric_active.png
+LyricIconD_P3 = [sing.player3]lyric_inactive.png
+LyricIcon_P4  = [sing.player4]lyric_active.png
+LyricIconD_P4 = [sing.player4]lyric_inactive.png
+LyricIcon_P5  = [sing.player5]lyric_active.png
+LyricIconD_P5 = [sing.player5]lyric_inactive.png
+LyricIcon_P6  = [sing.player6]lyric_active.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Winter.ini b/unicode/game/themes/Deluxe/Winter.ini
index 32c37a02..72514a15 100644
--- a/unicode/game/themes/Deluxe/Winter.ini
+++ b/unicode/game/themes/Deluxe/Winter.ini
@@ -9,12 +9,32 @@ Name=Winter
 Color=Blue
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]winter.jpg
 MainBG         = [bg-main]winter.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]winter.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-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
@@ -79,7 +97,7 @@ Ball           = [sing]LyricsBall.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -121,6 +139,7 @@ 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
@@ -142,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -166,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -184,6 +203,7 @@ 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
@@ -193,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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
+LyricIcon_P2  = [sing.player2]lyric_active.png
+LyricIconD_P2 = [sing.player2]lyric_inactive.png
+LyricIcon_P3  = [sing.player3]lyric_active.png
+LyricIconD_P3 = [sing.player3]lyric_inactive.png
+LyricIcon_P4  = [sing.player4]lyric_active.png
+LyricIconD_P4 = [sing.player4]lyric_inactive.png
+LyricIcon_P5  = [sing.player5]lyric_active.png
+LyricIconD_P5 = [sing.player5]lyric_inactive.png
+LyricIcon_P6  = [sing.player6]lyric_active.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/[main]selectbg.png b/unicode/game/themes/Deluxe/[main]selectbg.png
index 093be9a5..f1b69eca 100644
--- a/unicode/game/themes/Deluxe/[main]selectbg.png
+++ b/unicode/game/themes/Deluxe/[main]selectbg.png
diff --git a/unicode/game/themes/Deluxe/interface/cursor.png b/unicode/game/themes/Deluxe/interface/cursor.png
new file mode 100644
index 00000000..6c222732
--- /dev/null
+++ b/unicode/game/themes/Deluxe/interface/cursor.png
diff --git a/unicode/game/themes/Deluxe/interface/cursor_pressed.png b/unicode/game/themes/Deluxe/interface/cursor_pressed.png
new file mode 100644
index 00000000..3fc36a5a
--- /dev/null
+++ b/unicode/game/themes/Deluxe/interface/cursor_pressed.png
diff --git a/unicode/game/themes/Deluxe/interface/select_arrow_left.png b/unicode/game/themes/Deluxe/interface/select_arrow_left.png
new file mode 100644
index 00000000..e4a32d2d
--- /dev/null
+++ b/unicode/game/themes/Deluxe/interface/select_arrow_left.png
diff --git a/unicode/game/themes/Deluxe/interface/select_arrow_right.png b/unicode/game/themes/Deluxe/interface/select_arrow_right.png
new file mode 100644
index 00000000..b2a29793
--- /dev/null
+++ b/unicode/game/themes/Deluxe/interface/select_arrow_right.png