- revert to 1777

- Ocean.ini and SVN properties are not reverted

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

13 files changed, 241 insertions, 441 deletions

diff --git a/unicode/game/themes/Classic.ini b/unicode/game/themes/Classic.ini
index 1ea83f5e..144448f2 100644
--- a/unicode/game/themes/Classic.ini
+++ b/unicode/game/themes/Classic.ini
@@ -7457,19 +7457,4 @@ H =44
 Z =1
 Int=1
 Color =Black
-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
+Type=Font Black
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe.ini b/unicode/game/themes/Deluxe.ini
index e128ae54..5f47c215 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 = 8
+H = 13
 
 #Player Two
 [SingP2RStatic]
@@ -8150,6 +8150,7 @@ Text = OK
 Align = 1
 Z = 1
 
+
 [PausePopUpStatic]
 Tex = Pause
 X = 0
@@ -8158,18 +8159,4 @@ W = 800
 H = 600
 Z = 0.95
 Color = White
-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
+Type = Colorized
\ No newline at end of file
diff --git a/unicode/game/themes/Deluxe/Blue.ini b/unicode/game/themes/Deluxe/Blue.ini
index 10017fb3..30c68e3e 100644
--- a/unicode/game/themes/Deluxe/Blue.ini
+++ b/unicode/game/themes/Deluxe/Blue.ini
@@ -15,9 +15,6 @@ 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
  */
@@ -32,9 +29,6 @@ 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
@@ -49,7 +43,8 @@ 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
@@ -57,7 +52,6 @@ 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
@@ -94,12 +88,11 @@ 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
@@ -139,7 +132,6 @@ 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
@@ -161,7 +153,6 @@ 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
@@ -214,7 +205,6 @@ 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
@@ -227,4 +217,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
\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
diff --git a/unicode/game/themes/Deluxe/Fall.ini b/unicode/game/themes/Deluxe/Fall.ini
index 38f25cdb..72d9021b 100644
--- a/unicode/game/themes/Deluxe/Fall.ini
+++ b/unicode/game/themes/Deluxe/Fall.ini
@@ -9,32 +9,12 @@ 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
@@ -48,16 +28,18 @@ 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
@@ -94,10 +76,9 @@ 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
 
@@ -139,7 +120,6 @@ 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
@@ -161,7 +141,6 @@ 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
@@ -186,6 +165,7 @@ 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 # # #
@@ -203,7 +183,6 @@ 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
@@ -213,18 +192,3 @@ 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
index bdc90979..02a51f31 100644
--- a/unicode/game/themes/Deluxe/Ocean.ini
+++ b/unicode/game/themes/Deluxe/Ocean.ini
@@ -1,230 +1,209 @@
-;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
+;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]

+# # # M A I N # # #

+Button         = [main]button.png

+ButtonF        = [main]buttonf.jpg

+MainBar        = [main]mainBar.png

+SelectBG       = [main]selectbg.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

+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

+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

+PopUpBG     = [menu]popUpBG.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

diff --git a/unicode/game/themes/Deluxe/Ribbon.ini b/unicode/game/themes/Deluxe/Ribbon.ini
index 73cae2ab..1631183e 100644
--- a/unicode/game/themes/Deluxe/Ribbon.ini
+++ b/unicode/game/themes/Deluxe/Ribbon.ini
@@ -1,4 +1,4 @@
-;0.5.1

+never;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,25 +6,9 @@
 [Skin]

 Theme=Deluxe

 Name=Ribbon

-Color=Any

+Color=Ani

 

 [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

@@ -32,9 +16,6 @@ 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

@@ -48,16 +29,18 @@ 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

@@ -97,9 +80,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

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

@@ -161,7 +143,6 @@ 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

@@ -186,6 +167,7 @@ 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 # # #

@@ -201,7 +183,6 @@ 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 # # #

@@ -213,18 +194,3 @@ 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 36e9f5d7..3d40c2f8 100644
--- a/unicode/game/themes/Deluxe/Summer.ini
+++ b/unicode/game/themes/Deluxe/Summer.ini
@@ -9,32 +9,12 @@ 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
@@ -48,16 +28,18 @@ 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
@@ -94,10 +76,9 @@ 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
 
@@ -139,7 +120,6 @@ 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
@@ -161,7 +141,6 @@ 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
@@ -186,6 +165,7 @@ 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 # # #
@@ -203,7 +183,6 @@ 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
@@ -213,18 +192,3 @@ 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 72514a15..32c37a02 100644
--- a/unicode/game/themes/Deluxe/Winter.ini
+++ b/unicode/game/themes/Deluxe/Winter.ini
@@ -9,32 +9,12 @@ 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
@@ -48,16 +28,18 @@ 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
@@ -97,7 +79,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
 
@@ -139,7 +121,6 @@ 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
@@ -161,7 +142,6 @@ 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
@@ -186,6 +166,7 @@ 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 # # #
@@ -203,7 +184,6 @@ 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
@@ -213,18 +193,3 @@ 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 f1b69eca..093be9a5 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
deleted file mode 100644
index 6c222732..00000000
--- a/unicode/game/themes/Deluxe/interface/cursor.png
+++ /dev/null
diff --git a/unicode/game/themes/Deluxe/interface/cursor_pressed.png b/unicode/game/themes/Deluxe/interface/cursor_pressed.png
deleted file mode 100644
index 3fc36a5a..00000000
--- a/unicode/game/themes/Deluxe/interface/cursor_pressed.png
+++ /dev/null
diff --git a/unicode/game/themes/Deluxe/interface/select_arrow_left.png b/unicode/game/themes/Deluxe/interface/select_arrow_left.png
deleted file mode 100644
index e4a32d2d..00000000
--- a/unicode/game/themes/Deluxe/interface/select_arrow_left.png
+++ /dev/null
diff --git a/unicode/game/themes/Deluxe/interface/select_arrow_right.png b/unicode/game/themes/Deluxe/interface/select_arrow_right.png
deleted file mode 100644
index b2a29793..00000000
--- a/unicode/game/themes/Deluxe/interface/select_arrow_right.png
+++ /dev/null