61 files changed, 279 insertions, 107 deletions
diff --git a/Skins/Classic/Button3.jpg b/Skins/Classic/Button3.jpg
deleted file mode 100644
index bb283c41..00000000
--- a/Skins/Classic/Button3.jpg
+++ /dev/null
diff --git a/Skins/Classic/Left gray.bmp b/Skins/Classic/Left gray.bmp
deleted file mode 100644
index 328e0122..00000000
--- a/Skins/Classic/Left gray.bmp
+++ /dev/null
diff --git a/Skins/Classic/Line Bonus PopUp.JPG b/Skins/Classic/Line Bonus PopUp.JPG
deleted file mode 100644
index 4b399cb0..00000000
--- a/Skins/Classic/Line Bonus PopUp.JPG
+++ /dev/null
diff --git a/Skins/Classic/Line.jpg b/Skins/Classic/Line.jpg
deleted file mode 100644
index b3540a60..00000000
--- a/Skins/Classic/Line.jpg
+++ /dev/null
diff --git a/Skins/Classic/Main Bar2.jpg b/Skins/Classic/Main Bar2.jpg
deleted file mode 100644
index f541b90c..00000000
--- a/Skins/Classic/Main Bar2.jpg
+++ /dev/null
diff --git a/Skins/Classic/Main Solo.jpg b/Skins/Classic/Main Solo.jpg
deleted file mode 100644
index a7e3d82a..00000000
--- a/Skins/Classic/Main Solo.jpg
+++ /dev/null
diff --git a/Skins/Classic/Mid gray.bmp b/Skins/Classic/Mid gray.bmp
deleted file mode 100644
index 90d97860..00000000
--- a/Skins/Classic/Mid gray.bmp
+++ /dev/null
diff --git a/Skins/Classic/Note Star.jpg b/Skins/Classic/Note Star.jpg
deleted file mode 100644
index 1ef6243d..00000000
--- a/Skins/Classic/Note Star.jpg
+++ /dev/null
diff --git a/Skins/Classic/Right gray.bmp b/Skins/Classic/Right gray.bmp
deleted file mode 100644
index a4cbc1ae..00000000
--- a/Skins/Classic/Right gray.bmp
+++ /dev/null
diff --git a/Skins/Classic/Sing Bar Back.jpg b/Skins/Classic/Sing Bar Back.jpg
deleted file mode 100644
index ead02155..00000000
--- a/Skins/Classic/Sing Bar Back.jpg
+++ /dev/null
diff --git a/Skins/Classic/Sing Bar Bar.jpg b/Skins/Classic/Sing Bar Bar.jpg
deleted file mode 100644
index a7466084..00000000
--- a/Skins/Classic/Sing Bar Bar.jpg
+++ /dev/null
diff --git a/Skins/Classic/Sing Bar Front.jpg b/Skins/Classic/Sing Bar Front.jpg
deleted file mode 100644
index 35b4ff88..00000000
--- a/Skins/Classic/Sing Bar Front.jpg
+++ /dev/null
diff --git a/Skins/Classic/Sing Score BG.jpg b/Skins/Classic/Sing Score BG.jpg
deleted file mode 100644
index 9a1cc5e0..00000000
--- a/Skins/Classic/Sing Score BG.jpg
+++ /dev/null
diff --git a/Skins/Classic/Song Cover.jpg b/Skins/Classic/Song Cover.jpg
deleted file mode 100644
index ba84359c..00000000
--- a/Skins/Classic/Song Cover.jpg
+++ /dev/null
diff --git a/Skins/Classic/Standard.ini b/Skins/Classic/Standard.ini
deleted file mode 100644
index 4db43476..00000000
--- a/Skins/Classic/Standard.ini
+++ /dev/null
@@ -1,61 +0,0 @@
-;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=Classic
-Name=UltraStar
-Creator=UltraStar Deluxe Team
-Color=Blue
-
-[Textures]
-GrayLeft=Left Gray.bmp
-GrayMid=Mid Gray.bmp
-GrayRight=Right Gray.bmp
-NoteBGLeft=Note BG Left.bmp
-NoteBGMid=Note BG Mid.bmp
-NoteBGRight=Note BG Right.bmp
-NoteStar=Note Star.jpg
-NotePerfectStar=NotePerfectStar.jpg
-Ball=Ball.bmp
-SongCover=Song Cover.jpg
-
-Button=Button.jpg
-
-#BGS:
-#LoadingBG=
-#MainBG=
-#SongBG=
-#ScoreBG=
-#Top5BG=
-#OptionsBG=
-
-MainBar=Main Bar.jpg
-Logo=Main Bar2.jpg
-MainCursor=Main Cursor.jpg
-MainSolo=Main Solo.jpg
-MainMulti=Main Multi.jpg
-MainOptions=Main Options.jpg
-MainExit=Main Exit.jpg
-SongFade=Song Fade.jpg
-SongSelection=Song Selection.jpg
-Bar=Bar.jpg
-ButtonF=Button.jpg
-P=P.jpg
-ScoreLine=Score Line.jpg
-ScoreBox=Score Box.jpg
-ScoreLevel=Score Level.jpg
-ScoreLevelRound=Score Level Round.jpg
-
-ScoreBG=Sing Score BG.jpg
-
-LyricBar=Text Bar.jpg
-
-HDL_Pointer=Pointer.BMP
-
-SingBarBack=Sing Bar Back.jpg
-SingBarBar=Sing Bar Bar.jpg
-SingBarFront=Sing Bar Front.jpg
-
-LineBonusBack=Line Bonus PopUp.jpg
-\ No newline at end of file
diff --git a/Skins/Classic/Star.ini b/Skins/Classic/Star.ini
new file mode 100644
index 00000000..57ba3994
--- /dev/null
+++ b/Skins/Classic/Star.ini
@@ -0,0 +1,153 @@
+;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=Classic
+Name=Star
+Creator=UltraStar Deluxe Team
+Color=Blue
+
+[Textures]
+
+# # # M A I N # # #
+Button         = [main]Button.jpg
+ButtonF        = [main]ButtonEditor.jpg
+MainBar        = [main]Bar.jpg
+Logo           = [main]Logo.jpg
+
+#Backgrounds
+LoadingBG      = [bg-load]summer.jpg
+MainBG         = [bg-main]summer.jpg
+SongBG         = [bg-main]summer.jpg
+ScoreScreenBG  = [bg-main]summer.jpg
+Top5BG         = [bg-main]summer.jpg
+OptionsBG      = [bg-main]summer.jpg
+PartyBG        = [bg-main]summer.jpg
+
+#Icons on screen
+MainIcon       = [icon]Star.jpg
+MainSearch     = [icon]Search.jpg
+IconOption     = [icon]Options.jpg
+IconSongMenu   = [icon]SongMenu.jpg
+ScoreIcon      = [icon]Score.jpg
+PartyIcon      = [icon]Party.jpg
+StatIcon       = [icon]Stats.jpg
+SongCD         = [icon]cd.jpg
+
+# # # M A I N S C R E E N # # #
+ButtonSolo       = [mainbutton]Solo.jpg
+ButtonMulti      = [mainbutton]Multi.jpg
+ButtonEditor     = [mainbutton]Solo.jpg
+ButtonStats      = [mainbutton]Stats.jpg
+ButtonOptions    = [mainbutton]Options.jpg
+ButtonExit       = [mainbutton]Exit.jpg
+
+# # # S O N G S E L E C E T # # #
+SongSelection  = [song]selection.jpg
+SongFade       = [song]BGFade.jpg
+SongEqualizerBG= [song]EqualizerBG.jpg
+SongCover      = [main]songCover.jpg
+
+
+# # # S I N G # # #
+#the bar where the lyrics reside
+LyricBar       = [sing]textBar.jpg
+
+#this one slides in, to tell you that singing starts immediately
+LyricHelpBar   = [sing]lyricsHelpBar.bmp
+
+#the time progress bar  (not skinned in this theme :P )
+TimeBar1      = [sing]timeBarBG.jpg
+
+#the bar behind the timestuff
+TimeBar2      = [sing]timeBar.jpg
+
+#linebonus, the thing that pop ups at the score
+LineBonusBack  = [sing]lineBonusPopUp.jpg
+
+#Singbar (the thing beneath the scores)
+SingBarBack    = [sing]singBarBack.jpg
+SingBarBar     = [sing]singBarBar.jpg
+SingBarFront   = [sing]singBarFront.jpg
+
+#Background for scores
+ScoreBG        = [sing]scoreBg.jpg
+
+#Background for the P1, P2 and so on
+P              = [sing]p.jpg
+
+#Pointer for lyrics
+Ball           = [sing]LyricsBall.bmp
+
+
+# # # S C O R E / T O P 5 # # #
+ScoreBox        = [score]Box.jpg
+ScoreLevel      = [score]level.jpg
+ScoreLevelRound = [score]levelRound.jpg
+ScoreLine       = [score]line.jpg
+PlayerNumberBox = [main]playerNumberBox.jpg
+
+
+# # # P A R T Y # # #
+Joker             =[party]Joker.jpg
+PartyPlayerButton =[party]playerButton.jpg
+PartyTeamButton1  =[party]roundTeamButton.jpg
+PartyTeamButton2  =[party]playerTeamButton.jpg
+PartyTeamButton3  =[party]winTeamButton1.jpg
+PartyTeamButton4  =[party]winTeamButton2.jpg
+PartyTeamButton5  =[party]winTeamButton3.jpg
+PartyRoundBG1     =[party]roundBG1.jpg
+PartyRoundBG2     =[party]roundBG2.jpg
+PartyRoundBG3     =[party]roundBG3.jpg
+PartyRoundBG4     =[party]roundBG4.jpg
+HDL_Pointer       =[party]pointer.bmp
+PartyTeamPoints   =[party]teamPoints.jpg
+PartyScoreDeco    =x_[party]scoreDecoration.jpg
+PartyScoreBG1     =[party]scoreBG1.jpg
+PartyScoreBG2     =[party]scoreBG2.jpg
+PartyWinDeco1     =x_[party]winDecoration1.jpg
+PartyWinDeco2     =x_[party]winDecoration1.jpg
+PartyWinDeco3     =x_[party]winDecoration1.jpg
+
+# # # S T A T S # # #
+StatMainBG1 = [stat]mainBG1.jpg
+StatMainBG2 = [stat]mainBG2.jpg
+StatMainBG3 = [stat]mainBG3.jpg
+StatDetailBG1 = [stat]detailBG1.jpg
+
+
+# # # N A V I # # #
+ButtonP     = [button]p.jpg
+ButtonE     = [button]e.jpg
+ButtonM     = [button]m.jpg
+ButtonJ     = [button]j.jpg
+ButtonAlt   = [button]alt.jpg
+ButtonAZ    = [button]az.jpg
+ButtonEnter = [button]enter.jpg
+ButtonNavi  = [button]navi.jpg
+ButtonEsc   = [button]esc.jpg
+
+JumpToBG    = [menu]jumpToBg.jpg
+SongMenuBG  = [menu]songMenuBg.jpg
+PopUpBG     = [menu]popUpBG.jpg
+
+
+# # # N O T E S # # #
+GrayLeft    = [sing]notesLeft.bmp
+GrayMid     = [sing]notesMid.bmp
+GrayRight   = [sing]notesRight.bmp
+NoteBGLeft  = [sing]notesBgLeft.bmp
+NoteBGMid   = [sing]notesBgMid.bmp
+NoteBGRight = [sing]notesBgRight.bmp
+
+
+# # # E F F E C T S # # #
+NoteStar        = [effect]goldenNoteStar.jpg
+NotePerfectStar = [effect]perfectNoteStar.jpg
+
+
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.jpg
+\ No newline at end of file
diff --git a/Skins/Classic/Text Bar.jpg b/Skins/Classic/Text Bar.jpg
deleted file mode 100644
index bf55226d..00000000
--- a/Skins/Classic/Text Bar.jpg
+++ /dev/null
diff --git a/Skins/Classic/[button]alt.jpg b/Skins/Classic/[button]alt.jpg
new file mode 100644
index 00000000..193b8415
--- /dev/null
+++ b/Skins/Classic/[button]alt.jpg
diff --git a/Skins/Classic/[button]az.jpg b/Skins/Classic/[button]az.jpg
new file mode 100644
index 00000000..d2c80a87
--- /dev/null
+++ b/Skins/Classic/[button]az.jpg
diff --git a/Skins/Classic/[button]e.jpg b/Skins/Classic/[button]e.jpg
new file mode 100644
index 00000000..c5da3d9e
--- /dev/null
+++ b/Skins/Classic/[button]e.jpg
diff --git a/Skins/Classic/[button]enter.jpg b/Skins/Classic/[button]enter.jpg
new file mode 100644
index 00000000..3f6c8feb
--- /dev/null
+++ b/Skins/Classic/[button]enter.jpg
diff --git a/Skins/Classic/[button]esc.jpg b/Skins/Classic/[button]esc.jpg
new file mode 100644
index 00000000..9f055b6f
--- /dev/null
+++ b/Skins/Classic/[button]esc.jpg
diff --git a/Skins/Classic/[button]navi.jpg b/Skins/Classic/[button]navi.jpg
new file mode 100644
index 00000000..5640cac1
--- /dev/null
+++ b/Skins/Classic/[button]navi.jpg
diff --git a/Skins/Classic/[button]p.jpg b/Skins/Classic/[button]p.jpg
new file mode 100644
index 00000000..c5da3d9e
--- /dev/null
+++ b/Skins/Classic/[button]p.jpg
diff --git a/Skins/Classic/[effect]goldenNoteStar.jpg b/Skins/Classic/[effect]goldenNoteStar.jpg
new file mode 100644
index 00000000..1b31d267
--- /dev/null
+++ b/Skins/Classic/[effect]goldenNoteStar.jpg
diff --git a/Skins/Classic/NotePerfectStar.jpg b/Skins/Classic/[effect]perfectNoteStar.jpg
index 189a22a3..189a22a3 100644
--- a/Skins/Classic/NotePerfectStar.jpg
+++ b/Skins/Classic/[effect]perfectNoteStar.jpg
diff --git a/Skins/Classic/Main Cursor.jpg b/Skins/Classic/[icon]Star.jpg
index ee98f9d7..ee98f9d7 100644
--- a/Skins/Classic/Main Cursor.jpg
+++ b/Skins/Classic/[icon]Star.jpg
diff --git a/Skins/Classic/Main Bar.jpg b/Skins/Classic/[main]Bar.jpg
index 4e9693e3..4e9693e3 100644
--- a/Skins/Classic/Main Bar.jpg
+++ b/Skins/Classic/[main]Bar.jpg
diff --git a/Skins/Classic/Bar.jpg b/Skins/Classic/[main]Button.jpg
index e6191a95..e6191a95 100644
--- a/Skins/Classic/Bar.jpg
+++ b/Skins/Classic/[main]Button.jpg
diff --git a/Skins/Classic/Button.jpg b/Skins/Classic/[main]ButtonEditor.jpg
index 32e455ef..32e455ef 100644
--- a/Skins/Classic/Button.jpg
+++ b/Skins/Classic/[main]ButtonEditor.jpg
diff --git a/Skins/Classic/[main]Logo.jpg b/Skins/Classic/[main]Logo.jpg
new file mode 100644
index 00000000..d4d27533
--- /dev/null
+++ b/Skins/Classic/[main]Logo.jpg
diff --git a/Skins/Classic/[main]songCover.jpg b/Skins/Classic/[main]songCover.jpg
new file mode 100644
index 00000000..426bf22d
--- /dev/null
+++ b/Skins/Classic/[main]songCover.jpg
diff --git a/Skins/Classic/Square.jpg b/Skins/Classic/[main]square.jpg
index 8af62b71..8af62b71 100644
--- a/Skins/Classic/Square.jpg
+++ b/Skins/Classic/[main]square.jpg
diff --git a/Skins/Classic/Main Exit.jpg b/Skins/Classic/[mainbutton]Exit.jpg
index 55494e65..55494e65 100644
--- a/Skins/Classic/Main Exit.jpg
+++ b/Skins/Classic/[mainbutton]Exit.jpg
diff --git a/Skins/Classic/Main Multi.jpg b/Skins/Classic/[mainbutton]Multi.jpg
index ad5980d7..ad5980d7 100644
--- a/Skins/Classic/Main Multi.jpg
+++ b/Skins/Classic/[mainbutton]Multi.jpg
diff --git a/Skins/Classic/Main Options.jpg b/Skins/Classic/[mainbutton]Options.jpg
index 5e1bff71..5e1bff71 100644
--- a/Skins/Classic/Main Options.jpg
+++ b/Skins/Classic/[mainbutton]Options.jpg
diff --git a/Skins/Classic/Main Heart.jpg b/Skins/Classic/[mainbutton]Solo.jpg
index a7e3d82a..a7e3d82a 100644
--- a/Skins/Classic/Main Heart.jpg
+++ b/Skins/Classic/[mainbutton]Solo.jpg
diff --git a/Skins/Classic/[mainbutton]Stats.jpg b/Skins/Classic/[mainbutton]Stats.jpg
new file mode 100644
index 00000000..71cc13ad
--- /dev/null
+++ b/Skins/Classic/[mainbutton]Stats.jpg
diff --git a/Skins/Classic/Pointer.bmp b/Skins/Classic/[party]pointer.bmp
index 88bbcc3d..88bbcc3d 100644
--- a/Skins/Classic/Pointer.bmp
+++ b/Skins/Classic/[party]pointer.bmp
diff --git a/Skins/Classic/Score Box.jpg b/Skins/Classic/[score]box.jpg
index b37f7e46..b37f7e46 100644
--- a/Skins/Classic/Score Box.jpg
+++ b/Skins/Classic/[score]box.jpg
diff --git a/Skins/Classic/Score Level.jpg b/Skins/Classic/[score]level.jpg
index e47280cb..e47280cb 100644
--- a/Skins/Classic/Score Level.jpg
+++ b/Skins/Classic/[score]level.jpg
diff --git a/Skins/Classic/Score Level Round.jpg b/Skins/Classic/[score]levelround.jpg
index dbc5b5af..dbc5b5af 100644
--- a/Skins/Classic/Score Level Round.jpg
+++ b/Skins/Classic/[score]levelround.jpg
diff --git a/Skins/Classic/Score Line.jpg b/Skins/Classic/[score]line.jpg
index 2fd951aa..2fd951aa 100644
--- a/Skins/Classic/Score Line.jpg
+++ b/Skins/Classic/[score]line.jpg
diff --git a/Skins/Classic/Ball3.bmp b/Skins/Classic/[sing]LyricsBall.bmp
index 5b7d7943..5b7d7943 100644
--- a/Skins/Classic/Ball3.bmp
+++ b/Skins/Classic/[sing]LyricsBall.bmp
diff --git a/Skins/Classic/[sing]lineBonusPopUp.jpg b/Skins/Classic/[sing]lineBonusPopUp.jpg
new file mode 100644
index 00000000..58d93130
--- /dev/null
+++ b/Skins/Classic/[sing]lineBonusPopUp.jpg
diff --git a/Skins/Classic/Note BG Right.bmp b/Skins/Classic/[sing]notesBgLeft.bmp
index 62682410..776e567c 100644
--- a/Skins/Classic/Note BG Right.bmp
+++ b/Skins/Classic/[sing]notesBgLeft.bmp
diff --git a/Skins/Classic/Note BG Mid.bmp b/Skins/Classic/[sing]notesBgMid.bmp
index bc85ede9..759ac8a3 100644
--- a/Skins/Classic/Note BG Mid.bmp
+++ b/Skins/Classic/[sing]notesBgMid.bmp
diff --git a/Skins/Classic/Note BG Left.bmp b/Skins/Classic/[sing]notesBgRight.bmp
index 83e61525..9b1ffc18 100644
--- a/Skins/Classic/Note BG Left.bmp
+++ b/Skins/Classic/[sing]notesBgRight.bmp
diff --git a/Skins/Classic/[sing]notesLeft.bmp b/Skins/Classic/[sing]notesLeft.bmp
new file mode 100644
index 00000000..c819849b
--- /dev/null
+++ b/Skins/Classic/[sing]notesLeft.bmp
diff --git a/Skins/Classic/[sing]notesMid.bmp b/Skins/Classic/[sing]notesMid.bmp
new file mode 100644
index 00000000..2fdce32d
--- /dev/null
+++ b/Skins/Classic/[sing]notesMid.bmp
diff --git a/Skins/Classic/[sing]notesRight.bmp b/Skins/Classic/[sing]notesRight.bmp
new file mode 100644
index 00000000..3241beeb
--- /dev/null
+++ b/Skins/Classic/[sing]notesRight.bmp
diff --git a/Skins/Classic/P.jpg b/Skins/Classic/[sing]p.jpg
index 5217c6b1..5217c6b1 100644
--- a/Skins/Classic/P.jpg
+++ b/Skins/Classic/[sing]p.jpg
diff --git a/Skins/Classic/[sing]scoreBg.jpg b/Skins/Classic/[sing]scoreBg.jpg
new file mode 100644
index 00000000..01d3ca75
--- /dev/null
+++ b/Skins/Classic/[sing]scoreBg.jpg
diff --git a/Skins/Classic/[sing]singBarBack.jpg b/Skins/Classic/[sing]singBarBack.jpg
new file mode 100644
index 00000000..d7dcd791
--- /dev/null
+++ b/Skins/Classic/[sing]singBarBack.jpg
diff --git a/Skins/Classic/[sing]singBarBar.jpg b/Skins/Classic/[sing]singBarBar.jpg
new file mode 100644
index 00000000..4fd9bde9
--- /dev/null
+++ b/Skins/Classic/[sing]singBarBar.jpg
diff --git a/Skins/Classic/[sing]singBarFront.jpg b/Skins/Classic/[sing]singBarFront.jpg
new file mode 100644
index 00000000..eec27b79
--- /dev/null
+++ b/Skins/Classic/[sing]singBarFront.jpg
diff --git a/Skins/Classic/[sing]textBar.jpg b/Skins/Classic/[sing]textBar.jpg
new file mode 100644
index 00000000..e2734bce
--- /dev/null
+++ b/Skins/Classic/[sing]textBar.jpg
diff --git a/Skins/Classic/Song Fade.jpg b/Skins/Classic/[song]BGFade.jpg
index 1d6b80ff..1d6b80ff 100644
--- a/Skins/Classic/Song Fade.jpg
+++ b/Skins/Classic/[song]BGFade.jpg
diff --git a/Skins/Classic/[song]EqualizerBG.jpg b/Skins/Classic/[song]EqualizerBG.jpg
new file mode 100644
index 00000000..54ff27f2
--- /dev/null
+++ b/Skins/Classic/[song]EqualizerBG.jpg
diff --git a/Skins/Classic/Song Selection.jpg b/Skins/Classic/[song]selection.jpg
index b6c0065e..b6c0065e 100644
--- a/Skins/Classic/Song Selection.jpg
+++ b/Skins/Classic/[song]selection.jpg
diff --git a/Themes/Classic.ini b/Themes/Classic.ini
index c64da214..2f39d2f4 100644
--- a/Themes/Classic.ini
+++ b/Themes/Classic.ini
@@ -49,7 +49,7 @@ Tex=MainBG
 
 [MainText1]
 X =30
-Y =180
+Y =200
 Color=GrayLight
 Font =1
 Size =22
@@ -57,35 +57,44 @@ Text=SING_CHOOSE_MODE
 Align=0
 
 [MainText2]
-X =250
-Y =550
+X =226
+Y =574
 Color=Gray
 Font =1
-Size =8
+Size =7
 Text=SING_LEGEND_NAVIGATE
 Align=0
 
 [MainText3]
-X =500
-Y =550
+X =380
+Y =574
 Color=Gray
 Font =1
-Size =8
+Size =7
 Text=SING_LEGEND_SELECT
 Align=0
 
-[MainTextDescription]
-X =50
-Y =248
+[MainText4]
+X =535
+Y =574
 Color=Gray
 Font =1
+Size =7
+Text=SING_EDITOR
+Align=0
+
+[MainTextDescription]
+X =63
+Y =263
+Color=GrayDark
+Font =1
 Size =10
 Align=0
 Text=
 
 [MainTextDescriptionLong]
-X =50
-Y =280
+X =63
+Y =295
 Color=Black
 Font =0
 Size =10
@@ -106,9 +115,9 @@ TexX2=1
 TexY2=1
 
 [MainStatic2]
-Tex =MainCursor
-X =20
-Y =250
+Tex =MainIcon
+X =30
+Y =265
 W =32
 H =32
 Color =ColorDark
@@ -118,12 +127,77 @@ TexY1=0
 TexX2=1
 TexY2=1
 
+[MainStatic3]
+Tex =ButtonNavi
+X =190
+Y =570
+W =30
+H =22
+Color =White
+Type=Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
+[MainStatic4]
+Tex =ButtonEnter
+X =350
+Y =571
+W =26
+H =22
+Color =White
+Type=Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
+[MainStatic5]
+Tex =ButtonE
+X =510
+Y =570
+W =22
+H =22
+Color =White
+Type=Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
 [MainButtonSolo]
-X =470
+X =472
+Y =250
+W =58
+H =56
+Tex =ButtonSolo
+Color =ColorDark
+Int = 1
+DColor = GrayLightest
+DInt = 0.5
+Type=Font Black
+Texts=0
+
+[MainButtonMulti]
+X =532
+Y =250
+W =58
+H =56
+Tex =ButtonMulti
+Color =ColorDark
+Int = 1
+DColor = GrayLightest
+DInt = 0.5
+Type=Font Black
+Texts=0
+
+[MainButtonStats]
+X =592
 Y =250
 W =58
 H =56
-Tex =MainSolo
+Tex =ButtonStats
 Color =ColorDark
 Int = 1
 DColor = GrayLightest
@@ -132,24 +206,25 @@ Type=Font Black
 Texts=0
 
 [MainButtonEditor]
-X =530
+X =592
 Y =250
 W =58
 H =56
-Tex =MainMulti
+Tex =ButtonEditor
 Color =ColorDark
 Int = 1
 DColor = GrayLightest
 DInt = 0.5
 Type=Font Black
 Texts=0
+Visible=0
 
 [MainButtonOptions]
-X =590
+X =652
 Y =250
 W =58
 H =56
-Tex =MainOptions
+Tex =ButtonOptions
 Color =ColorDark
 Int = 1
 DColor = White
@@ -158,11 +233,11 @@ Type=Font Black
 Texts=0
 
 [MainButtonExit]
-X =650
+X =712
 Y =250
 W =58
 H =56
-Tex =MainExit
+Tex =ButtonExit
 Color =ColorDark
 Int = 1
 DColor = White
@@ -189,14 +264,14 @@ Visible=1
 Direction=1
 Color =Grey
 Alpha=1
-X=245
-Y=400
+X=320
+Y=488
 Z=1
-PieceW=6
-PieceH=2
+PieceW=8
+PieceH=3
 Space=1
-Bands=5
-Length=15
+Bands=4
+Length=7
 
 [SongText1]
 X =30
@@ -210,19 +285,10 @@ Align=0
 [SongText2]
 X =50
 Y =500
-Color=Gray
-Font =1
-Size =10
-Text=SING_CHOOSE_SONG
-Align=0
-
-[SongText3]
-X =380
-Y =570
 Color=Black
-Font =0
+Font =1
 Size =8
-Text =US_VERSION
+Text=SING_SONG_SELECTION_DESC
 Align=0
 
 [SongStatic1]
@@ -244,7 +310,7 @@ Y =500
 W =32
 H =32
 Color =ColorDark
-Tex =MainCursor
+Tex =MainIcon
 Type=Font Black
 TexX1=0
 TexY1=0
@@ -265,6 +331,20 @@ TexY1=0
 TexX2=1
 TexY2=1
 
+[SongStatic4]
+X =320
+Y =463
+Z = 0.8
+W =44
+H =28
+Color =Black
+Tex =SongEqualizerBG
+Type=Font Black
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
 [SongTextArtist]
 X =400
 Y =360
@@ -299,10 +379,10 @@ Color=Gray
 Font =1
 Size =7
 Align =0
-Text=Moin Moin Maus Fans
+Text=
 
 [SongStaticCat]
-Tex =Button
+Tex =
 X =12
 Y =7
 W =85
@@ -1886,7 +1966,7 @@ Size = 8
 Text=SING_LEGEND_SELECT
 
 [OptionsStatic1]
-Tex=MainCursor
+Tex=MainIcon
 X=40
 Y=250
 W=32
@@ -2953,7 +3033,7 @@ X=20
 Y=250
 W=32
 H=32
-Tex=MainCursor
+Tex=MainIcon
 Type=Font Black
 Color=ColorDark
 TexX1=0
@@ -3057,7 +3137,7 @@ X=20
 Y=250
 W=32
 H=32
-Tex=MainCursor
+Tex=MainIcon
 Type=Font Black
 Color=ColorDark
 TexX1=0