Deluxe Skin (Blue):

  Pimped song selection and it's menus
  Starting to clean up sprites
  New default cover
/!\ Other skins remained unchanged /!\

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

15 files changed, 319 insertions, 313 deletions

diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index e1edbd04..6ecc8619 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -35,34 +35,34 @@ Bronze = 205 127 50
 Red = 255 0 0
 
 [Loading]
-Texts = 2
-Fade = 1
-
 [LoadingBackground]
 Tex = LoadingBG
+Color = DarkRed
+Type = Colorized
 
 [LoadingText1]
 X = 30
 Y = 550
-Color = Black
+Color = White
 Font = 0
 Align = 0
 Size = 10
 Text = SING_LOADING
+Reflection = 1
+ReflectionSpacing = 20
 
 [LoadingText2]
 X = 790
 Y = 550
-Color = Black
+Color = White
 Font = 0
 Size = 10
 Align = 2
 Text = US_VERSION
+Reflection = 1
+ReflectionSpacing = 20
 
 [Main]
-Texts = 2
-Statics = 4
-
 [MainBackground]
 Tex = MainBG
 
@@ -345,48 +345,34 @@ Text = SING_EXIT
 Color = White
 
 [Song]
-Texts = 3
 
 [SongBackground]
 Tex = SongBG
 
-[SongCover]
-X = 252
-Y = 125
-W = 320
-H = 190
-Reflections = 1
-style=5
-
-[SongEqualizer]
-Visible = 1
-Direction = 1
+[SongStaticNonParty1]
+X = 40
+Y = 22
+W = 27
+H = 27
 Color = White
-Alpha = 1
-X = 205
-Y = 514
-Z = 1
-PieceW = 6
-PieceH = 6
-Space = 1
-Bands = 6
-Length = 18
+Tex = SongCD
+Type = Colorized
 
-[SongVideoIcon]
-X = 249
-Y = 487
-W = 32
-H = 32
-Z = 1
+[SongTextCat]
+X = 70
+Y = 53
 Color = White
-Tex = VideoIcon
-Type = Colorized
+Font = 0
+Size = 10
+Align = 0
+Text = SING_SONG_SELECTION_DESC
 
 [SongStatic1]
 X = 0
 Y = 545
 W = 250
 H = 30
+Z = 0.4
 Tex = Leiste1
 Color = ColorLight
 Type = Colorized
@@ -398,68 +384,97 @@ X = 250
 Y = 545
 W = 550
 H = 30
+Z = 0.951
 Tex = Leiste2
 Color = White
 Type = Transparent
 Reflection = 1
 ReflectionSpacing = 2
 
+[SongCover]
+X = 300
+Y = 120
+W = 325
+H = 200
+Reflections = 1
+Style=5
+
+[SongEqualizer]
+Visible = 1
+Direction = 1
+Color = White
+Alpha = 1
+X = 265
+Y = 476
+PieceW = 4
+PieceH = 4
+Space = 1
+Bands = 5
+Length = 15
+
+[SongVideoIcon]
+X = 310
+Y = 445
+W = 24
+H = 24
+Z = 0.95
+Color = White
+Tex = icon_song_video
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 22
+
 [SongStatic3]
-X = 200
+X = 278
 Y = 120
-W = 300
+W = 244
 H = 200
-Color = LightBlue
+Z = 0.95
+Color = ColorLight
 Tex = SongSelection1
 Type = Colorized
 
 [SongStatic4]
-X = 248
+X = 300
 Y = 320
 W = 200
-H = 200
-Z = 0.98
-Color = LightBlue
+H = 160
+Z = 0.95
+Color = ColorLight
 Tex = SongSelection2
 Type = Colorized
-
-[SongTextCat]
-X = 70
-Y = 53
-Color = White
-Font = 0
-Size = 10
-Align = 0
-Text = SING_SONG_SELECTION_DESC
+Reflection = 1
+ReflectionSpacing = 2
 
 [SongTextArtist]
-X = 350
-Y = 320
+X = 400
+Y = 328
 W = 190
 Color = White
 Font = 1
-Size = 9
+Size = 8
 Align = 1
 Text =
 
 [SongTextTitle]
-X = 350
-Y = 380
+X = 400
+Y = 394
 W = 190
 Color = White
 Font = 0
-Size = 9
+Size = 8
 Align = 1
 Text =
 
 [SongTextNumber]
-X = 440
-Y = 495
+X = 492
+Y = 457
+Z = 0.95
 Color = White
-Font = 0
-Size = 8
+Size = 6
 Align = 2
-Text =
+Reflection = 1
+ReflectionSpacing = 21
 
 #Variable statics and texts for song-screen in sing- and partymode
 # There can be an unlimited Number of Statics and Texts, As long
@@ -474,17 +489,6 @@ Text =
 #        SongTextNonParty[No]
 #Here are the ones for singmode
 
-
-[SongStaticNonParty1]
-X = 40
-Y = 22
-W = 27
-H = 27
-Color = White
-Tex = SongCD
-Type = Colorized
-#Texts Non Party
-
 [SongTextNonParty1]
 X = 70
 Y = 6
@@ -501,6 +505,7 @@ X = 260
 Y = 545
 W = 32
 H = 30
+Z = 0.952
 Tex = ButtonAlt
 Color = White
 Type = Transparent
@@ -510,17 +515,21 @@ ReflectionSpacing = 2
 [SongTextNonParty2]
 X = 292
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
 Align = 0
 Text = +
+Reflection = 1
+ReflectionSpacing = 20
 
 [SongStaticNonParty3]
 X = 300
 Y = 545
 W = 32
 H = 30
+Z = 0.952
 Tex = ButtonAZ
 Color = White
 Type = Transparent
@@ -530,6 +539,7 @@ ReflectionSpacing = 2
 [SongTextNonParty3]
 X = 340
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
@@ -544,6 +554,7 @@ X = 425
 Y = 545
 W = 32
 H = 30
+Z = 0.952
 Tex = ButtonM
 Color = White
 Type = Transparent
@@ -553,6 +564,7 @@ ReflectionSpacing = 2
 [SongTextNonParty4]
 X = 465
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
@@ -567,6 +579,7 @@ X = 515
 Y = 545
 W = 32
 H = 30
+Z = 0.952
 Tex = ButtonJ
 Color = White
 Type = Transparent
@@ -576,6 +589,7 @@ ReflectionSpacing = 2
 [SongTextNonParty5]
 X = 555
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
@@ -584,12 +598,13 @@ Text = SONG_JUMPTO_DESC
 Reflection = 1
 ReflectionSpacing = 20
 
-# [P]laylist ;)
+# [P]laylist
 [SongStaticNonParty6]
 X = 680
 Y = 545
 W = 32
 H = 30
+Z = 0.952
 Tex = ButtonP
 Color = White
 Type = Transparent
@@ -599,6 +614,7 @@ ReflectionSpacing = 2
 [SongTextNonParty6]
 X = 720
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
@@ -618,10 +634,11 @@ Tex = PartyIcon
 Type = Colorized
 
 # NAVBAR for party
-# enter a numb3r
+# enter a number
 [SongStaticParty2]
 X = 260
 Y = 545
+Z = 0.952
 W = 32
 H = 30
 Tex = Button13
@@ -631,6 +648,7 @@ Type = Transparent
 [SongTextParty3]
 X = 288
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
@@ -641,6 +659,7 @@ Text = SONG_MENU_NAME_PARTY_JOKER
 [SongStaticParty3]
 X = 400
 Y = 552
+Z = 0.952
 W = 24
 H = 23
 Tex = ButtonM
@@ -650,16 +669,17 @@ Type = Transparent
 [SongTextParty4]
 X = 426
 Y = 548
+Z = 0.952
 Color = Black
 Font = 0
 Size = 8
 Align = 0
 Text = PARTY_SONG_MENU
 
-# lolcat is interested and presses enter
 [SongStaticParty4]
 X = 540
 Y = 552
+Z = 0.952
 W = 24
 H = 24
 Tex = ButtonEnter
@@ -5147,7 +5167,6 @@ X = 450
 Y = 103
 W = 330
 H = 24
-Int = 1
 Color = DarkBlue
 Type = Colorized
 
@@ -5166,7 +5185,6 @@ X = 250
 Y = 350
 W = 300
 H = 50
-Int = 1
 Color = DarkBlue
 Type = Colorized
 
@@ -5176,7 +5194,6 @@ X = 50
 Y = 495
 W = 700
 H = 30
-Int = 1
 Color = LightBlue
 Type = Colorized
 
@@ -5186,7 +5203,6 @@ X = 20
 Y = 110
 W = 400
 H = 50
-Int = 1
 Color = P1Dark
 Type = Colorized
 Reflection = 0
@@ -5197,7 +5213,6 @@ X = 20
 Y = 191
 W = 400
 H = 50
-Int = 1
 Color = P2Dark
 Type = Colorized
 Reflection = 0
@@ -5208,7 +5223,6 @@ X = 20
 Y = 272
 W = 400
 H = 50
-Int = 1
 Color = P3Dark
 Type = Colorized
 Reflection = 0
@@ -5644,7 +5658,6 @@ X = 50
 Y = 100
 W = 700
 H = 80
-Int = 1
 Color = DarkBlue
 Type = Colorized
 
@@ -5654,7 +5667,6 @@ X = 50
 Y = 495
 W = 700
 H = 20
-Int = 1
 Color = LightBlue
 Type = Colorized
 
@@ -5738,7 +5750,6 @@ H = 16
 Z = 1
 Tex = PartyTeamPoints
 Color = P1Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -5773,7 +5784,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P2Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -5808,7 +5818,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P3Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -5990,7 +5999,6 @@ H = 16
 Z = 1
 Tex = PartyTeamPoints
 Color = TeamColor
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6014,7 +6022,6 @@ H = 16
 Z = 1
 Tex = PartyTeamPoints
 Color = P1Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6038,7 +6045,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P1Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6062,7 +6068,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P1Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6098,7 +6103,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = TeamColor
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6122,7 +6126,6 @@ H = 16
 Z = 1
 Tex = PartyTeamButton3
 Color = P2Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6146,7 +6149,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P2Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6170,7 +6172,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = TeamColor
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6205,7 +6206,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = TeamColor
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6229,7 +6229,6 @@ H = 16
 Z = 1
 Tex = PartyTeamPoints
 Color = P3Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6253,7 +6252,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P3Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6277,7 +6275,6 @@ H = 15
 Z = 1
 Tex = PartyTeamPoints
 Color = P3Dark
-Int = 1
 Type = Colorized
 Reflection = 1
 ReflectionSpacing = 12
@@ -6349,7 +6346,6 @@ H = 23
 Tex = ButtonNavi
 Color = White
 Type = Transparent
-Style = 5
 
 [PartyOptionsStatic5]
 X = 388
@@ -6359,7 +6355,6 @@ H = 23
 Tex = ButtonEnter
 Color = White
 Type = Transparent
-Style = 5
 
 [PartyOptionsText1]
 X = 70
@@ -6623,7 +6618,6 @@ H = 23
 Tex = ButtonNavi
 Color = White
 Type = Transparent
-Style = 5
 
 [PartyPlayerStatic5]
 X = 388
@@ -6633,7 +6627,6 @@ H = 23
 Tex = ButtonAZ
 Color = White
 Type = Transparent
-Style = 5
 
 [PartyPlayerStatic6]
 X = 556
@@ -6643,7 +6636,6 @@ H = 23
 Tex = ButtonEnter
 Color = White
 Type = Transparent
-Style = 5
 
 [PartyPlayerText1]
 X = 70
@@ -6937,7 +6929,6 @@ Align = 1
 Text = Team 3
 Color = White
 
-
 [PartyPlayerPlayer9Name]
 Tex = Button
 X = 85
@@ -7026,232 +7017,244 @@ Align = 1
 Text = Player 12
 Color = White
 
-
 [SongMenu]
-Texts = 0
-Statics = 1
+[SongMenuStatic2]
+Tex = interface_dialog_background
+X = 500
+Y = 120
+W = 280
+H = 200
+Z = 0.96
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 0
+
+[SongMenuStatic3]
+X = 508
+Y = 131
+W = 24
+H = 24
+Color = White
+Tex = icon_song_menu
+Type = Colorized
+Z = 0.97
+
+[SongMenuTextMenu]
+X = 538
+Y = 125
+Z = 0.97
+Color = ColorLight
+Size = 12
+Text = MENU
 
 [SongMenuButton1]
-X = 460
-Y = 165
-W = 270
+X = 530
+Y = 175
+Z = 0.97
+W = 220
 H = 25
 Tex = Rectangle
 Color = LightBlue
 DColor = DarkBlue
 Type = Colorized
 Texts = 1
-Z = 0.98
-Texts = 1
 
 [SongMenuButton1Text1]
-X = 30
+X = 6
 Y = 0
+Z = 0.97
 Color = White
-Font = 0
 Size = 8
 Text = SONG_MENU_PLAY
-Align = 0
-Z = 0.99
 
 [SongMenuButton2]
-X = 460
-Y = 195
-W = 270
+X = 530
+Y = 205
+Z = 0.97
+W = 220
 H = 25
 Tex = Rectangle
 Color = LightBlue
 DColor = DarkBlue
 Type = Colorized
 Texts = 1
-Z = 0.98
-Texts = 1
 
 [SongMenuButton2Text1]
-X = 30
+X = 6
 Y = 0
 Color = White
-Font = 0
 Size = 8
 Text = SONG_MENU_EDIT
-Align = 0
-Z = 0.99
+Z = 0.97
 
 [SongMenuButton3]
-X = 460
-Y = 225
-W = 270
+X = 530
+Y = 235
+Z = 0.97
+W = 220
 H = 25
 Tex = Rectangle
 Color = LightBlue
 DColor = DarkBlue
 Type = Colorized
 Texts = 1
-Z = 0.98
-Texts = 1
 
 [SongMenuButton3Text1]
-X = 30
+X = 6
 Y = 0
 Color = White
 Font = 0
 Size = 8
 Text = SONG_MENU_MODI
 Align = 0
-Z = 0.99
+Z = 0.97
 
 [SongMenuButton4]
-X = 460
-Y = 255
-W = 270
+X = 530
+Y = 265
+Z = 0.97
+W = 220
 H = 25
 Tex = Rectangle
 Color = LightBlue
 DColor = DarkBlue
 Type = Colorized
 Texts = 1
-Z = 0.98
 
 [SongMenuButton4Text1]
-X = 30
+X = 6
 Y = 0
 Color = White
 Font = 0
 Size = 8
 Text = SONG_MENU_CANCEL
 Align = 0
-Z = 0.99
-
-[SongMenuSelectSlide3]
-Tex = Rectangle
-TexSBG = SongMenuSelectBG
-Text =
-X = 460
-Y = 225
-W = 0
-H = 25
-Z = 0.98
-SkipX = 0
-SBGW = 270
-
-TextSize = 8
-
-Color = LightBlue
-DColor = DarkBlue
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = LightBlue
-SBGDColor = DarkBlue
-STColor = White
-STDColor = GrayDark
-
-[SongMenuTextMenu]
-X = 489
-Y = 125
-Color = White
-Font = 0
-Size = 14
-Text = MENU
-Align = 0
-Z = 0.99
-
-[SongMenuStatic2]
-X = 463
-Y = 135
-W = 21
-H = 21
-Color = White
-Tex = IconSongMenu
-Type = Colorized
-Z = 0.98
+Z = 0.97
+
+# uncommented cause it's not appearing anyways
+# TODO: why is this here?
+#[SongMenuSelectSlide1]
+#Tex = Rectangle
+#TexSBG = Top5BG 
+#Text =lalalalalalalala
+#Type
+#X = 524
+#Y = 295
+#W = 0
+#H = 25
+#Z = 0.97
+#SkipX = 0
+#SBGW = 270
+#TextSize = 8
+#Color = LightBlue
+#DColor = DarkBlue
+#TColor = White
+#TDColor = White
+#SBGTex = MainBar
+#SBGColor = LightBlue
+#SBGDColor = DarkBlue
+#STColor = White
+#STDColor = GrayDark
 
 [SongMenuStatic1]
-Tex = SongMenuBG
-X = 448
-Y = 120
-W = 300
-H = 200
-Z = 0.94
-Int = 1
-Color = DarkBlue
-Type = Colorized
+Tex = BGFade
+X = 0
+Y = 0
+W = 800
+H = 600
+Z = 0.96
+Color = Gray
+Type = Transparent
 
 [SongJumpto]
-Texts = 0
-Statics = 1
-
 [SongJumptoStatic1]
-Tex = JumpToBG
-X = 171
-Y = 175
-W = 355
-H = 175
-Z = 0.98
-Int = 1
-Color = DarkBlue
-Type = Colorized
+Tex = interface_dialog_background
+X = 500
+Y = 320
+W = 280
+H = 160
+Z = 0.965
+Color = White
+Type = Transparent
 
 [SongJumptoStatic2]
-X = 184
-Y = 185
-W = 21
-H = 21
+X = 508
+Y = 328
+W = 24
+H = 24
 Color = White
-Tex = MainSearch
+Tex = icon_song_search
 Type = Colorized
-Z = 0.99
+Z = 0.97
 
 [SongJumptoText1]
-X = 210
-Y = 175
-Color = White
-Font = 0
-Size = 14
+X = 538
+Y = 323
+Color = ColorLight
+Size = 12
 Text = SONG_JUMPTO_TYPE_DESC
-Align = 0
-Z = 0.99
+Z = 0.97
+
+#arrows over the select
+#TODO: remove, add this for all in code
+[SongJumptoStatic3]
+X = 510
+Y = 363
+W = 260
+H = 30
+Color = ColorLightest
+Tex = interface_selectbg_search
+Type = Colorized
+Z = 0.97
 
 [SongJumptoSelectSlideType]
-Tex = button
-TexSBG = mainicon
 #Text = SONG_JUMPTO_TYPE_DESC
-Font = 1
-X = 192
-Y = 205
-Z = 0.99
-W = 0
+X = 516
+Y = 363
+Z = 0.97
 H = 30
+SBGW = 150
 SkipX = 4
-SBGW = 300
-Fields = 2
-DColor = LightBlue
+
+Size = 12
+
+#text
 TColor = White
-TDColor = White
-SBGTex = button
-SBGDColor = LightBlue
+TDColor = Red
+#Select0r.Text.Color
 STColor = White
-STDColor = LightBlue
+STDColor = Red
 
 [SongJumptoButtonSearchText]
-X = 200
-Y = 215
-Z = 0.99
+X = 526
+Y = 375
+Z = 0.97
 W = 160
 H = 50
-Size = 14
+Size = 12
 Font = 1
 Align = 0
 
 [SongJumptoTextFound]
-X = 184
-Y = 295
+X = 539
+Y = 425
 Color = White
 Font = 0
 Size = 8
 Text = SONG_JUMPTO_HELP
 Align = 0
-Z = 0.99
+Z = 0.97
+
+[SongJumptoStatic4]
+Tex = BGFade
+X = 0
+Y = 0
+W = 800
+H = 600
+Z = 0.96
+Color = Gray
+Type = Colorized
 
 [StatMain]
 Texts = 0
@@ -7414,7 +7417,6 @@ H = 23
 Tex = ButtonNavi
 Color = White
 Type = Transparent
-Style = 5
 
 [StatMainStatic5]
 X = 388
@@ -7725,7 +7727,6 @@ H = 23
 Tex = ButtonNavi
 Color = White
 Type = Transparent
-Style = 5
 
 [StatDetailStatic5]
 X = 388
@@ -7763,7 +7764,6 @@ Tex = StatMainBG3
 Color = ColorLight
 Type = Colorized
 
-
 [StatDetailText1]
 X = 70
 Y = 6
@@ -7801,8 +7801,40 @@ Align = 0
 Text = SING_LEGEND_ESC
 
 [CheckPopup]
-Texts = 1
-Statics = 1
+
+[CheckPopupStatic2]
+Tex = interface_dialog_background
+X = 200
+Y = 150
+W = 400
+H = 200
+Z = 1
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 15
+
+[CheckPopupText1]
+X = 400
+Y = 160
+W = 400
+Color = ColorLight
+Font = 0
+Size = 10
+Text = MSG_QUESTION_TITLE
+Align = 1
+Z = 1
+
+[CheckPopupText]
+X = 400
+Y = 210
+W = 280
+Color = White
+Font = 0
+Size = 10
+Text = error text
+Align = 1
+Z = 1
 
 [CheckPopupButton1]
 X = 285
@@ -7848,40 +7880,19 @@ Text = NO
 Align = 1
 Z = 1
 
-[CheckPopupText]
-X = 400
-Y = 210
-W = 280
-Color = White
-Font = 0
-Size = 10
-Text = error text
-Align = 1
-Z = 1
-
-[CheckPopupText1]
-X = 400
-Y = 160
-W = 400
-Color = ColorLight
-Font = 0
-Size = 10
-Text = MSG_QUESTION_TITLE
-Align = 1
-Z = 1
-
 [CheckPopupStatic1]
 Tex = BGFade
 X = 0
 Y = 0
 W = 800
 H = 600
-Z = 0.90
+Z = 0.98
 Color = Gray
-Type = Colorized
+Type = Transparent
 
-[CheckPopupStatic2]
-Tex = PopUpBG
+[ErrorPopup]
+[ErrorPopupStatic2]
+Tex = interface_dialog_background
 X = 200
 Y = 150
 W = 400
@@ -7892,9 +7903,27 @@ Type = Transparent
 Reflection = 1
 ReflectionSpacing = 15
 
-[ErrorPopup]
-Texts = 1
-Statics = 1
+[ErrorPopupText1]
+X = 400
+Y = 160
+W = 400
+Color = ColorLight
+Font = 0
+Size = 10
+Text = MSG_ERROR_TITLE
+Align = 1
+Z = 1
+
+[ErrorPopupText]
+X = 400
+Y = 210
+W = 280
+Color = White
+Font = 0
+Size = 10
+Text = error text
+Align = 1
+Z = 1
 
 [ErrorPopupButton1]
 X = 350
@@ -7918,49 +7947,15 @@ Text = OK
 Align = 1
 Z = 1
 
-[ErrorPopupText]
-X = 400
-Y = 210
-W = 280
-Color = White
-Font = 0
-Size = 10
-Text = error text
-Align = 1
-Z = 1
-
-[ErrorPopupText1]
-X = 400
-Y = 160
-W = 400
-Color = ColorLight
-Font = 0
-Size = 10
-Text = MSG_ERROR_TITLE
-Align = 1
-Z = 1
-
 [ErrorPopupStatic1]
 Tex = BGFade
 X = 0
 Y = 0
 W = 800
 H = 600
-Z = 0.90
-Color = Gray
-Type = Colorized
-
-[ErrorPopupStatic2]
-Tex = PopUpBG
-X = 200
-Y = 150
-W = 400
-H = 200
 Z = 0.98
-Color = White
+Color = Gray
 Type = Transparent
-Reflection = 1
-ReflectionSpacing = 15
 
 [PausePopUpStatic]
 Tex = Pause
diff --git a/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 97f3f428..6f3c1e55 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -9,6 +9,20 @@ Name=Blue
 Color=Blue
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.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
@@ -27,13 +41,11 @@ PartyBG        = [bg-main]blue.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [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
@@ -163,7 +175,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 # # #
diff --git a/game/themes/Deluxe/[bg-load]blue.jpg b/game/themes/Deluxe/[bg-load]blue.jpg
index bea672c4..f2e2c27e 100644
--- a/game/themes/Deluxe/[bg-load]blue.jpg
+++ b/game/themes/Deluxe/[bg-load]blue.jpg
diff --git a/game/themes/Deluxe/[bg-main]blue.jpg b/game/themes/Deluxe/[bg-main]blue.jpg
index 67c4cbbe..376251a2 100644
--- a/game/themes/Deluxe/[bg-main]blue.jpg
+++ b/game/themes/Deluxe/[bg-main]blue.jpg
diff --git a/game/themes/Deluxe/[icon]search.png b/game/themes/Deluxe/[icon]search.png
deleted file mode 100644
index f91bd284..00000000
--- a/game/themes/Deluxe/[icon]search.png
+++ /dev/null
diff --git a/game/themes/Deluxe/[icon]songmenu.png b/game/themes/Deluxe/[icon]songmenu.png
deleted file mode 100644
index 623d5339..00000000
--- a/game/themes/Deluxe/[icon]songmenu.png
+++ /dev/null
diff --git a/game/themes/Deluxe/[main]selectbg.png b/game/themes/Deluxe/[main]selectbg.png
index 56c31041..093be9a5 100644
--- a/game/themes/Deluxe/[main]selectbg.png
+++ b/game/themes/Deluxe/[main]selectbg.png
diff --git a/game/themes/Deluxe/[main]songCover.jpg b/game/themes/Deluxe/[main]songCover.jpg
index 426bf22d..7cf8930b 100644
--- a/game/themes/Deluxe/[main]songCover.jpg
+++ b/game/themes/Deluxe/[main]songCover.jpg
diff --git a/game/themes/Deluxe/[main]songSelection1.png b/game/themes/Deluxe/[main]songSelection1.png
index f790bf06..0dfd41e1 100644
--- a/game/themes/Deluxe/[main]songSelection1.png
+++ b/game/themes/Deluxe/[main]songSelection1.png
diff --git a/game/themes/Deluxe/[main]songSelection2.png b/game/themes/Deluxe/[main]songSelection2.png
index 2a1808ac..bba4a451 100644
--- a/game/themes/Deluxe/[main]songSelection2.png
+++ b/game/themes/Deluxe/[main]songSelection2.png
diff --git a/game/themes/Deluxe/icon/song_menu.png b/game/themes/Deluxe/icon/song_menu.png
new file mode 100644
index 00000000..acf69bfb
--- /dev/null
+++ 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
new file mode 100644
index 00000000..f5190315
--- /dev/null
+++ 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
new file mode 100644
index 00000000..20170d5f
--- /dev/null
+++ b/game/themes/Deluxe/icon/song_video.png
diff --git a/game/themes/Deluxe/[menu]PopUpBg.png b/game/themes/Deluxe/interface/dialog_background.png
index ed032349..ed032349 100644
--- a/game/themes/Deluxe/[menu]PopUpBg.png
+++ b/game/themes/Deluxe/interface/dialog_background.png
diff --git a/game/themes/Deluxe/interface/selectbg_search.png b/game/themes/Deluxe/interface/selectbg_search.png
new file mode 100644
index 00000000..57d0ca88
--- /dev/null
+++ b/game/themes/Deluxe/interface/selectbg_search.png