Several positions changed in the options, buttons are visible again, more to come

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

3 files changed, 312 insertions, 344 deletions

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index d5e590aa..5805fb1b 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -98,6 +98,7 @@ X = 0
 Y = 545
 W = 250
 H = 30
+Z = 0.4
 Tex = Leiste1
 Color = ColorLight
 Type = Colorized
@@ -109,6 +110,7 @@ X = 250
 Y = 545
 W = 550
 H = 30
+Z = 0.4
 Tex = Leiste2
 Color = White
 Type = Transparent
@@ -120,6 +122,7 @@ X = 260
 Y = 545
 W = 32
 H = 30
+Z = 0.5
 Tex = ButtonNavi
 Color = White
 Type = Transparent
@@ -129,6 +132,7 @@ ReflectionSpacing = 2
 [MainText2]
 X = 300
 Y = 548
+Z = 0.5
 Color = Black
 Font = 0
 Size = 8
@@ -142,6 +146,7 @@ X = 400
 Y = 545
 W = 32
 H = 30
+Z = 0.5
 Tex = ButtonEnter
 Color = White
 Type = Transparent
@@ -151,6 +156,7 @@ ReflectionSpacing = 2
 [MainText3]
 X = 440
 Y = 548
+Z = 0.5
 Color = Black
 Font = 0
 Size = 8
@@ -167,7 +173,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -195,7 +201,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -223,7 +229,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -249,10 +255,10 @@ X = 410
 Y = 310
 W = 140
 H = 30
-Tex = Rectangle
-Color = ColorLightest
-DColor = ColorDark
-Type = Colorized
+Tex = Button
+Color = ColorDark
+DColor = ColorLight
+Type = Transparent
 Texts = 1
 Reflection = 0
 Parent = 1
@@ -271,10 +277,10 @@ X = 410
 Y = 345
 W = 140
 H = 30
-Tex = Rectangle
-Color = ColorLightest
-DColor = ColorDark
-Type = Colorized
+Tex = Button
+Color = ColorDark
+DColor = ColorLight
+Type = Transparent
 Texts = 1
 Reflection = 0
 Parent = 1
@@ -293,10 +299,10 @@ X = 410
 Y = 380
 W = 140
 H = 30
-Tex = Rectangle
-Color = ColorLightest
-DColor = ColorDark
-Type = Colorized
+Tex = Button
+Color = ColorDark
+DColor = ColorLight
+Type = Transparent
 Texts = 1
 Reflection = 0
 Parent = 1
@@ -318,7 +324,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -2572,7 +2578,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Fade = 1
 FadeText = 1
@@ -2597,7 +2603,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Fade = 1
 FadeText = 1
@@ -2622,7 +2628,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Fade = 1
 FadeText = 1
@@ -2647,7 +2653,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Align = 0
 Texts = 1
 Fade = 1
@@ -2673,7 +2679,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Align = 0
 Texts = 1
 Fade = 1
@@ -2699,7 +2705,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Align = 0
 Texts = 1
 Fade = 1
@@ -2726,7 +2732,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Align = 0
 Texts = 1
 Fade = 1
@@ -2753,7 +2759,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Align = 0
 Texts = 1
 Fade = 1
@@ -2914,7 +2920,6 @@ SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsGameSelectSlideLanguage]
 Text = SING_OPTIONS_GAME_LANGUAGE
 Tex = MainBar
@@ -3004,10 +3009,12 @@ X = 40
 Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsGraphics]
 Texts = 5
@@ -3111,114 +3118,121 @@ Align = 0
 Text = SING_LEGEND_ESC
 
 [OptionsGraphicsSelectSlideResolution]
+Text = SING_OPTIONS_GRAPHICS_RESOLUTION
 Tex = MainBar
+Type = Colorized
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_RESOLUTION
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsGraphicsSelectFullscreen]
+Text = SING_OPTIONS_GRAPHICS_FULLSCREEN
 Tex = MainBar
+Type = Colorized
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_FULLSCREEN
-X = 40
-Y = 140
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsGraphicsSelectDepth]
+Text = SING_OPTIONS_GRAPHICS_DEPTH
 Tex = MainBar
+Type = Colorized
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_DEPTH
-X = 40
-Y = 195
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsGraphicsSelectOscilloscope]
+Text = SING_OPTIONS_GRAPHICS_OSCILLOSCOPE
 Tex = MainBar
+Type = Colorized
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_OSCILLOSCOPE
-X = 40
-Y = 250
+X = 70
+Y = 235
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsGraphicsSelectMovieSize]
+Text = SING_OPTIONS_GRAPHICS_MOVIE_SIZE
 Tex = MainBar
+Type = Colorized
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_MOVIE_SIZE
-X = 40
-Y = 305
+X = 70
+Y = 285
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsGraphicsButtonExit]
 X = 40
-Y = 360
+Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsSound]
 Texts = 5
@@ -3325,11 +3339,11 @@ Text = SING_LEGEND_ESC
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_MIC_BOOST
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3345,11 +3359,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_CLICK_ASSIST
-X = 40
-Y = 140
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3365,11 +3379,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_BEAT_CLICK
-X = 40
-Y = 195
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3385,31 +3399,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_THRESHOLD
-X = 40
-Y = 250
-W = 230
-H = 70
-SkipX = 50
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
-[OptionsSoundSelectTwoPlayerMode]
-Tex = MainBar
-TexSBG = SelectBG
-Text = SING_OPTIONS_SOUND_TWO_PLAYERS_MODE
-X = 40
-Y = 305
+X = 70
+Y = 235
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3425,11 +3419,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_PREVIEWVOLUME
-X = 40
-Y = 305
+X = 70
+Y = 285
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3445,11 +3439,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_SOUND_PREVIEWFADING
-X = 40
-Y = 360
+X = 70
+Y = 335
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3466,10 +3460,12 @@ X = 40
 Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsLyrics]
 Texts = 1
@@ -3576,11 +3572,11 @@ Text = SING_LEGEND_ESC
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_LYRICS_FONT
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3596,31 +3592,11 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_LYRICS_EFFECT
-X = 40
-Y = 140
-W = 230
-H = 70
-SkipX = 50
-
-Color = ColorDark
-DColor = Gray
-TColor = White
-TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
-STColor = White
-STDColor = GrayDark
-
-[OptionsLyricsSelectSolmization]
-Tex = MainBar
-TexSBG = SelectBG
-Text = SING_OPTIONS_LYRICS_SOLMIZATION
-X = 40
-Y = 195
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
 DColor = Gray
@@ -3636,11 +3612,12 @@ STDColor = GrayDark
 Tex = MainBar
 TexSBG = SelectBG
 Text = SING_OPTIONS_LYRICS_NOTELINES
-X = 40
-Y = 250
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
+
 Color = ColorDark
 DColor = Gray
 TColor = White
@@ -3653,13 +3630,15 @@ STDColor = GrayDark
 
 [OptionsLyricsButtonExit]
 X = 40
-Y = 325
+Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsThemes]
 Texts = 5
@@ -3763,74 +3742,76 @@ Align = 0
 Text = SING_LEGEND_ESC
 
 [OptionsThemesSelectTheme]
+Text = SING_OPTIONS_THEMES_THEME
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_THEMES_THEME
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsThemesSelectSkin]
+Text = SING_OPTIONS_THEMES_SKIN
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_THEMES_SKIN
-X = 40
-Y = 140
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsThemesSelectColor]
+Text = SING_OPTIONS_THEMES_COLOR
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_THEMES_COLOR
-X = 40
-Y = 195
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsThemesButtonExit]
 X = 40
-Y = 250
+Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsRecord]
 Texts = 5
@@ -3934,78 +3915,76 @@ Align = 0
 Text = SING_LEGEND_ESC
 
 [OptionsRecordSelectSlideCard]
+Text = SING_OPTIONS_RECORD_CARD
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_RECORD_CARD
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
-Fields = 1
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsRecordSelectSlideInput]
+Text = SING_OPTIONS_RECORD_INPUT
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_RECORD_INPUT
-X = 40
-Y = 140
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
-Fields = 1
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsRecordSelectSlideChannel]
+Text = SING_OPTIONS_RECORD_CHANNEL
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_RECORD_CHANNEL
-X = 40
-Y = 195
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
-Fields = 7
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsRecordButtonExit]
 X = 40
-Y = 305
+Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [OptionsAdvanced]
 Texts = 5
@@ -4110,154 +4089,157 @@ Text = SING_LEGEND_ESC
 
 #########unused at the moment#########
 #[OptionsAdvancedSelectLoadAnimation]
+#Text = SING_OPTIONS_ADVANCED_LOADANIMATION
 #Tex = MainBar
 #TexSBG = SelectBG
-#Text = SING_OPTIONS_ADVANCED_LOADANIMATION
 #X = 40
 #Y = 85
 #W = 230
 #H = 70
-#SkipX = 50
+#SkipX = 10
 
 #Color = ColorDark
-#DColor = Gray
+#DColor = ColorLight
 #TColor = White
 #TDColor = White
-#SBGTex = MainBar
-#SBGColor = ColorDark
-#SBGDColor = Gray
+ 
+#SBGColor = DarkBlue
+#SBGDColor = LightBlue
 #STColor = White
 #STDColor = GrayDark
 
 [OptionsAdvancedSelectScreenFade]
+Text = SING_OPTIONS_ADVANCED_SCREENFADE
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_ADVANCED_SCREENFADE
-X = 40
+X = 70
 Y = 85
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsAdvancedSelectEffectSing]
+Text = SING_OPTIONS_ADVANCED_EFFECTSING
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_ADVANCED_EFFECTSING
-X = 40
-Y = 140
+X = 70
+Y = 135
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsAdvancedSelectLineBonus]
+Text = SING_OPTIONS_GRAPHICS_LINEBONUS
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_GRAPHICS_LINEBONUS
-X = 40
-Y = 195
+X = 70
+Y = 185
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsAdvancedSelectSlideOnSongClick]
+Text = SING_OPTIONS_ADVANCED_ONSONGCLICK
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_ADVANCED_ONSONGCLICK
-X = 40
-Y = 250
+X = 70
+Y = 235
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsAdvancedSelectAskbeforeDel]
+Text = SING_OPTIONS_ADVANCED_ASKBEFOREDEL
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_ADVANCED_ASKBEFOREDEL
-X = 40
-Y = 305
+X = 70
+Y = 285
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
 [OptionsAdvancedSelectPartyPopup]
+Text = SING_OPTIONS_ADVANCED_PARTYPOPUP
 Tex = MainBar
 TexSBG = SelectBG
-Text = SING_OPTIONS_ADVANCED_PARTYPOPUP
-X = 40
-Y = 360
+X = 70
+Y = 335
 W = 230
-H = 70
-SkipX = 50
+H = 40
+SkipX = 10
 
 Color = ColorDark
-DColor = Gray
+DColor = ColorLight
 TColor = White
 TDColor = White
-SBGTex = MainBar
-SBGColor = ColorDark
-SBGDColor = Gray
+
+SBGColor = DarkBlue
+SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
+
 [OptionsAdvancedButtonExit]
 X = 40
 Y = 415
 W = 230
 H = 70
-Tex = MainBar
-Color = ColorDark
-DColor = Gray
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
 
 [Top5]
 Texts = 1
@@ -4646,7 +4628,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -4665,7 +4647,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -4684,7 +4666,7 @@ H = 50
 Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 15
@@ -4850,7 +4832,7 @@ H = 50
 Tex = Button
 Color = P1Dark
 DColor = P1Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -4872,7 +4854,7 @@ H = 50
 Tex = Button
 Color = P2Dark
 DColor = P2Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -4894,7 +4876,7 @@ H = 50
 Tex = Button
 Color = P3Dark
 DColor = P3Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -4916,7 +4898,7 @@ H = 50
 Tex = Button
 Color = P4Dark
 DColor = P4Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -4938,7 +4920,7 @@ H = 50
 Tex = Button
 Color = P5Dark
 DColor = P5Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -4960,7 +4942,7 @@ H = 50
 Tex = Button
 Color = P6Dark
 DColor = P6Light
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 1
 ReflectionSpacing = 2
@@ -6689,7 +6671,7 @@ X = 85
 Y = 160
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P1Lightest
 DColor = P1Light
@@ -6711,7 +6693,7 @@ X = 245
 Y = 160
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P1Lightest
 DColor = P1Light
@@ -6733,7 +6715,7 @@ X = 405
 Y = 160
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P1Lightest
 DColor = P1Light
@@ -6755,7 +6737,7 @@ X = 565
 Y = 160
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P1Lightest
 DColor = P1Light
@@ -6797,7 +6779,7 @@ X = 85
 Y = 300
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P2Lightest
 DColor = P2Light
@@ -6819,7 +6801,7 @@ X = 245
 Y = 300
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P2Lightest
 DColor = P2Light
@@ -6841,7 +6823,7 @@ X = 405
 Y = 300
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P2Lightest
 DColor = P2Light
@@ -6863,7 +6845,7 @@ X = 565
 Y = 300
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P2Lightest
 DColor = P2Light
@@ -6880,13 +6862,12 @@ Text = Player 8
 Color = White
 
 [PartyPlayerTeam3Name]
-Tex = Button
 Tex = PartyTeamButton2
 X = 85
 Y = 380
 W = 310
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P3Lightest
 DColor = P3Dark
@@ -6900,13 +6881,14 @@ Align = 1
 Text = Team 3
 Color = White
 
+
 [PartyPlayerPlayer9Name]
 Tex = Button
 X = 85
 Y = 440
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P3Lightest
 DColor = P3Light
@@ -6928,7 +6910,7 @@ X = 245
 Y = 440
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P3Lightest
 DColor = P3Light
@@ -6950,7 +6932,7 @@ X = 405
 Y = 440
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P3Lightest
 DColor = P3Light
@@ -6972,7 +6954,7 @@ X = 565
 Y = 440
 W = 150
 H = 50
-Type = Colorized
+Type = Transparent
 Texts = 1
 Color = P3Lightest
 DColor = P3Light
@@ -7230,7 +7212,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7251,7 +7233,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7272,7 +7254,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7293,7 +7275,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7314,7 +7296,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7474,7 +7456,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7495,7 +7477,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7516,7 +7498,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7537,7 +7519,7 @@ H = 50
 Tex = Button
 Color = DarkBlue
 DColor = LightBlue
-Type = Colorized
+Type = Transparent
 Texts = 1
 Reflection = 0
 
@@ -7771,10 +7753,10 @@ X = 285
 Y = 310
 W = 100
 H = 25
-Tex = Rectangle
+Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Z = 1
 
@@ -7793,10 +7775,10 @@ X = 415
 Y = 310
 W = 100
 H = 25
-Tex = Rectangle
+Tex = Button
 Color = ColorLight
 DColor = ColorDark
-Type = Colorized
+Type = Transparent
 Texts = 1
 Z = 1
 
@@ -7854,19 +7836,6 @@ Type = Transparent
 Reflection = 1
 ReflectionSpacing = 15
 
-
-
-;[CheckPopupStatic2]
-;Tex = IconQuestion
-;X = 255
-;Y = 151
-;W = 23
-;H = 23
-;Z = 0.99
-;Int = 1
-;Color = White
-;Type = Colorized
-
 [ErrorPopup]
 Texts = 1
 Statics = 1
@@ -7876,13 +7845,12 @@ X = 350
 Y = 310
 W = 100
 H = 25
-Tex = Rectangle
-Color = LightBlue
-DColor = DarkBlue
-Type = Colorized
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
 Texts = 1
 Z = 1
-Texts = 1
 
 [ErrorPopupButton1Text1]
 X = 50
diff --git a/Themes/Deluxe/[helper]buttonFade.png b/Themes/Deluxe/[helper]buttonFade.png
index fbb7ffa0..27a94c44 100644
--- a/Themes/Deluxe/[helper]buttonFade.png
+++ b/Themes/Deluxe/[helper]buttonFade.png
diff --git a/Themes/Deluxe/[main]button.png b/Themes/Deluxe/[main]button.png
index 65251816..7d05462d 100644
--- a/Themes/Deluxe/[main]button.png
+++ b/Themes/Deluxe/[main]button.png