15 files changed, 311 insertions, 266 deletions

diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 79bac299..3ebc04ff 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -12,18 +12,18 @@ Color=Blue
 /**
  * Interface
  */
-interface_selectbg_search   = interface/selectbg_search.png
-interface_dialog_background = interface/dialog_background.png
+interface_selectbg_search   = [interface]selectbg_search.png
+interface_dialog_background = [interface]dialog_background.png
 
-Cursor = interface/cursor.png
-Cursor_Pressed = interface/cursor_pressed.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
+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 # # #
@@ -32,8 +32,8 @@ 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
+Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
 LoadingBG      = [bg-load]blue.jpg
@@ -48,11 +48,14 @@ PartyBG        = [bg-main]blue.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
@@ -187,6 +190,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 # # #
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 602a720b..4502be61 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -12,18 +12,18 @@ Color=Orange
 /**
  * Interface
  */
-interface_selectbg_search   = interface/selectbg_search.png
-interface_dialog_background = interface/dialog_background.png
+interface_selectbg_search   = [interface]selectbg_search.png
+interface_dialog_background = [interface]dialog_background.png
 
-Cursor = interface/cursor.png
-Cursor_Pressed = interface/cursor_pressed.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
+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 # # #
@@ -32,8 +32,8 @@ 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
+Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
 LoadingBG      = [bg-load]fall.jpg
@@ -48,11 +48,14 @@ 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
@@ -187,6 +190,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 # # #
diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index a7f59bad..8af41f20 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -9,12 +9,32 @@ 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
@@ -40,6 +60,7 @@ 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,6 +97,7 @@ 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 
@@ -120,6 +142,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 +165,7 @@ 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
@@ -195,6 +219,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
@@ -207,4 +232,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/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index 2f61fd1c..06a4dd41 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -1,230 +1,234 @@
-;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=Ribbon

-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

-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

-SongBG         = [bg-video]ribbon.mov

-ScoreScreenBG  = [bg-video]ribbon.mov

-Top5BG         = [bg-video]ribbon.mov

-OptionsBG      = [bg-video]ribbon.mov

-EditBG         = [bg-video]ribbon.mov

-PartyBG        = [bg-video]ribbon.mov

-

-#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

-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

-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

+;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=Ribbon
+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
+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
+SongBG         = [bg-video]ribbon.mov
+ScoreScreenBG  = [bg-video]ribbon.mov
+Top5BG         = [bg-video]ribbon.mov
+OptionsBG      = [bg-video]ribbon.mov
+EditBG         = [bg-video]ribbon.mov
+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
+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
+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
+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
\ No newline at end of file
diff --git a/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index d254e14d..5d86ab2a 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -12,18 +12,18 @@ Color=Blue
 /**
  * Interface
  */
-interface_selectbg_search   = interface/selectbg_search.png
-interface_dialog_background = interface/dialog_background.png
+interface_selectbg_search   = [interface]selectbg_search.png
+interface_dialog_background = [interface]dialog_background.png
 
-Cursor = interface/cursor.png
-Cursor_Pressed = interface/cursor_pressed.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
+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 # # #
@@ -32,8 +32,8 @@ 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
+Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
 LoadingBG      = [bg-load]summer.jpg
@@ -48,11 +48,14 @@ 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
@@ -187,6 +190,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 # # #
diff --git a/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 85173278..71b4dfaa 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -12,18 +12,18 @@ Color=Blue
 /**
  * Interface
  */
-interface_selectbg_search   = interface/selectbg_search.png
-interface_dialog_background = interface/dialog_background.png
+interface_selectbg_search   = [interface]selectbg_search.png
+interface_dialog_background = [interface]dialog_background.png
 
-Cursor = interface/cursor.png
-Cursor_Pressed = interface/cursor_pressed.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
+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 # # #
@@ -32,8 +32,8 @@ 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
+Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
 LoadingBG      = [bg-load]winter.jpg
@@ -48,11 +48,14 @@ 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
@@ -187,6 +190,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 # # #
diff --git a/game/themes/Deluxe/icon/song_menu.png b/game/themes/Deluxe/[icon]song_menu.png
index acf69bfb..acf69bfb 100644
--- a/game/themes/Deluxe/icon/song_menu.png
+++ b/game/themes/Deluxe/[icon]song_menu.png
diff --git a/game/themes/Deluxe/icon/song_search.png b/game/themes/Deluxe/[icon]song_search.png
index f5190315..f5190315 100644
--- a/game/themes/Deluxe/icon/song_search.png
+++ b/game/themes/Deluxe/[icon]song_search.png
diff --git a/game/themes/Deluxe/icon/song_video.png b/game/themes/Deluxe/[icon]song_video.png
index 20170d5f..20170d5f 100644
--- a/game/themes/Deluxe/icon/song_video.png
+++ b/game/themes/Deluxe/[icon]song_video.png
diff --git a/game/themes/Deluxe/interface/cursor.png b/game/themes/Deluxe/[interface]cursor.png
index 0fe390f0..0fe390f0 100644
--- a/game/themes/Deluxe/interface/cursor.png
+++ b/game/themes/Deluxe/[interface]cursor.png
diff --git a/game/themes/Deluxe/interface/cursor_pressed.png b/game/themes/Deluxe/[interface]cursor_pressed.png
index fa0056cc..fa0056cc 100644
--- a/game/themes/Deluxe/interface/cursor_pressed.png
+++ b/game/themes/Deluxe/[interface]cursor_pressed.png
diff --git a/game/themes/Deluxe/interface/dialog_background.png b/game/themes/Deluxe/[interface]dialog_background.png
index ed032349..ed032349 100644
--- a/game/themes/Deluxe/interface/dialog_background.png
+++ b/game/themes/Deluxe/[interface]dialog_background.png
diff --git a/game/themes/Deluxe/interface/select_arrow_left.png b/game/themes/Deluxe/[interface]select_arrow_left.png
index e4a32d2d..e4a32d2d 100644
--- a/game/themes/Deluxe/interface/select_arrow_left.png
+++ b/game/themes/Deluxe/[interface]select_arrow_left.png
diff --git a/game/themes/Deluxe/interface/select_arrow_right.png b/game/themes/Deluxe/[interface]select_arrow_right.png
index b2a29793..b2a29793 100644
--- a/game/themes/Deluxe/interface/select_arrow_right.png
+++ b/game/themes/Deluxe/[interface]select_arrow_right.png
diff --git a/game/themes/Deluxe/interface/selectbg_search.png b/game/themes/Deluxe/[interface]selectbg_search.png
index 57d0ca88..57d0ca88 100644
--- a/game/themes/Deluxe/interface/selectbg_search.png
+++ b/game/themes/Deluxe/[interface]selectbg_search.png