210 files changed, 186 insertions, 100 deletions

diff --git a/game/themes/Classic/Star.ini b/game/themes/Classic/Star.ini
index 263118b9..e72bdbec 100644
--- a/game/themes/Classic/Star.ini
+++ b/game/themes/Classic/Star.ini
@@ -6,155 +6,241 @@
 [Skin]
 Theme=Classic
 Name=Star
-Creator=UltraStar Deluxe Team
 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.jpg
-ButtonF        = [main]ButtonEditor.jpg
-MainBar        = [main]Bar.jpg
-Logo           = [main]Logo.jpg
+ButtonSolo       = [mainbutton]Solo.png
+ButtonMulti      = [mainbutton]Multi.png
+ButtonEditor     = [mainbutton]Solo.png
+ButtonStats      = [mainbutton]Stats.png
+ButtonOptions    = [mainbutton]Options.png
+ButtonExit       = [mainbutton]Exit.png
+Button           = [main]button.png
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.png
+SelectBG       = [main]selectbg.png
+
+usdx_logo        = [main]logo.png
+SongsBG		 = [songs]bg.png	
+SongFade 	 = [song]BGFade.jpg
+SongEqualizerBG  = [song]EqualizerBG.jpg
+
+Select_ArrowLeft = [interface]select_arrow_left.png
+Select_ArrowRight = [interface]select_arrow_right.png
 
 #Backgrounds
-#LoadingBG      = #Placeholder for new Classic Skins
-#MainBG         = 
-#SongBG         = 
-#ScoresBG       = 
-#Top5BG         = 
-#OptionsBG      = 
-#PartyBG        = 
+LoadingBG      = [bg-main]star.jpg
+MainBG         = [bg-main]star.jpg
+SongBG         = [bg-main]star.jpg
+ScoreScreenBG  = [bg-main]star.jpg
+Top5BG         = [bg-main]star.jpg
+OptionsBG      = [bg-main]star.jpg
+EditBG         = [bg-main]star.jpg
+PartyBG        = [bg-main]star.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
-IconQuestion   = [icon]question.jpg
-IconError      = [icon]error.jpg
-VideoIcon      = [icon]video.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
+SongCD         = [icon]cd.png
+MainIcon       = [icon]star.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 # # #
-SongSelection  = [song]selection.jpg
-SongFade       = [song]BGFade.jpg
-SongEqualizerBG= [song]EqualizerBG.jpg
+SongSelection = [song]selection.png
 SongCover      = [main]songCover.jpg
 
 
 # # # S I N G # # #
 #the bar where the lyrics reside
-LyricBar       = [sing]textBar.jpg
+LyricBar       = [sing]textBar.png
 
 #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
+LyricHelpBar   = [sing]lyricsHelpBar.png
 
 #the bar behind the timestuff
-TimeBar2      = [sing]timeBar.jpg
+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.jpg
+LineBonusBack  = [sing]lineBonusPopUp.png
 
 #Singbar (the thing beneath the scores)
-SingBarBack    = [sing]singBarBack.jpg
-SingBarBar     = [sing]singBarBar.jpg
-SingBarFront   = [sing]singBarFront.jpg
+SingBarBack    = [sing]singBarBack.png
+SingBarBar     = [sing]singBarBar.png
+SingBarFront   = [sing]singBarFront.png
 
 #Background for scores
-ScoreBG        = [sing]scoreBg.jpg
+ScoreBG        = [sing]scoreBg.png
 
 #Background for the P1, P2 and so on
-P              = [sing]p.jpg
+P              = [sing]p.png
 
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
 
 # # # 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
+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.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    =[party]scoreDecoration.jpg
-PartyScoreBG1     =[party]scoreBG1.jpg
-PartyScoreBG2     =[party]scoreBG2.jpg
-PartyWinDeco1     =[party]winDecoration.jpg
-PartyWinDeco2     =[party]winDecoration.jpg
-PartyWinDeco3     =[party]winDecoration.jpg
+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.jpg
-StatMainBG2 = [stat]mainBG2.jpg
-StatMainBG3 = [stat]mainBG3.jpg
-StatDetailBG1 = [stat]detailBG1.jpg
+StatMainBG1 = [stat]mainBG1.png
+StatMainBG2 = [stat]mainBG2.png
+StatMainBG3 = [stat]mainBG3.png
+StatDetailBG1 = [stat]detailBG1.png
 
 
 # # # 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
-Button13    = [button]13.jpg
-
-JumpToBG    = [menu]JumptoBg.jpg
-SongMenuBG  = [menu]songMenuBg.jpg
-SongMenuBorder  = [menu]songMenuBorder.jpg
-SongMenuButton = [menu]songMenuButtonBG.jpg
-SongMenuSelectBG  = [menu]songMenuSelectBg.jpg
-PopUpBG     = [menu]popUpBG.jpg
-PopUpFG     = [menu]popUpFG.jpg
+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
+ButtonE    = [button]e.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 # # #
-GrayLeft    = [sing]notesLeft.bmp
-GrayMid     = [sing]notesMid.bmp
-GrayRight   = [sing]notesRight.bmp
-NoteBGLeft  = [sing]notesBgLeft.bmp
-NoteBGMid   = [sing]notesBgMid.bmp
-NoteBGRight = [sing]notesBgRight.bmp
+# 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.jpg
-NotePerfectStar = [effect]perfectNoteStar.jpg
+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/Classic/[bg-load]star.jpg b/game/themes/Classic/[bg-load]star.jpg
new file mode 100644
index 00000000..c94a7f9c
--- /dev/null
+++ b/game/themes/Classic/[bg-load]star.jpg
diff --git a/game/themes/Classic/[bg-main]star.jpg b/game/themes/Classic/[bg-main]star.jpg
new file mode 100644
index 00000000..0cd0a9aa
--- /dev/null
+++ b/game/themes/Classic/[bg-main]star.jpg
diff --git a/game/themes/Classic/[button]13.jpg b/game/themes/Classic/[button]13.jpg
deleted file mode 100644
index 5787bb24..00000000
--- a/game/themes/Classic/[button]13.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]13.png b/game/themes/Classic/[button]13.png
new file mode 100644
index 00000000..9b1a8761
--- /dev/null
+++ b/game/themes/Classic/[button]13.png
diff --git a/game/themes/Classic/[button]alt.jpg b/game/themes/Classic/[button]alt.jpg
deleted file mode 100644
index ec3e630f..00000000
--- a/game/themes/Classic/[button]alt.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]alt.png b/game/themes/Classic/[button]alt.png
new file mode 100644
index 00000000..6232f783
--- /dev/null
+++ b/game/themes/Classic/[button]alt.png
diff --git a/game/themes/Classic/[button]az.jpg b/game/themes/Classic/[button]az.jpg
deleted file mode 100644
index b486604e..00000000
--- a/game/themes/Classic/[button]az.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]az.png b/game/themes/Classic/[button]az.png
new file mode 100644
index 00000000..ffd356bd
--- /dev/null
+++ b/game/themes/Classic/[button]az.png
diff --git a/game/themes/Classic/[button]e.jpg b/game/themes/Classic/[button]e.jpg
deleted file mode 100644
index 7b247260..00000000
--- a/game/themes/Classic/[button]e.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]e.png b/game/themes/Classic/[button]e.png
new file mode 100644
index 00000000..948d4911
--- /dev/null
+++ b/game/themes/Classic/[button]e.png
diff --git a/game/themes/Classic/[button]enter.jpg b/game/themes/Classic/[button]enter.jpg
deleted file mode 100644
index 16ee885a..00000000
--- a/game/themes/Classic/[button]enter.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]enter.png b/game/themes/Classic/[button]enter.png
new file mode 100644
index 00000000..51e994e1
--- /dev/null
+++ b/game/themes/Classic/[button]enter.png
diff --git a/game/themes/Classic/[button]esc.jpg b/game/themes/Classic/[button]esc.jpg
deleted file mode 100644
index 7c40487a..00000000
--- a/game/themes/Classic/[button]esc.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]esc.png b/game/themes/Classic/[button]esc.png
new file mode 100644
index 00000000..075e4e97
--- /dev/null
+++ b/game/themes/Classic/[button]esc.png
diff --git a/game/themes/Classic/[button]j.jpg b/game/themes/Classic/[button]j.jpg
deleted file mode 100644
index b6eed56c..00000000
--- a/game/themes/Classic/[button]j.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]j.png b/game/themes/Classic/[button]j.png
new file mode 100644
index 00000000..31010a41
--- /dev/null
+++ b/game/themes/Classic/[button]j.png
diff --git a/game/themes/Classic/[button]m.jpg b/game/themes/Classic/[button]m.jpg
deleted file mode 100644
index ebb7156e..00000000
--- a/game/themes/Classic/[button]m.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]m.png b/game/themes/Classic/[button]m.png
new file mode 100644
index 00000000..2cf5f02f
--- /dev/null
+++ b/game/themes/Classic/[button]m.png
diff --git a/game/themes/Classic/[button]navi.jpg b/game/themes/Classic/[button]navi.jpg
deleted file mode 100644
index 41b44525..00000000
--- a/game/themes/Classic/[button]navi.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]navi.png b/game/themes/Classic/[button]navi.png
new file mode 100644
index 00000000..1b479aaf
--- /dev/null
+++ b/game/themes/Classic/[button]navi.png
diff --git a/game/themes/Classic/[button]p.jpg b/game/themes/Classic/[button]p.jpg
deleted file mode 100644
index d2d60c02..00000000
--- a/game/themes/Classic/[button]p.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[button]p.png b/game/themes/Classic/[button]p.png
new file mode 100644
index 00000000..d12d04c5
--- /dev/null
+++ b/game/themes/Classic/[button]p.png
diff --git a/game/themes/Classic/[effect]goldenNoteStar.jpg b/game/themes/Classic/[effect]goldenNoteStar.jpg
deleted file mode 100644
index 1b31d267..00000000
--- a/game/themes/Classic/[effect]goldenNoteStar.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[effect]goldenNoteStar.png b/game/themes/Classic/[effect]goldenNoteStar.png
new file mode 100644
index 00000000..7bd6225f
--- /dev/null
+++ b/game/themes/Classic/[effect]goldenNoteStar.png
diff --git a/game/themes/Classic/[effect]perfectNoteStar.jpg b/game/themes/Classic/[effect]perfectNoteStar.jpg
deleted file mode 100644
index 189a22a3..00000000
--- a/game/themes/Classic/[effect]perfectNoteStar.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[effect]perfectNoteStar.png b/game/themes/Classic/[effect]perfectNoteStar.png
new file mode 100644
index 00000000..99132c39
--- /dev/null
+++ b/game/themes/Classic/[effect]perfectNoteStar.png
diff --git a/game/themes/Classic/[helper]buttonFade.png b/game/themes/Classic/[helper]buttonFade.png
new file mode 100644
index 00000000..27a94c44
--- /dev/null
+++ b/game/themes/Classic/[helper]buttonFade.png
diff --git a/game/themes/Classic/[helper]rectangle.jpg b/game/themes/Classic/[helper]rectangle.jpg
index e03f98fc..9b4ba0f9 100644
--- a/game/themes/Classic/[helper]rectangle.jpg
+++ b/game/themes/Classic/[helper]rectangle.jpg
diff --git a/game/themes/Classic/[icon]Star.jpg b/game/themes/Classic/[icon]Star.jpg
deleted file mode 100644
index ee98f9d7..00000000
--- a/game/themes/Classic/[icon]Star.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[icon]Star.png b/game/themes/Classic/[icon]Star.png
new file mode 100644
index 00000000..409e9599
--- /dev/null
+++ b/game/themes/Classic/[icon]Star.png
diff --git a/game/themes/Classic/[icon]cd.png b/game/themes/Classic/[icon]cd.png
new file mode 100644
index 00000000..2633d235
--- /dev/null
+++ b/game/themes/Classic/[icon]cd.png
diff --git a/game/themes/Classic/[icon]error.jpg b/game/themes/Classic/[icon]error.jpg
deleted file mode 100644
index 5802e312..00000000
--- a/game/themes/Classic/[icon]error.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[icon]error.png b/game/themes/Classic/[icon]error.png
new file mode 100644
index 00000000..f952f3fa
--- /dev/null
+++ b/game/themes/Classic/[icon]error.png
diff --git a/game/themes/Classic/[icon]main.png b/game/themes/Classic/[icon]main.png
new file mode 100644
index 00000000..f7d50067
--- /dev/null
+++ b/game/themes/Classic/[icon]main.png
diff --git a/game/themes/Classic/[icon]options.png b/game/themes/Classic/[icon]options.png
new file mode 100644
index 00000000..9fac0bfd
--- /dev/null
+++ b/game/themes/Classic/[icon]options.png
diff --git a/game/themes/Classic/[icon]party.png b/game/themes/Classic/[icon]party.png
new file mode 100644
index 00000000..e23230e3
--- /dev/null
+++ b/game/themes/Classic/[icon]party.png
diff --git a/game/themes/Classic/[icon]question.jpg b/game/themes/Classic/[icon]question.jpg
deleted file mode 100644
index e78fe6a8..00000000
--- a/game/themes/Classic/[icon]question.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[icon]question.png b/game/themes/Classic/[icon]question.png
new file mode 100644
index 00000000..a72a5c43
--- /dev/null
+++ b/game/themes/Classic/[icon]question.png
diff --git a/game/themes/Classic/[icon]score.png b/game/themes/Classic/[icon]score.png
new file mode 100644
index 00000000..ccc3d8ff
--- /dev/null
+++ b/game/themes/Classic/[icon]score.png
diff --git a/game/themes/Classic/[icon]song_menu.png b/game/themes/Classic/[icon]song_menu.png
new file mode 100644
index 00000000..acf69bfb
--- /dev/null
+++ b/game/themes/Classic/[icon]song_menu.png
diff --git a/game/themes/Classic/[icon]song_search.png b/game/themes/Classic/[icon]song_search.png
new file mode 100644
index 00000000..f5190315
--- /dev/null
+++ b/game/themes/Classic/[icon]song_search.png
diff --git a/game/themes/Classic/[icon]song_video.png b/game/themes/Classic/[icon]song_video.png
new file mode 100644
index 00000000..4a679249
--- /dev/null
+++ b/game/themes/Classic/[icon]song_video.png
diff --git a/game/themes/Classic/[icon]stats.jpg b/game/themes/Classic/[icon]stats.jpg
deleted file mode 100644
index cd5e03fb..00000000
--- a/game/themes/Classic/[icon]stats.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[icon]stats.png b/game/themes/Classic/[icon]stats.png
new file mode 100644
index 00000000..d8e5eac1
--- /dev/null
+++ b/game/themes/Classic/[icon]stats.png
diff --git a/game/themes/Classic/[icon]video.jpg b/game/themes/Classic/[icon]video.jpg
deleted file mode 100644
index 12d71add..00000000
--- a/game/themes/Classic/[icon]video.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[icon]video.png b/game/themes/Classic/[icon]video.png
new file mode 100644
index 00000000..9bd65f86
--- /dev/null
+++ b/game/themes/Classic/[icon]video.png
diff --git a/game/themes/Classic/[interface]cursor.png b/game/themes/Classic/[interface]cursor.png
new file mode 100644
index 00000000..0fe390f0
--- /dev/null
+++ b/game/themes/Classic/[interface]cursor.png
diff --git a/game/themes/Classic/[interface]cursor_pressed.png b/game/themes/Classic/[interface]cursor_pressed.png
new file mode 100644
index 00000000..fa0056cc
--- /dev/null
+++ b/game/themes/Classic/[interface]cursor_pressed.png
diff --git a/game/themes/Classic/[interface]dialog_background.png b/game/themes/Classic/[interface]dialog_background.png
new file mode 100644
index 00000000..f4ab4660
--- /dev/null
+++ b/game/themes/Classic/[interface]dialog_background.png
diff --git a/game/themes/Classic/[interface]select_arrow_left.png b/game/themes/Classic/[interface]select_arrow_left.png
new file mode 100644
index 00000000..e4a32d2d
--- /dev/null
+++ b/game/themes/Classic/[interface]select_arrow_left.png
diff --git a/game/themes/Classic/[interface]select_arrow_right.png b/game/themes/Classic/[interface]select_arrow_right.png
new file mode 100644
index 00000000..b2a29793
--- /dev/null
+++ b/game/themes/Classic/[interface]select_arrow_right.png
diff --git a/game/themes/Classic/[interface]selectbg_search.png b/game/themes/Classic/[interface]selectbg_search.png
new file mode 100644
index 00000000..57d0ca88
--- /dev/null
+++ b/game/themes/Classic/[interface]selectbg_search.png
diff --git a/game/themes/Classic/[main]Bar.jpg b/game/themes/Classic/[main]Bar.jpg
deleted file mode 100644
index 2453cc3b..00000000
--- a/game/themes/Classic/[main]Bar.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]Bar1.jpg b/game/themes/Classic/[main]Bar1.jpg
deleted file mode 100644
index 4e9693e3..00000000
--- a/game/themes/Classic/[main]Bar1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]Button.jpg b/game/themes/Classic/[main]Button.jpg
deleted file mode 100644
index e6191a95..00000000
--- a/game/themes/Classic/[main]Button.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]Button2.jpg b/game/themes/Classic/[main]Button2.jpg
deleted file mode 100644
index e3e9679a..00000000
--- a/game/themes/Classic/[main]Button2.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]Button3.jpg b/game/themes/Classic/[main]Button3.jpg
deleted file mode 100644
index 3ac1f442..00000000
--- a/game/themes/Classic/[main]Button3.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]ButtonEditor.jpg b/game/themes/Classic/[main]ButtonEditor.jpg
deleted file mode 100644
index 32e455ef..00000000
--- a/game/themes/Classic/[main]ButtonEditor.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]Logo.jpg b/game/themes/Classic/[main]Logo.jpg
deleted file mode 100644
index 1902cb02..00000000
--- a/game/themes/Classic/[main]Logo.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[main]button.png b/game/themes/Classic/[main]button.png
new file mode 100644
index 00000000..978e04df
--- /dev/null
+++ b/game/themes/Classic/[main]button.png
diff --git a/game/themes/Classic/[main]buttonf.jpg b/game/themes/Classic/[main]buttonf.jpg
new file mode 100644
index 00000000..d844add5
--- /dev/null
+++ b/game/themes/Classic/[main]buttonf.jpg
diff --git a/game/themes/Classic/[main]logo.png b/game/themes/Classic/[main]logo.png
new file mode 100644
index 00000000..9b559de9
--- /dev/null
+++ b/game/themes/Classic/[main]logo.png
diff --git a/game/themes/Classic/[main]mainBar.png b/game/themes/Classic/[main]mainBar.png
new file mode 100644
index 00000000..60063e63
--- /dev/null
+++ b/game/themes/Classic/[main]mainBar.png
diff --git a/game/themes/Classic/[main]playerNumberBox.png b/game/themes/Classic/[main]playerNumberBox.png
new file mode 100644
index 00000000..3336ef56
--- /dev/null
+++ b/game/themes/Classic/[main]playerNumberBox.png
diff --git a/game/themes/Classic/[main]selectbg.png b/game/themes/Classic/[main]selectbg.png
new file mode 100644
index 00000000..9917045d
--- /dev/null
+++ b/game/themes/Classic/[main]selectbg.png
diff --git a/game/themes/Classic/[main]songCover.jpg b/game/themes/Classic/[main]songCover.jpg
index 426bf22d..7cf8930b 100644
--- a/game/themes/Classic/[main]songCover.jpg
+++ b/game/themes/Classic/[main]songCover.jpg
diff --git a/game/themes/Classic/[main]square.jpg b/game/themes/Classic/[main]square.jpg
deleted file mode 100644
index 8af62b71..00000000
--- a/game/themes/Classic/[main]square.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Exit.jpg b/game/themes/Classic/[mainbutton]Exit.jpg
deleted file mode 100644
index 55494e65..00000000
--- a/game/themes/Classic/[mainbutton]Exit.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Exit.png b/game/themes/Classic/[mainbutton]Exit.png
new file mode 100644
index 00000000..bfd79f1e
--- /dev/null
+++ b/game/themes/Classic/[mainbutton]Exit.png
diff --git a/game/themes/Classic/[mainbutton]Multi.jpg b/game/themes/Classic/[mainbutton]Multi.jpg
deleted file mode 100644
index ad5980d7..00000000
--- a/game/themes/Classic/[mainbutton]Multi.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Multi.png b/game/themes/Classic/[mainbutton]Multi.png
new file mode 100644
index 00000000..caea5c2b
--- /dev/null
+++ b/game/themes/Classic/[mainbutton]Multi.png
diff --git a/game/themes/Classic/[mainbutton]Options.jpg b/game/themes/Classic/[mainbutton]Options.jpg
deleted file mode 100644
index 5e1bff71..00000000
--- a/game/themes/Classic/[mainbutton]Options.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Options.png b/game/themes/Classic/[mainbutton]Options.png
new file mode 100644
index 00000000..940e37a5
--- /dev/null
+++ b/game/themes/Classic/[mainbutton]Options.png
diff --git a/game/themes/Classic/[mainbutton]Solo.jpg b/game/themes/Classic/[mainbutton]Solo.jpg
deleted file mode 100644
index a7e3d82a..00000000
--- a/game/themes/Classic/[mainbutton]Solo.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Solo.png b/game/themes/Classic/[mainbutton]Solo.png
new file mode 100644
index 00000000..9f205872
--- /dev/null
+++ b/game/themes/Classic/[mainbutton]Solo.png
diff --git a/game/themes/Classic/[mainbutton]Stats.jpg b/game/themes/Classic/[mainbutton]Stats.jpg
deleted file mode 100644
index 71cc13ad..00000000
--- a/game/themes/Classic/[mainbutton]Stats.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[mainbutton]Stats.png b/game/themes/Classic/[mainbutton]Stats.png
new file mode 100644
index 00000000..588c2ce6
--- /dev/null
+++ b/game/themes/Classic/[mainbutton]Stats.png
diff --git a/game/themes/Classic/[menu]PopUpBg.JPG b/game/themes/Classic/[menu]PopUpBg.JPG
deleted file mode 100644
index 1a23a90c..00000000
--- a/game/themes/Classic/[menu]PopUpBg.JPG
+++ /dev/null
diff --git a/game/themes/Classic/[menu]PopUpFg.JPG b/game/themes/Classic/[menu]PopUpFg.JPG
deleted file mode 100644
index 530d4cf9..00000000
--- a/game/themes/Classic/[menu]PopUpFg.JPG
+++ /dev/null
diff --git a/game/themes/Classic/[menu]PopUpFg.png b/game/themes/Classic/[menu]PopUpFg.png
new file mode 100644
index 00000000..2c9785b4
--- /dev/null
+++ b/game/themes/Classic/[menu]PopUpFg.png
diff --git a/game/themes/Classic/[menu]jumpToBg.jpg b/game/themes/Classic/[menu]jumpToBg.jpg
deleted file mode 100644
index d0cd1da8..00000000
--- a/game/themes/Classic/[menu]jumpToBg.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[menu]jumpToBg.png b/game/themes/Classic/[menu]jumpToBg.png
new file mode 100644
index 00000000..8e3a3a00
--- /dev/null
+++ b/game/themes/Classic/[menu]jumpToBg.png
diff --git a/game/themes/Classic/[menu]songMenuBg.jpg b/game/themes/Classic/[menu]songMenuBg.jpg
deleted file mode 100644
index e4242fc5..00000000
--- a/game/themes/Classic/[menu]songMenuBg.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[menu]songMenuBg.png b/game/themes/Classic/[menu]songMenuBg.png
new file mode 100644
index 00000000..92beff8e
--- /dev/null
+++ b/game/themes/Classic/[menu]songMenuBg.png
diff --git a/game/themes/Classic/[menu]songMenuBorder.jpg b/game/themes/Classic/[menu]songMenuBorder.jpg
deleted file mode 100644
index 11dd0604..00000000
--- a/game/themes/Classic/[menu]songMenuBorder.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[menu]songMenuButtonBG.jpg b/game/themes/Classic/[menu]songMenuButtonBG.jpg
deleted file mode 100644
index 53f0da59..00000000
--- a/game/themes/Classic/[menu]songMenuButtonBG.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[menu]songMenuSelectBG.jpg b/game/themes/Classic/[menu]songMenuSelectBG.jpg
deleted file mode 100644
index cd3041e2..00000000
--- a/game/themes/Classic/[menu]songMenuSelectBG.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[menu]songMenuSelectBg.png b/game/themes/Classic/[menu]songMenuSelectBg.png
new file mode 100644
index 00000000..8ff5eef8
--- /dev/null
+++ b/game/themes/Classic/[menu]songMenuSelectBg.png
diff --git a/game/themes/Classic/[party]Joker.jpg b/game/themes/Classic/[party]Joker.jpg
deleted file mode 100644
index 78b66936..00000000
--- a/game/themes/Classic/[party]Joker.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]Joker.png b/game/themes/Classic/[party]Joker.png
new file mode 100644
index 00000000..ba667a9b
--- /dev/null
+++ b/game/themes/Classic/[party]Joker.png
diff --git a/game/themes/Classic/[party]playerButton.jpg b/game/themes/Classic/[party]playerButton.jpg
deleted file mode 100644
index 15a34c66..00000000
--- a/game/themes/Classic/[party]playerButton.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]playerButton.png b/game/themes/Classic/[party]playerButton.png
new file mode 100644
index 00000000..7232b25c
--- /dev/null
+++ b/game/themes/Classic/[party]playerButton.png
diff --git a/game/themes/Classic/[party]playerTeamButton.jpg b/game/themes/Classic/[party]playerTeamButton.jpg
deleted file mode 100644
index 2faf9c4b..00000000
--- a/game/themes/Classic/[party]playerTeamButton.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]playerTeamButton.png b/game/themes/Classic/[party]playerTeamButton.png
new file mode 100644
index 00000000..71aa736a
--- /dev/null
+++ b/game/themes/Classic/[party]playerTeamButton.png
diff --git a/game/themes/Classic/[party]playerselectbg.png b/game/themes/Classic/[party]playerselectbg.png
new file mode 100644
index 00000000..daf44ace
--- /dev/null
+++ b/game/themes/Classic/[party]playerselectbg.png
diff --git a/game/themes/Classic/[party]pointer.bmp b/game/themes/Classic/[party]pointer.bmp
deleted file mode 100644
index 88bbcc3d..00000000
--- a/game/themes/Classic/[party]pointer.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[party]pointer.png b/game/themes/Classic/[party]pointer.png
new file mode 100644
index 00000000..2292d6c1
--- /dev/null
+++ b/game/themes/Classic/[party]pointer.png
diff --git a/game/themes/Classic/[party]roundBG1.jpg b/game/themes/Classic/[party]roundBG1.jpg
deleted file mode 100644
index 464aabea..00000000
--- a/game/themes/Classic/[party]roundBG1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]roundBG1.png b/game/themes/Classic/[party]roundBG1.png
new file mode 100644
index 00000000..5f40c7f5
--- /dev/null
+++ b/game/themes/Classic/[party]roundBG1.png
diff --git a/game/themes/Classic/[party]roundBG2.jpg b/game/themes/Classic/[party]roundBG2.jpg
deleted file mode 100644
index 3413958f..00000000
--- a/game/themes/Classic/[party]roundBG2.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]roundBG2.png b/game/themes/Classic/[party]roundBG2.png
new file mode 100644
index 00000000..02afa063
--- /dev/null
+++ b/game/themes/Classic/[party]roundBG2.png
diff --git a/game/themes/Classic/[party]roundBG3.jpg b/game/themes/Classic/[party]roundBG3.jpg
deleted file mode 100644
index c6b53caf..00000000
--- a/game/themes/Classic/[party]roundBG3.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]roundBG3.png b/game/themes/Classic/[party]roundBG3.png
new file mode 100644
index 00000000..8c18cf73
--- /dev/null
+++ b/game/themes/Classic/[party]roundBG3.png
diff --git a/game/themes/Classic/[party]roundBG4.jpg b/game/themes/Classic/[party]roundBG4.jpg
deleted file mode 100644
index 5e4da0ac..00000000
--- a/game/themes/Classic/[party]roundBG4.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]roundBG4.png b/game/themes/Classic/[party]roundBG4.png
new file mode 100644
index 00000000..94a5caa7
--- /dev/null
+++ b/game/themes/Classic/[party]roundBG4.png
diff --git a/game/themes/Classic/[party]roundTeamButton.jpg b/game/themes/Classic/[party]roundTeamButton.jpg
deleted file mode 100644
index 692db1bd..00000000
--- a/game/themes/Classic/[party]roundTeamButton.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]roundTeamButton.png b/game/themes/Classic/[party]roundTeamButton.png
new file mode 100644
index 00000000..08c645b1
--- /dev/null
+++ b/game/themes/Classic/[party]roundTeamButton.png
diff --git a/game/themes/Classic/[party]scoreBG1.jpg b/game/themes/Classic/[party]scoreBG1.jpg
deleted file mode 100644
index f558425d..00000000
--- a/game/themes/Classic/[party]scoreBG1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]scoreBG1.png b/game/themes/Classic/[party]scoreBG1.png
new file mode 100644
index 00000000..53e68562
--- /dev/null
+++ b/game/themes/Classic/[party]scoreBG1.png
diff --git a/game/themes/Classic/[party]scoreBG2.jpg b/game/themes/Classic/[party]scoreBG2.jpg
deleted file mode 100644
index 47239d85..00000000
--- a/game/themes/Classic/[party]scoreBG2.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]scoreBG2.png b/game/themes/Classic/[party]scoreBG2.png
new file mode 100644
index 00000000..9b4bb52d
--- /dev/null
+++ b/game/themes/Classic/[party]scoreBG2.png
diff --git a/game/themes/Classic/[party]scoreDecoration.jpg b/game/themes/Classic/[party]scoreDecoration.jpg
deleted file mode 100644
index 49204e19..00000000
--- a/game/themes/Classic/[party]scoreDecoration.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]scoreDecoration.png b/game/themes/Classic/[party]scoreDecoration.png
new file mode 100644
index 00000000..388077e6
--- /dev/null
+++ b/game/themes/Classic/[party]scoreDecoration.png
diff --git a/game/themes/Classic/[party]teamPoints.jpg b/game/themes/Classic/[party]teamPoints.jpg
deleted file mode 100644
index 96855bc9..00000000
--- a/game/themes/Classic/[party]teamPoints.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]teamPoints.png b/game/themes/Classic/[party]teamPoints.png
new file mode 100644
index 00000000..e7c3b3cc
--- /dev/null
+++ b/game/themes/Classic/[party]teamPoints.png
diff --git a/game/themes/Classic/[party]winDecoration.jpg b/game/themes/Classic/[party]winDecoration.jpg
deleted file mode 100644
index 1d48ddb3..00000000
--- a/game/themes/Classic/[party]winDecoration.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]winDecoration.png b/game/themes/Classic/[party]winDecoration.png
new file mode 100644
index 00000000..f84dbc8a
--- /dev/null
+++ b/game/themes/Classic/[party]winDecoration.png
diff --git a/game/themes/Classic/[party]winTeamButton1.jpg b/game/themes/Classic/[party]winTeamButton1.jpg
deleted file mode 100644
index 10c8d80f..00000000
--- a/game/themes/Classic/[party]winTeamButton1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]winTeamButton1.png b/game/themes/Classic/[party]winTeamButton1.png
new file mode 100644
index 00000000..a3e20695
--- /dev/null
+++ b/game/themes/Classic/[party]winTeamButton1.png
diff --git a/game/themes/Classic/[party]winTeamButton2.jpg b/game/themes/Classic/[party]winTeamButton2.jpg
deleted file mode 100644
index fbd85056..00000000
--- a/game/themes/Classic/[party]winTeamButton2.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]winTeamButton2.png b/game/themes/Classic/[party]winTeamButton2.png
new file mode 100644
index 00000000..78237c12
--- /dev/null
+++ b/game/themes/Classic/[party]winTeamButton2.png
diff --git a/game/themes/Classic/[party]winTeamButton3.jpg b/game/themes/Classic/[party]winTeamButton3.jpg
deleted file mode 100644
index e8dd9566..00000000
--- a/game/themes/Classic/[party]winTeamButton3.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[party]winTeamButton3.png b/game/themes/Classic/[party]winTeamButton3.png
new file mode 100644
index 00000000..0d0d2788
--- /dev/null
+++ b/game/themes/Classic/[party]winTeamButton3.png
diff --git a/game/themes/Classic/[score]Line.png b/game/themes/Classic/[score]Line.png
new file mode 100644
index 00000000..954caf94
--- /dev/null
+++ b/game/themes/Classic/[score]Line.png
diff --git a/game/themes/Classic/[score]bar_box_dark.png b/game/themes/Classic/[score]bar_box_dark.png
new file mode 100644
index 00000000..e4fbfa41
--- /dev/null
+++ b/game/themes/Classic/[score]bar_box_dark.png
diff --git a/game/themes/Classic/[score]bar_box_light.png b/game/themes/Classic/[score]bar_box_light.png
new file mode 100644
index 00000000..ddc17ed8
--- /dev/null
+++ b/game/themes/Classic/[score]bar_box_light.png
diff --git a/game/themes/Classic/[score]bar_box_lightest.png b/game/themes/Classic/[score]bar_box_lightest.png
new file mode 100644
index 00000000..995bb9ef
--- /dev/null
+++ b/game/themes/Classic/[score]bar_box_lightest.png
diff --git a/game/themes/Classic/[score]box.jpg b/game/themes/Classic/[score]box.jpg
deleted file mode 100644
index b37f7e46..00000000
--- a/game/themes/Classic/[score]box.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[score]box.png b/game/themes/Classic/[score]box.png
new file mode 100644
index 00000000..71a0cee6
--- /dev/null
+++ b/game/themes/Classic/[score]box.png
diff --git a/game/themes/Classic/[score]endcap.png b/game/themes/Classic/[score]endcap.png
new file mode 100644
index 00000000..3cccd2e1
--- /dev/null
+++ b/game/themes/Classic/[score]endcap.png
diff --git a/game/themes/Classic/[score]glass_box.png b/game/themes/Classic/[score]glass_box.png
new file mode 100644
index 00000000..c0cf2a9c
--- /dev/null
+++ b/game/themes/Classic/[score]glass_box.png
diff --git a/game/themes/Classic/[score]level.jpg b/game/themes/Classic/[score]level.jpg
deleted file mode 100644
index e47280cb..00000000
--- a/game/themes/Classic/[score]level.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[score]level.png b/game/themes/Classic/[score]level.png
new file mode 100644
index 00000000..1f627560
--- /dev/null
+++ b/game/themes/Classic/[score]level.png
diff --git a/game/themes/Classic/[score]levelRound.png b/game/themes/Classic/[score]levelRound.png
new file mode 100644
index 00000000..2bc7a6b8
--- /dev/null
+++ b/game/themes/Classic/[score]levelRound.png
diff --git a/game/themes/Classic/[score]level_dark.png b/game/themes/Classic/[score]level_dark.png
new file mode 100644
index 00000000..da4fd407
--- /dev/null
+++ b/game/themes/Classic/[score]level_dark.png
diff --git a/game/themes/Classic/[score]level_dark_round.png b/game/themes/Classic/[score]level_dark_round.png
new file mode 100644
index 00000000..de239cb2
--- /dev/null
+++ b/game/themes/Classic/[score]level_dark_round.png
diff --git a/game/themes/Classic/[score]level_light.png b/game/themes/Classic/[score]level_light.png
new file mode 100644
index 00000000..1c1c8a4d
--- /dev/null
+++ b/game/themes/Classic/[score]level_light.png
diff --git a/game/themes/Classic/[score]level_light_round.png b/game/themes/Classic/[score]level_light_round.png
new file mode 100644
index 00000000..641151a5
--- /dev/null
+++ b/game/themes/Classic/[score]level_light_round.png
diff --git a/game/themes/Classic/[score]level_lightest.png b/game/themes/Classic/[score]level_lightest.png
new file mode 100644
index 00000000..f02fdf7b
--- /dev/null
+++ b/game/themes/Classic/[score]level_lightest.png
diff --git a/game/themes/Classic/[score]level_lightest_round.png b/game/themes/Classic/[score]level_lightest_round.png
new file mode 100644
index 00000000..9f1bb09e
--- /dev/null
+++ b/game/themes/Classic/[score]level_lightest_round.png
diff --git a/game/themes/Classic/[score]levelround.jpg b/game/themes/Classic/[score]levelround.jpg
deleted file mode 100644
index dbc5b5af..00000000
--- a/game/themes/Classic/[score]levelround.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[score]line.jpg b/game/themes/Classic/[score]line.jpg
deleted file mode 100644
index 2fd951aa..00000000
--- a/game/themes/Classic/[score]line.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[score]rating_0.png b/game/themes/Classic/[score]rating_0.png
new file mode 100644
index 00000000..7e836b99
--- /dev/null
+++ b/game/themes/Classic/[score]rating_0.png
diff --git a/game/themes/Classic/[score]rating_1.png b/game/themes/Classic/[score]rating_1.png
new file mode 100644
index 00000000..556821cb
--- /dev/null
+++ b/game/themes/Classic/[score]rating_1.png
diff --git a/game/themes/Classic/[score]rating_2.png b/game/themes/Classic/[score]rating_2.png
new file mode 100644
index 00000000..ffa23fd3
--- /dev/null
+++ b/game/themes/Classic/[score]rating_2.png
diff --git a/game/themes/Classic/[score]rating_3.png b/game/themes/Classic/[score]rating_3.png
new file mode 100644
index 00000000..5204dc5f
--- /dev/null
+++ b/game/themes/Classic/[score]rating_3.png
diff --git a/game/themes/Classic/[score]rating_4.png b/game/themes/Classic/[score]rating_4.png
new file mode 100644
index 00000000..f5d7267c
--- /dev/null
+++ b/game/themes/Classic/[score]rating_4.png
diff --git a/game/themes/Classic/[score]rating_5.png b/game/themes/Classic/[score]rating_5.png
new file mode 100644
index 00000000..0f6a553b
--- /dev/null
+++ b/game/themes/Classic/[score]rating_5.png
diff --git a/game/themes/Classic/[score]rating_6.png b/game/themes/Classic/[score]rating_6.png
new file mode 100644
index 00000000..e8127c85
--- /dev/null
+++ b/game/themes/Classic/[score]rating_6.png
diff --git a/game/themes/Classic/[score]rating_7.png b/game/themes/Classic/[score]rating_7.png
new file mode 100644
index 00000000..6b1d30f5
--- /dev/null
+++ b/game/themes/Classic/[score]rating_7.png
diff --git a/game/themes/Classic/[sing.player1]lyric_active.png b/game/themes/Classic/[sing.player1]lyric_active.png
new file mode 100644
index 00000000..089c8c5e
--- /dev/null
+++ b/game/themes/Classic/[sing.player1]lyric_active.png
diff --git a/game/themes/Classic/[sing.player1]lyric_inactive.png b/game/themes/Classic/[sing.player1]lyric_inactive.png
new file mode 100644
index 00000000..a349007d
--- /dev/null
+++ b/game/themes/Classic/[sing.player1]lyric_inactive.png
diff --git a/game/themes/Classic/[sing.player2]lyric_active.png b/game/themes/Classic/[sing.player2]lyric_active.png
new file mode 100644
index 00000000..509767fa
--- /dev/null
+++ b/game/themes/Classic/[sing.player2]lyric_active.png
diff --git a/game/themes/Classic/[sing.player2]lyric_inactive.png b/game/themes/Classic/[sing.player2]lyric_inactive.png
new file mode 100644
index 00000000..ac40ec61
--- /dev/null
+++ b/game/themes/Classic/[sing.player2]lyric_inactive.png
diff --git a/game/themes/Classic/[sing.player3]lyric_active.png b/game/themes/Classic/[sing.player3]lyric_active.png
new file mode 100644
index 00000000..7b130ac5
--- /dev/null
+++ b/game/themes/Classic/[sing.player3]lyric_active.png
diff --git a/game/themes/Classic/[sing.player3]lyric_inactive.png b/game/themes/Classic/[sing.player3]lyric_inactive.png
new file mode 100644
index 00000000..c5a00600
--- /dev/null
+++ b/game/themes/Classic/[sing.player3]lyric_inactive.png
diff --git a/game/themes/Classic/[sing.player4]lyric_active.png b/game/themes/Classic/[sing.player4]lyric_active.png
new file mode 100644
index 00000000..993041fd
--- /dev/null
+++ b/game/themes/Classic/[sing.player4]lyric_active.png
diff --git a/game/themes/Classic/[sing.player4]lyric_inactive.png b/game/themes/Classic/[sing.player4]lyric_inactive.png
new file mode 100644
index 00000000..f09669b2
--- /dev/null
+++ b/game/themes/Classic/[sing.player4]lyric_inactive.png
diff --git a/game/themes/Classic/[sing.player5]lyric_active.png b/game/themes/Classic/[sing.player5]lyric_active.png
new file mode 100644
index 00000000..631dc9c3
--- /dev/null
+++ b/game/themes/Classic/[sing.player5]lyric_active.png
diff --git a/game/themes/Classic/[sing.player5]lyric_inactive.png b/game/themes/Classic/[sing.player5]lyric_inactive.png
new file mode 100644
index 00000000..716071e8
--- /dev/null
+++ b/game/themes/Classic/[sing.player5]lyric_inactive.png
diff --git a/game/themes/Classic/[sing.player6]lyric_active.png b/game/themes/Classic/[sing.player6]lyric_active.png
new file mode 100644
index 00000000..65133d03
--- /dev/null
+++ b/game/themes/Classic/[sing.player6]lyric_active.png
diff --git a/game/themes/Classic/[sing.player6]lyric_inactive.png b/game/themes/Classic/[sing.player6]lyric_inactive.png
new file mode 100644
index 00000000..0c5f34d3
--- /dev/null
+++ b/game/themes/Classic/[sing.player6]lyric_inactive.png
diff --git a/game/themes/Classic/[sing]lineBonusPopUp.jpg b/game/themes/Classic/[sing]lineBonusPopUp.jpg
deleted file mode 100644
index 58d93130..00000000
--- a/game/themes/Classic/[sing]lineBonusPopUp.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[sing]lineBonusPopUp.png b/game/themes/Classic/[sing]lineBonusPopUp.png
new file mode 100644
index 00000000..89d5e511
--- /dev/null
+++ b/game/themes/Classic/[sing]lineBonusPopUp.png
diff --git a/game/themes/Classic/[sing]lyricsHelpBar.bmp b/game/themes/Classic/[sing]lyricsHelpBar.bmp
deleted file mode 100644
index 24fa2b52..00000000
--- a/game/themes/Classic/[sing]lyricsHelpBar.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]lyricsHelpBar.png b/game/themes/Classic/[sing]lyricsHelpBar.png
new file mode 100644
index 00000000..59707c21
--- /dev/null
+++ b/game/themes/Classic/[sing]lyricsHelpBar.png
diff --git a/game/themes/Classic/[sing]notesBgLeft.bmp b/game/themes/Classic/[sing]notesBgLeft.bmp
deleted file mode 100644
index 776e567c..00000000
--- a/game/themes/Classic/[sing]notesBgLeft.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesBgLeft.png b/game/themes/Classic/[sing]notesBgLeft.png
new file mode 100644
index 00000000..9fe2621c
--- /dev/null
+++ b/game/themes/Classic/[sing]notesBgLeft.png
diff --git a/game/themes/Classic/[sing]notesBgMid.bmp b/game/themes/Classic/[sing]notesBgMid.bmp
deleted file mode 100644
index 759ac8a3..00000000
--- a/game/themes/Classic/[sing]notesBgMid.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesBgMid.png b/game/themes/Classic/[sing]notesBgMid.png
new file mode 100644
index 00000000..612da5d3
--- /dev/null
+++ b/game/themes/Classic/[sing]notesBgMid.png
diff --git a/game/themes/Classic/[sing]notesBgRight.bmp b/game/themes/Classic/[sing]notesBgRight.bmp
deleted file mode 100644
index 9b1ffc18..00000000
--- a/game/themes/Classic/[sing]notesBgRight.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesBgRight.png b/game/themes/Classic/[sing]notesBgRight.png
new file mode 100644
index 00000000..a6f42c33
--- /dev/null
+++ b/game/themes/Classic/[sing]notesBgRight.png
diff --git a/game/themes/Classic/[sing]notesLeft.bmp b/game/themes/Classic/[sing]notesLeft.bmp
deleted file mode 100644
index c819849b..00000000
--- a/game/themes/Classic/[sing]notesLeft.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesLeft.png b/game/themes/Classic/[sing]notesLeft.png
new file mode 100644
index 00000000..3a404b9c
--- /dev/null
+++ b/game/themes/Classic/[sing]notesLeft.png
diff --git a/game/themes/Classic/[sing]notesMid.bmp b/game/themes/Classic/[sing]notesMid.bmp
deleted file mode 100644
index 2fdce32d..00000000
--- a/game/themes/Classic/[sing]notesMid.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesMid.png b/game/themes/Classic/[sing]notesMid.png
new file mode 100644
index 00000000..8769d01a
--- /dev/null
+++ b/game/themes/Classic/[sing]notesMid.png
diff --git a/game/themes/Classic/[sing]notesPlainLeft.png b/game/themes/Classic/[sing]notesPlainLeft.png
new file mode 100644
index 00000000..1a94a9d8
--- /dev/null
+++ b/game/themes/Classic/[sing]notesPlainLeft.png
diff --git a/game/themes/Classic/[sing]notesPlainMid.png b/game/themes/Classic/[sing]notesPlainMid.png
new file mode 100644
index 00000000..7fc64282
--- /dev/null
+++ b/game/themes/Classic/[sing]notesPlainMid.png
diff --git a/game/themes/Classic/[sing]notesPlainRight.png b/game/themes/Classic/[sing]notesPlainRight.png
new file mode 100644
index 00000000..ff8bb502
--- /dev/null
+++ b/game/themes/Classic/[sing]notesPlainRight.png
diff --git a/game/themes/Classic/[sing]notesRight.bmp b/game/themes/Classic/[sing]notesRight.bmp
deleted file mode 100644
index 3241beeb..00000000
--- a/game/themes/Classic/[sing]notesRight.bmp
+++ /dev/null
diff --git a/game/themes/Classic/[sing]notesRight.png b/game/themes/Classic/[sing]notesRight.png
new file mode 100644
index 00000000..8dc40cc8
--- /dev/null
+++ b/game/themes/Classic/[sing]notesRight.png
diff --git a/game/themes/Classic/[sing]p.jpg b/game/themes/Classic/[sing]p.jpg
deleted file mode 100644
index 5217c6b1..00000000
--- a/game/themes/Classic/[sing]p.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[sing]p.png b/game/themes/Classic/[sing]p.png
new file mode 100644
index 00000000..345c8959
--- /dev/null
+++ b/game/themes/Classic/[sing]p.png
diff --git a/game/themes/Classic/[sing]pause.png b/game/themes/Classic/[sing]pause.png
new file mode 100644
index 00000000..f5ab158c
--- /dev/null
+++ b/game/themes/Classic/[sing]pause.png
diff --git a/game/themes/Classic/[sing]scoreBg.jpg b/game/themes/Classic/[sing]scoreBg.jpg
index 01d3ca75..26ea1e87 100644
--- a/game/themes/Classic/[sing]scoreBg.jpg
+++ b/game/themes/Classic/[sing]scoreBg.jpg
diff --git a/game/themes/Classic/[sing]scoreBg.png b/game/themes/Classic/[sing]scoreBg.png
new file mode 100644
index 00000000..4dc785e9
--- /dev/null
+++ b/game/themes/Classic/[sing]scoreBg.png
diff --git a/game/themes/Classic/[sing]singBarBack.jpg b/game/themes/Classic/[sing]singBarBack.jpg
deleted file mode 100644
index d7dcd791..00000000
--- a/game/themes/Classic/[sing]singBarBack.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[sing]singBarBack.png b/game/themes/Classic/[sing]singBarBack.png
new file mode 100644
index 00000000..14d2ba42
--- /dev/null
+++ b/game/themes/Classic/[sing]singBarBack.png
diff --git a/game/themes/Classic/[sing]singBarBar.png b/game/themes/Classic/[sing]singBarBar.png
new file mode 100644
index 00000000..9c57057b
--- /dev/null
+++ b/game/themes/Classic/[sing]singBarBar.png
diff --git a/game/themes/Classic/[sing]singBarFront.jpg b/game/themes/Classic/[sing]singBarFront.jpg
deleted file mode 100644
index eec27b79..00000000
--- a/game/themes/Classic/[sing]singBarFront.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[sing]singBarFront.png b/game/themes/Classic/[sing]singBarFront.png
new file mode 100644
index 00000000..42477c5a
--- /dev/null
+++ b/game/themes/Classic/[sing]singBarFront.png
diff --git a/game/themes/Classic/[sing]textBar.jpg b/game/themes/Classic/[sing]textBar.jpg
deleted file mode 100644
index e2734bce..00000000
--- a/game/themes/Classic/[sing]textBar.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[sing]textBar.png b/game/themes/Classic/[sing]textBar.png
new file mode 100644
index 00000000..d2069235
--- /dev/null
+++ b/game/themes/Classic/[sing]textBar.png
diff --git a/game/themes/Classic/[sing]timeBar.jpg b/game/themes/Classic/[sing]timeBar.jpg
new file mode 100644
index 00000000..cc5cb552
--- /dev/null
+++ b/game/themes/Classic/[sing]timeBar.jpg
diff --git a/game/themes/Classic/[sing]timeBarBG.png b/game/themes/Classic/[sing]timeBarBG.png
new file mode 100644
index 00000000..6094fdf3
--- /dev/null
+++ b/game/themes/Classic/[sing]timeBarBG.png
diff --git a/game/themes/Classic/[song]selection.jpg b/game/themes/Classic/[song]selection.jpg
deleted file mode 100644
index b6c0065e..00000000
--- a/game/themes/Classic/[song]selection.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[song]selection.png b/game/themes/Classic/[song]selection.png
new file mode 100644
index 00000000..70022ca0
--- /dev/null
+++ b/game/themes/Classic/[song]selection.png
diff --git a/game/themes/Classic/[songs]bg.png b/game/themes/Classic/[songs]bg.png
new file mode 100644
index 00000000..0ff36589
--- /dev/null
+++ b/game/themes/Classic/[songs]bg.png
diff --git a/game/themes/Classic/[special]bar1.png b/game/themes/Classic/[special]bar1.png
new file mode 100644
index 00000000..00afb41d
--- /dev/null
+++ b/game/themes/Classic/[special]bar1.png
diff --git a/game/themes/Classic/[special]bar2.png b/game/themes/Classic/[special]bar2.png
new file mode 100644
index 00000000..c828a8e1
--- /dev/null
+++ b/game/themes/Classic/[special]bar2.png
diff --git a/game/themes/Classic/[special]bg_fade.png b/game/themes/Classic/[special]bg_fade.png
new file mode 100644
index 00000000..dc3248ef
--- /dev/null
+++ b/game/themes/Classic/[special]bg_fade.png
diff --git a/game/themes/Classic/[stat]detailBG1.jpg b/game/themes/Classic/[stat]detailBG1.jpg
deleted file mode 100644
index 120dc483..00000000
--- a/game/themes/Classic/[stat]detailBG1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[stat]detailBG1.png b/game/themes/Classic/[stat]detailBG1.png
new file mode 100644
index 00000000..212baf74
--- /dev/null
+++ b/game/themes/Classic/[stat]detailBG1.png
diff --git a/game/themes/Classic/[stat]mainBG1.jpg b/game/themes/Classic/[stat]mainBG1.jpg
deleted file mode 100644
index a937b24a..00000000
--- a/game/themes/Classic/[stat]mainBG1.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[stat]mainBG1.png b/game/themes/Classic/[stat]mainBG1.png
new file mode 100644
index 00000000..9eadc579
--- /dev/null
+++ b/game/themes/Classic/[stat]mainBG1.png
diff --git a/game/themes/Classic/[stat]mainBG2.jpg b/game/themes/Classic/[stat]mainBG2.jpg
deleted file mode 100644
index 201d49b8..00000000
--- a/game/themes/Classic/[stat]mainBG2.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[stat]mainBG2.png b/game/themes/Classic/[stat]mainBG2.png
new file mode 100644
index 00000000..f883c7d5
--- /dev/null
+++ b/game/themes/Classic/[stat]mainBG2.png
diff --git a/game/themes/Classic/[stat]mainBG3.jpg b/game/themes/Classic/[stat]mainBG3.jpg
deleted file mode 100644
index 812a8d78..00000000
--- a/game/themes/Classic/[stat]mainBG3.jpg
+++ /dev/null
diff --git a/game/themes/Classic/[stat]mainBG3.png b/game/themes/Classic/[stat]mainBG3.png
new file mode 100644
index 00000000..d5bcd98e
--- /dev/null
+++ b/game/themes/Classic/[stat]mainBG3.png