26 files changed, 1538 insertions, 32 deletions
diff --git a/cmake/game/languages/Catalan.ini b/cmake/game/languages/Catalan.ini
new file mode 100644
index 00000000..5e3c0a5c
--- /dev/null
+++ b/cmake/game/languages/Catalan.ini
@@ -0,0 +1,377 @@
+[Text] 
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
+SING_LOADING=Carregant... 
+ 
+SING_CHOOSE_MODE=Triar mode 
+SING_SING=cantar 
+SING_SING_DESC=joc ràpid: cantar un solo o un duet 
+ 
+SING_MULTI=festa 
+SING_MULTI_DESC=cantar en mode festa 
+ 
+SING_TOOLS=eines 
+ 
+SING_STATS=estadístiques 
+SING_STATS_DESC=veure estadístiques 
+ 
+SING_EDITOR=editor 
+SING_EDITOR_DESC=crea les teves propies cançons 
+ 
+SING_GAME_OPTIONS=opcions de joc 
+SING_GAME_OPTIONS_DESC=canviar preferències de joc 
+ 
+SING_EXIT=sortir 
+SING_EXIT_DESC=sortir del joc 
+ 
+SING_OPTIONS=opcions 
+SING_OPTIONS_DESC=canviar preferències 
+SING_OPTIONS_WHEREAMI=Opcions 
+ 
+SING_OPTIONS_GAME=joc 
+SING_OPTIONS_GRAPHICS=gràfics 
+SING_OPTIONS_SOUND=so 
+SING_OPTIONS_LYRICS=lletres 
+SING_OPTIONS_THEMES=aparença 
+SING_OPTIONS_RECORD=gravar 
+SING_OPTIONS_ADVANCED=avançat 
+SING_OPTIONS_EXIT=enrere 
+ 
+SING_OPTIONS_GAME_WHEREAMI=Opcions de joc 
+SING_OPTIONS_GAME_DESC=opcions generals del joc 
+SING_OPTIONS_GAME_PLAYERS=Jugadors 
+SING_OPTIONS_GAME_DIFFICULTY=Dificultat 
+SING_OPTIONS_GAME_LANGUAGE=Idioma 
+SING_OPTIONS_GAME_TABS=Pestanyes 
+SING_OPTIONS_GAME_SORTING=Ordenació 
+SING_OPTIONS_GAME_DEBUG=Debug 
+ 
+SING_OPTIONS_GRAPHICS_WHEREAMI=Opcions Gràfiques 
+SING_OPTIONS_GRAPHICS_DESC=configurar gràfics 
+SING_OPTIONS_GRAPHICS_RESOLUTION=Resolucị 
+SING_OPTIONS_GRAPHICS_FULLSCREEN=Pantalla complerta 
+SING_OPTIONS_GRAPHICS_DEPTH=Profunditat 
+SING_OPTIONS_GRAPHICS_VISUALIZER=Visualització 
+SING_OPTIONS_GRAPHICS_OSCILLOSCOPE=Oscil·loscopi 
+SING_OPTIONS_GRAPHICS_LINEBONUS=Bonus de línia 
+SING_OPTIONS_GRAPHICS_MOVIE_SIZE=Mida pel·lícula 
+ 
+SING_OPTIONS_SOUND_WHEREAMI=Opcions de so 
+SING_OPTIONS_SOUND_DESC=configurar so 
+SING_OPTIONS_SOUND_VOICEPASSTHROUGH=Reproducció del micro 
+SING_OPTIONS_SOUND_BACKGROUNDMUSIC=Música de fons 
+SING_OPTIONS_SOUND_MIC_BOOST=Ampli Micro 
+SING_OPTIONS_SOUND_CLICK_ASSIST=Assistència Click 
+SING_OPTIONS_SOUND_BEAT_CLICK=Clic de ritme 
+SING_OPTIONS_SOUND_THRESHOLD=Llindar 
+SING_OPTIONS_SOUND_TWO_PLAYERS_MODE=Mode dos jugadors 
+SING_OPTIONS_SOUND_PREVIEWVOLUME=Volum previsualitzar 
+SING_OPTIONS_SOUND_PREVIEWFADING=Fos previsualitzar 
+ 
+SING_OPTIONS_LYRICS_WHEREAMI=Opcions Lletra 
+SING_OPTIONS_LYRICS_DESC=configuració de lletres 
+SING_OPTIONS_LYRICS_FONT=Font 
+SING_OPTIONS_LYRICS_EFFECT=Efecte 
+SING_OPTIONS_LYRICS_SOLMIZATION=Solfeig 
+SING_OPTIONS_LYRICS_NOTELINES=Pentagrama 
+ 
+SING_OPTIONS_THEMES_WHEREAMI=Options d'Aparença 
+SING_OPTIONS_THEMES_DESC=Configuració d'aparença 
+SING_OPTIONS_THEMES_THEME=Aparença 
+SING_OPTIONS_THEMES_SKIN=Pell 
+SING_OPTIONS_THEMES_COLOR=Color 
+ 
+SING_OPTIONS_RECORD_WHEREAMI=Opcions de micro 
+SING_OPTIONS_RECORD_DESC=configuració del micro 
+SING_OPTIONS_RECORD_CARD=Tarjeta de so 
+SING_OPTIONS_RECORD_INPUT=Entrada 
+SING_OPTIONS_RECORD_CHANNEL=Canal
+
+SING_OPTIONS_ADVANCED_WHEREAMI=Opcions Avançades 
+SING_OPTIONS_ADVANCED_DESC=opcions avançades 
+SING_OPTIONS_ADVANCED_EFFECTSING=Efectes de cantar 
+SING_OPTIONS_ADVANCED_SCREENFADE=Fos de pantalla 
+SING_OPTIONS_ADVANCED_LOADANIMATION=Animació càrrega 
+SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Prequnta abans d'esborrar 
+SING_OPTIONS_ADVANCED_LINEBONUS=Bonus de línia 
+SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Quantes vegades cantada 
+SING_OPTIONS_ADVANCED_ONSONGCLICK=després de triar cançó 
+SING_OPTIONS_ADVANCED_PARTYPOPUP=Menú Automàtic de festa 
+SING_EDIT=Editor 
+SING_EDIT_MENU_DESCRIPTION=crea cançons 
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Importar text de fitxer midi 
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=tornar 
+SING_EDIT_BUTTON_CONVERT=Importar 
+SING_EDIT_BUTTON_EXIT=enrere 
+SING_EDIT_NAVIGATE=navegar 
+SING_EDIT_SELECT=triar 
+SING_EDIT_EXIT=enrere 
+
+ 
+SING_LEGEND_SELECT=seleccionar 
+SING_LEGEND_NAVIGATE=navegar 
+SING_LEGEND_CONTINUE=continuar 
+SING_LEGEND_ESC=enrere 
+ 
+SING_PLAYER_DESC=entrar nom de jugador/s 
+SING_PLAYER_WHEREAMI=Nom dels jugadors 
+SING_PLAYER_ENTER_NAME=introduir nom 
+ 
+SING_DIFFICULTY_DESC=triar dificultat 
+SING_DIFFICULTY_WHEREAMI=Dificultat 
+SING_DIFFICULTY_CONTINUE=a selecció de cançó 
+SING_EASY=Fàcil 
+SING_MEDIUM=Mitjà 
+SING_HARD=Difícil 
+ 
+SING_SONG_SELECTION_DESC=triar cançó 
+SING_SONG_SELECTION_WHEREAMI=Selecció de cançons 
+SING_SONG_SELECTION_GOTO=Anar a .. 
+SING_SONG_SELECTION=selecció de cançons 
+SING_SONG_SELECTION_MENU=menú 
+SING_SONG_SELECTION_PLAYLIST=llista 
+SING_SONGS_IN_CAT=Cançons 
+PLAYLIST_CATTEXT=Playlist: %s 
+ 
+SING_TIME=TEMPS 
+SING_TOTAL=total 
+SING_MODE=cantar sol 
+SING_NOTES=notes 
+SING_GOLDEN_NOTES=notes daurades 
+SING_PHRASE_BONUS=bonus de línia 
+ 
+SING_MENU=Menú principal 
+ 
+SONG_SCORE=puntuació cançó 
+SONG_SCORE_WHEREAMI=Puntuació 
+ 
+SING_SCORE_TONE_DEAF=Sense oïda 
+SING_SCORE_AMATEUR=Novell 
+SING_SCORE_WANNABE=Aficionat 
+SING_SCORE_HOPEFUL=Esperançador 
+SING_SCORE_RISING_STAR=Futura estrella 
+SING_SCORE_LEAD_SINGER=Bon cantant 
+SING_SCORE_SUPERSTAR=Estrella 
+SING_SCORE_ULTRASTAR=Super estrella 
+ 
+SING_TOP_5_CHARTS=millors 5 jugadors 
+SING_TOP_5_CHARTS_WHEREAMI=millors 5 
+SING_TOP_5_CHARTS_CONTINUE=a selecció de cançó 
+ 
+POPUP_PERFECT=perfecte! 
+POPUP_AWESOME=genial! 
+POPUP_GREAT=molt bo! 
+POPUP_GOOD=esta bé! 
+POPUP_NOTBAD=pots millorar! 
+POPUP_BAD=malament! 
+POPUP_POOR=pobre! 
+POPUP_AWFUL=boo fora! 
+ 
+IMPLODE_GLUE1=,  
+IMPLODE_GLUE2= i  
+ 
+SONG_MENU_NAME_MAIN=menú de cançons 
+SONG_MENU_PLAY=Cantar 
+SONG_MENU_CHANGEPLAYERS=Canviar jugadors 
+SONG_MENU_EDIT=Editar 
+SONG_MENU_MODI=Cantar un Modi 
+SONG_MENU_CANCEL=Cancel·lar 
+ 
+SONG_MENU_NAME_PLAYLIST=Menú de cançons 
+SONG_MENU_PLAYLIST_ADD=Afegir Cançó 
+SONG_MENU_PLAYLIST_DEL=Esborrar Cançó 
+ 
+SONG_MENU_NAME_PLAYLIST_ADD=Afegir Song 
+SONG_MENU_PLAYLIST_ADD_NEW=a nova llista 
+SONG_MENU_PLAYLIST_ADD_EXISTING=a llista existent 
+SONG_MENU_PLAYLIST_NOEXISTING=No hi ha llistes 
+ 
+SONG_MENU_NAME_PLAYLIST_NEW=Nova llista 
+SONG_MENU_PLAYLIST_NEW_CREATE=Crear 
+SONG_MENU_PLAYLIST_NEW_UNNAMED=Sense nom 
+ 
+SONG_MENU_NAME_PLAYLIST_DELITEM=Segur que vols esborrar? 
+SONG_MENU_YES=Si 
+SONG_MENU_NO=No 
+ 
+SONG_MENU_NAME_PLAYLIST_LOAD=Obrir llista 
+SONG_MENU_PLAYLIST_LOAD=obrir 
+SONG_MENU_PLAYLIST_DELCURRENT=esborrar llista 
+ 
+SONG_MENU_NAME_PLAYLIST_DEL=Esborrar llista? 
+ 
+SONG_MENU_NAME_PARTY_MAIN=Menú festa 
+SONG_MENU_JOKER=Comodí 
+ 
+SONG_MENU_NAME_PARTY_JOKER=utilitzar comodí 
+ 
+SONG_JUMPTO_DESC=buscar cançó 
+SONG_JUMPTO_TYPE_DESC=Buscar: 
+SONG_JUMPTO_TYPE1=Tot 
+SONG_JUMPTO_TYPE2=Títol 
+SONG_JUMPTO_TYPE3=Artista 
+SONG_JUMPTO_SONGSFOUND=%d Cançons trobades 
+SONG_JUMPTO_NOSONGSFOUND=No s'han trobat cançons 
+SONG_JUMPTO_HELP=Introduir text a cercar 
+SONG_JUMPTO_CATTEXT=Cercant: %s 
+ 
+PARTY_MODE=mode festa 
+PARTY_DIFFICULTY=Dificultat 
+PARTY_PLAYLIST=Mode llista 
+PARTY_PLAYLIST_ALL=Tot 
+PARTY_PLAYLIST_CATEGORY=Directori 
+PARTY_PLAYLIST_PLAYLIST=llista 
+PARTY_ROUNDS=Rondes 
+PARTY_TEAMS=Equips 
+PARTY_TEAMS_PLAYER1=Player Team1 
+PARTY_TEAMS_PLAYER2=Player Team2 
+PARTY_TEAMS_PLAYER3=Player Team3 
+ 
+PARTY_LEGEND_CONTINUE=continuar 
+ 
+PARTY_OPTIONS_DESC=opcions mode festa 
+PARTY_OPTIONS_WHEREAMI=Opcions Festa 
+ 
+PARTY_PLAYER_DESC=introduïr noms de jugadors i equips 
+PARTY_PLAYER_WHEREAMI=Noms 
+PARTY_PLAYER_ENTER_NAME=introduïr noms 
+PARTY_PLAYER_LEGEND_CONTINUE=iniciar festa 
+ 
+PARTY_ROUND_DESC=següent jugador al micro 
+PARTY_ROUND_WHEREAMI=Següent Ronda 
+PARTY_ROUND_LEGEND_CONTINUE=iniciar ronda 
+ 
+PARTY_SONG_WHEREAMI=Selecció de cançó mode festa  
+PARTY_SONG_LEGEND_CONTINUE=cantar 
+PARTY_SONG_MENU=menú festa 
+ 
+PARTY_SCORE_DESC=puntuació de l'última ronda 
+PARTY_SCORE_WHEREAMI=Punts mode festa 
+ 
+PARTY_WIN_DESC=guanyador de la festa 
+PARTY_WIN_WHEREAMI=Guanyador 
+PARTY_WIN_LEGEND_CONTINUE=tornar al menú principal 
+ 
+PARTY_ROUND=Ronda 
+PARTY_ROUND_WINNER=Guanyador 
+PARTY_NOTPLAYEDYET=no s'ha jugat encara 
+PARTY_NOBODY=ningú 
+NEXT_ROUND=Següent ronda: 
+ 
+PARTY_DISMISSED=Abandona! 
+PARTY_SCORE_WINS=%s  
+PARTY_SCORE_WINS2=guanya! 
+ 
+PLUGIN_HDL_NAME=Aguantar la línia 
+PLUGIN_HDL_DESC=No baixis de la fletxa a la barra de qualitat 
+ 
+PLUGIN_UNTIL5000_NAME=Fins a 5000 
+PLUGIN_UNTIL5000_DESC=El primer a arribar a 5000 punts guanya 
+ 
+PLUGIN_DUELL_NAME=Duel 
+PLUGIN_DUELL_DESC=Cantar un duela fins a 10000 punts 
+ 
+PLUGIN_BLIND_NAME=Mode cec 
+PLUGIN_BLIND_DESC=Duel sense veure les notes 
+ 
+STAT_MAIN=Estadístiques 
+STAT_MAIN_DESC=General 
+STAT_MAIN_WHEREAMI=Estadístiques 
+ 
+STAT_OVERVIEW_INTRO=%0:s Estadístiques\nÚltima reinicialització %2:.2d.%1:.2d.%3:d 
+STAT_OVERVIEW_SONG=%0:d Cançons(%3:d amb Video), de les que %1:d ya han sonat i %2:d encara no s'han jugat mai.\n La cançó més popular és %5:s de %4:s. 
+STAT_OVERVIEW_PLAYER=Des de l'última reinicialització hi han hagut %0:d jugadors diferents.\n El millor jugador és %1:s amb una mitjana de %2:d Punts.\n %3:s ha fet la màxima puntuació amb %4:d Punts. 
+ 
+STAT_DETAIL=Estadístques 
+STAT_DETAIL_WHEREAMI=Estadístiques 
+ 
+STAT_NEXT=Següent pàgina 
+STAT_PREV=Pàgina anterior 
+STAT_REVERSE=Ordre invers 
+STAT_PAGE=%0:d de %1:d Pàgines\n (%2:d de %3:d Entrades) 
+ 
+STAT_DESC_SCORES=Màximes puntuacions 
+STAT_DESC_SCORES_REVERSED=Mínimes puntuacions 
+STAT_FORMAT_SCORES=%0:s - %1:d [%2:s] \n (%3:s - %4:s) 
+ 
+STAT_DESC_SINGERS=Millors cantants 
+STAT_DESC_SINGERS_REVERSED=Pitjors cantants 
+STAT_FORMAT_SINGERS=%0:s \n Puntuació mitjana: %1:d 
+ 
+STAT_DESC_SONGS=Cançons més populars 
+STAT_DESC_SONGS_REVERSED=Cançons menys populars 
+STAT_FORMAT_SONGS=%0:s - %1:s \n %2:dx cantades 
+ 
+STAT_DESC_BANDS=Grups més populars 
+STAT_DESC_BANDS_REVERSED=Grups menys populars 
+STAT_FORMAT_BANDS=%0:s \n %1:dx Cantades 
+ 
+MSG_ERROR_TITLE=Error 
+MSG_QUESTION_TITLE=Qüestió 
+MSG_QUIT_USDX=Realment vols sortir d'UltraStar? 
+MSG_END_PARTY=Realment vols sortir del mode festa? 
+ERROR_NO_SONGS=No hi ha cançons 
+ERROR_NO_PLUGINS=No hi ha Plugins 
+ERROR_CORRUPT_SONG=No es poden carregar les cançons 
+ERROR_CORRUPT_SONG_FILE_NOT_FOUND=No es pot carregar: Fitxer no trobat 
+ERROR_CORRUPT_SONG_NO_NOTES=No es pot carregar: No s'han trobat notes 
+ERROR_CORRUPT_SONG_NO_BREAKS=No es pot carregar: No s'han trobat línies 
+ERROR_CORRUPT_SONG_UNKNOWN_IN_LINE=No es pot carregar: Error llegint línia %0:d 
diff --git a/cmake/game/languages/Croatian.ini b/cmake/game/languages/Croatian.ini
index a781ee9e..38fbffb9 100644
--- a/cmake/game/languages/Croatian.ini
+++ b/cmake/game/languages/Croatian.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=U�itavanje...
 
 SING_CHOOSE_MODE=Izaberi na�in igre
diff --git a/cmake/game/languages/Dutch.ini b/cmake/game/languages/Dutch.ini
index d9a3691e..33dc36e2 100644
--- a/cmake/game/languages/Dutch.ini
+++ b/cmake/game/languages/Dutch.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Laden...
 
 SING_CHOOSE_MODE=kies mode
diff --git a/cmake/game/languages/English.ini b/cmake/game/languages/English.ini
index a65fa20e..27fd2cf2 100644
--- a/cmake/game/languages/English.ini
+++ b/cmake/game/languages/English.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Loading...
 
 SING_CHOOSE_MODE=choose mode
diff --git a/cmake/game/languages/Euskara.ini b/cmake/game/languages/Euskara.ini
index ce965491..a38254a7 100644
--- a/cmake/game/languages/Euskara.ini
+++ b/cmake/game/languages/Euskara.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Kargatzen...
 
 SING_CHOOSE_MODE=Aukeratu
diff --git a/cmake/game/languages/Finnish.ini b/cmake/game/languages/Finnish.ini
index 187b09b9..dd4bd2e5 100644
--- a/cmake/game/languages/Finnish.ini
+++ b/cmake/game/languages/Finnish.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Ladataan...
 
 SING_CHOOSE_MODE=valitse pelimuoto
diff --git a/cmake/game/languages/French.ini b/cmake/game/languages/French.ini
index 9afc8d7b..d79919bf 100644
--- a/cmake/game/languages/French.ini
+++ b/cmake/game/languages/French.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Chargement...
 
 SING_CHOOSE_MODE=Choisir un mode
diff --git a/cmake/game/languages/German.ini b/cmake/game/languages/German.ini
index 4ea0bf89..2dbc32eb 100644
--- a/cmake/game/languages/German.ini
+++ b/cmake/game/languages/German.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Einfach
+OPTION_VALUE_MEDIUM=Mittel
+OPTION_VALUE_HARD=Schwierig
+
+OPTION_VALUE_ON=An
+OPTION_VALUE_OFF=Aus
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Sprache
+OPTION_VALUE_FOLDER=Ordner
+OPTION_VALUE_TITLE=Titel
+OPTION_VALUE_ARTIST=K�nstler
+OPTION_VALUE_TITLE2=Titel2
+OPTION_VALUE_ARTIST2=K�nstler2
+
+OPTION_VALUE_WHENNOVIDEO=Wenn kein Video
+
+OPTION_VALUE_SMALL=Klein
+OPTION_VALUE_BIG=Gross
+
+OPTION_VALUE_HALF=Halb
+OPTION_VALUE_FULL_VID=Voll (Video)
+OPTION_VALUE_FULL_VID_BG=Voll (HG & Video)
+
+OPTION_VALUE_AUTO=Automatisch
+OPTION_VALUE_SEC=Sekunde
+OPTION_VALUE_SECS=Sekunden
+
+OPTION_VALUE_PLAIN=Einfach
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Einfach
+OPTION_VALUE_ZOOM=Vergr�ssern
+OPTION_VALUE_SLIDE=Rutschen
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Schieben
+
+OPTION_VALUE_EURO=Europ�isch
+OPTION_VALUE_JAPAN=Japanisch
+OPTION_VALUE_AMERICAN=Amerikanisch
+
+OPTION_VALUE_BLUE=Blau
+OPTION_VALUE_GREEN=Gr�n
+OPTION_VALUE_PINK=Lila
+OPTION_VALUE_RED=Rot
+OPTION_VALUE_VIOLET=Violett
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Gelb
+OPTION_VALUE_BROWN=Braun
+OPTION_VALUE_BALCK=Schwarz
+
+OPTION_VALUE_SING=Singen
+OPTION_VALUE_SELECT_PLAYERS=Spieler ausw�hlen
+OPTION_VALUE_OPEN_MENU=Menu �ffnen
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Zeiger
+OPTION_VALUE_SOFTWARE_CURSOR=Software Zeiger
+
 SING_LOADING=L�dt...
 
 SING_CHOOSE_MODE=Modus w�hlen
diff --git a/cmake/game/languages/Greek.ini b/cmake/game/languages/Greek.ini
index c4863ec0..317f3475 100644
--- a/cmake/game/languages/Greek.ini
+++ b/cmake/game/languages/Greek.ini
@@ -1,5 +1,65 @@
 ;Leo 21
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=��������...
 
 SING_CHOOSE_MODE=������� ������ ����������
diff --git a/cmake/game/languages/Italian.ini b/cmake/game/languages/Italian.ini
index d814041f..e2fe7983 100644
--- a/cmake/game/languages/Italian.ini
+++ b/cmake/game/languages/Italian.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Caricamento...
 
 SING_CHOOSE_MODE=scegli modalit�
diff --git a/cmake/game/languages/Portuguese.ini b/cmake/game/languages/Portuguese.ini
index 08a7184a..ad2d1152 100644
--- a/cmake/game/languages/Portuguese.ini
+++ b/cmake/game/languages/Portuguese.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=A Ler...
 
 SING_CHOOSE_MODE=Escolha o Modo
diff --git a/cmake/game/languages/Spanish.ini b/cmake/game/languages/Spanish.ini
index 7137d959..f3b36494 100644
--- a/cmake/game/languages/Spanish.ini
+++ b/cmake/game/languages/Spanish.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Cargando...
 
 SING_CHOOSE_MODE=elige modo
diff --git a/cmake/game/languages/Swedish.ini b/cmake/game/languages/Swedish.ini
index 1011755a..5fa5b990 100644
--- a/cmake/game/languages/Swedish.ini
+++ b/cmake/game/languages/Swedish.ini
@@ -1,4 +1,64 @@
 [Text]
+OPTION_VALUE_EASY=Easy
+OPTION_VALUE_MEDIUM=Medium
+OPTION_VALUE_HARD=Hard
+
+OPTION_VALUE_ON=On
+OPTION_VALUE_OFF=Off
+
+OPTION_VALUE_EDITION=Edition
+OPTION_VALUE_GENRE=Genre
+OPTION_VALUE_LANGUAGE=Language
+OPTION_VALUE_FOLDER=Folder
+OPTION_VALUE_TITLE=Title
+OPTION_VALUE_ARTIST=Artist
+OPTION_VALUE_TITLE2=Title2
+OPTION_VALUE_ARTIST2=Artist2
+
+OPTION_VALUE_WHENNOVIDEO=When No Video
+
+OPTION_VALUE_SMALL=Small
+OPTION_VALUE_BIG=Big
+
+OPTION_VALUE_HALF=Half
+OPTION_VALUE_FULL_VID=Full (Video)
+OPTION_VALUE_FULL_VID_BG=Full (BG & Video)
+
+OPTION_VALUE_AUTO=Auto
+OPTION_VALUE_SEC=Second
+OPTION_VALUE_SECS=Seconds
+
+OPTION_VALUE_PLAIN=Plain
+OPTION_VALUE_OLINE1=OLine1
+OPTION_VALUE_OLINE2=OLine2
+
+OPTION_VALUE_SIMPLE=Simple
+OPTION_VALUE_ZOOM=Zoom
+OPTION_VALUE_SLIDE=Slide
+OPTION_VALUE_BALL=Ball
+OPTION_VALUE_SHIFT=Shift
+
+OPTION_VALUE_EURO=Euro
+OPTION_VALUE_JAPAN=Japan
+OPTION_VALUE_AMERICAN=American
+
+OPTION_VALUE_BLUE=Blue
+OPTION_VALUE_GREEN=Green
+OPTION_VALUE_PINK=Pink
+OPTION_VALUE_RED=Red
+OPTION_VALUE_VIOLET=Violet
+OPTION_VALUE_ORANGE=Orange
+OPTION_VALUE_YELLOW=Yellow
+OPTION_VALUE_BROWN=Brown
+OPTION_VALUE_BALCK=Black
+
+OPTION_VALUE_SING=Sing
+OPTION_VALUE_SELECT_PLAYERS=Select Players
+OPTION_VALUE_OPEN_MENU=Open Menu
+
+OPTION_VALUE_HARDWARE_CURSOR=Hardware Cursor
+OPTION_VALUE_SOFTWARE_CURSOR=Software Cursor
+
 SING_LOADING=Laddar...
 
 SING_CHOOSE_MODE=v�lj l�ge
diff --git a/cmake/game/themes/Classic.ini b/cmake/game/themes/Classic.ini
index 144448f2..1ea83f5e 100644
--- a/cmake/game/themes/Classic.ini
+++ b/cmake/game/themes/Classic.ini
@@ -7457,4 +7457,19 @@ H =44
 Z =1
 Int=1
 Color =Black
-Type=Font Black
-\ No newline at end of file
+Type=Font Black
+
+
+[SingLyricsUpperBar]
+X = 80
+W = 640
+Y = 493
+H = 41
+;YOffSet (+/-) for the Sing-Indicator
+IndicatorYOffset = 3
+
+[SingLyricsLowerBar]
+X = 80
+W = 640
+Y = 535
+H = 41
+\ No newline at end of file
diff --git a/cmake/game/themes/Deluxe.ini b/cmake/game/themes/Deluxe.ini
index 5f47c215..e128ae54 100644
--- a/cmake/game/themes/Deluxe.ini
+++ b/cmake/game/themes/Deluxe.ini
@@ -1072,7 +1072,7 @@ Align = 0
 X = 680
 Y = 136
 W = 100
-H = 13
+H = 8
 
 #Player Two
 [SingP2RStatic]
@@ -8150,7 +8150,6 @@ Text = OK
 Align = 1
 Z = 1
 
-
 [PausePopUpStatic]
 Tex = Pause
 X = 0
@@ -8159,4 +8158,18 @@ W = 800
 H = 600
 Z = 0.95
 Color = White
-Type = Colorized
-\ No newline at end of file
+Type = Colorized
+
+[SingLyricsUpperBar]
+X = 80
+W = 640
+Y = 493
+H = 41
+;YOffSet (+/-) for the Sing-Indicator
+IndicatorYOffset = 3
+
+[SingLyricsLowerBar]
+X = 80
+W = 640
+Y = 535
+H = 41
+\ No newline at end of file
diff --git a/cmake/game/themes/Deluxe/Blue.ini b/cmake/game/themes/Deluxe/Blue.ini
index 30c68e3e..10017fb3 100644
--- a/cmake/game/themes/Deluxe/Blue.ini
+++ b/cmake/game/themes/Deluxe/Blue.ini
@@ -15,6 +15,9 @@ Color=Blue
 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
  */
@@ -29,6 +32,9 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]blue.jpg
 MainBG         = [bg-main]blue.jpg
@@ -43,8 +49,7 @@ PartyBG        = [bg-main]blue.jpg
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 IconOption     = [icon]options.png
-IconEdit     = [icon]options.png
-
+IconEdit       = [icon]options.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
@@ -52,6 +57,7 @@ StatIcon       = [icon]stats.png
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -88,11 +94,12 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
-ScoreLevelRound = [score]levelround.png
+ScoreLevelRound = [score]levelRound.png
 
 ScoreLevel_Dark           = [score]level_dark.png
 ScoreLevel_Dark_Round     = [score]level_dark_round.png
@@ -132,6 +139,7 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
+
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -153,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -205,6 +214,7 @@ Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
+
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
@@ -217,4 +227,4 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+\ No newline at end of file
diff --git a/cmake/game/themes/Deluxe/Fall.ini b/cmake/game/themes/Deluxe/Fall.ini
index 72d9021b..38f25cdb 100644
--- a/cmake/game/themes/Deluxe/Fall.ini
+++ b/cmake/game/themes/Deluxe/Fall.ini
@@ -9,12 +9,32 @@ Name=Fall
 Color=Orange
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]fall.jpg
 MainBG         = [bg-main]fall.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]fall.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-VideoIcon      = [icon]video.png
 
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -76,9 +94,10 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -120,6 +139,7 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
+
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -141,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -165,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -183,6 +203,7 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
+
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
@@ -192,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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/cmake/game/themes/Deluxe/Ocean.ini b/cmake/game/themes/Deluxe/Ocean.ini
new file mode 100644
index 00000000..bdc90979
--- /dev/null
+++ b/cmake/game/themes/Deluxe/Ocean.ini
@@ -0,0 +1,230 @@
+;0.5.1
+;experimental version
+;if you are using this as a sample for your theme
+;don't be suprised it doesn't work good with newer releases
+
+[Skin]
+Theme=Deluxe
+Name=Ocean
+Color=Blue
+
+[Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
+# # # M A I N # # #
+Button         = [main]button.png
+ButtonF        = [main]buttonf.jpg
+MainBar        = [main]mainBar.png
+SelectBG       = [main]selectbg.png
+
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
+#Backgrounds
+LoadingBG      = [bg-load]blue.jpg
+MainBG         = [bg-video]_ocean.avi
+SongBG         = [bg-video]_ocean.avi
+ScoreScreenBG  = [bg-video]_ocean.avi
+Top5BG         = [bg-video]_ocean.avi
+OptionsBG      = [bg-video]_ocean.avi
+EditBG         = [bg-video]_ocean.avi
+PartyBG        = [bg-video]_ocean.avi
+
+#Icons on screen
+SongCD         = [icon]cd.png
+MainIcon       = [icon]main.png
+IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
+ScoreIcon      = [icon]score.png
+PartyIcon      = [icon]party.png
+StatIcon       = [icon]stats.png
+
+IconError      = [icon]error.png
+IconQuestion   = [icon]question.png
+
+
+# # # S O N G S E L E C E T # # #
+SongSelection1 = [main]songSelection1.png
+SongSelection2 = [main]songSelection2.png
+SongCover      = [main]songCover.jpg
+
+
+# # # S I N G # # #
+#the bar where the lyrics reside
+LyricBar       = [sing]textBar.png
+
+#this one slides in, to tell you that singing starts immediately
+LyricHelpBar   = [sing]lyricsHelpBar.png
+
+#the bar behind the timestuff
+TimeBar1      = [sing]timeBarBG.png
+
+#the time progress bar  (not skinned in this theme :P )
+TimeBar      = [sing]timeBar.jpg
+
+#linebonus, the thing that pop ups at the score
+LineBonusBack  = [sing]lineBonusPopUp.png
+
+#Singbar (the thing beneath the scores)
+SingBarBack    = [sing]singBarBack.png
+SingBarBar     = [sing]singBarBar.png
+SingBarFront   = [sing]singBarFront.png
+
+#Background for scores
+ScoreBG        = [sing]scoreBg.png
+
+#Background for the P1, P2 and so on
+P              = [sing]p.png
+
+#Pointer for lyrics
+Ball           = [sing]LyricsBall.png
+
+
+# # # S C O R E / T O P 5 # # #
+ScoreBox        = [score]box.png
+ScoreGlassBox   = [score]glass_box.png
+ScoreLevel      = [score]level.png
+ScoreLevelRound = [score]levelRound.png
+
+ScoreLevel_Dark           = [score]level_dark.png
+ScoreLevel_Dark_Round     = [score]level_dark_round.png
+
+ScoreLevel_Light          = [score]level_light.png
+ScoreLevel_Light_Round    = [score]level_light_round.png
+
+ScoreLevel_Lightest       = [score]level_lightest.png
+ScoreLevel_Lightest_Round = [score]level_lightest_round.png
+
+# Boxes near the text, that show what color is for which bar
+ScoreBar_box_lightest = [score]bar_box_lightest.png
+ScoreBar_box_light    = [score]bar_box_light.png
+ScoreBar_box_dark     = [score]bar_box_dark.png
+
+ScoreEndCap     = [score]endcap.png
+ScoreLine       = [score]line.png
+PlayerNumberBox = [main]playerNumberBox.png
+
+PlayerIDBox01 = [sing.player1]lyric_active.png
+PlayerIDBox02 = [sing.player2]lyric_active.png
+PlayerIDBox03 = [sing.player3]lyric_active.png
+PlayerIDBox04 = [sing.player4]lyric_active.png
+PlayerIDBox05 = [sing.player5]lyric_active.png
+PlayerIDBox06 = [sing.player6]lyric_active.png
+
+# these icons are part of the tango icon set
+# licensed under Creative Commons Attribution Share-Alike license
+# http://tango.freedesktop.org
+Rating_0 = [score]rating_0.png
+Rating_1 = [score]rating_1.png
+Rating_2 = [score]rating_2.png
+Rating_3 = [score]rating_3.png
+Rating_4 = [score]rating_4.png
+Rating_5 = [score]rating_5.png
+Rating_6 = [score]rating_6.png
+Rating_7 = [score]rating_7.png
+# thank you girls and guys!!!
+
+
+# # # P A R T Y # # #
+Joker             =[party]Joker.png
+PartyPlayerButton =[party]playerButton.png
+PartyTeamButton1  =[party]roundTeamButton.png
+PartyTeamButton2  =[party]playerTeamButton.png
+PartyTeamButton3  =[party]winTeamButton1.png
+PartyTeamButton4  =[party]winTeamButton2.png
+PartyTeamButton5  =[party]winTeamButton3.png
+PartyRoundBG1     =[party]roundBG1.png
+PartyRoundBG2     =[party]roundBG2.png
+PartyRoundBG3     =[party]roundBG3.png
+PartyRoundBG4     =[party]roundBG4.png
+HDL_Pointer       =[party]pointer.png
+PartyTeamPoints   =[party]teamPoints.png
+PartyScoreDeco    =[party]scoreDecoration.png
+PartyScoreBG1     =[party]scoreBG1.png
+PartyScoreBG2     =[party]scoreBG2.png
+PartyWinDeco1     =[party]winDecoration.png
+PartyWinDeco2     =[party]winDecoration.png
+PartyWinDeco3     =[party]winDecoration.png
+
+
+# # # S T A T S # # #
+StatMainBG1 = [stat]mainBG1.png
+StatMainBG2 = [stat]mainBG2.png
+StatMainBG3 = [stat]mainBG3.png
+StatDetailBG1 = [stat]detailBG1.png
+
+
+# # # N A V I # # #
+ButtonP     = [button]p.png
+ButtonM     = [button]m.png
+ButtonJ     = [button]j.png
+ButtonAlt   = [button]alt.png
+ButtonAZ    = [button]az.png
+ButtonEnter = [button]enter.png
+ButtonNavi  = [button]navi.png
+ButtonEsc   = [button]esc.png
+Button13    = [button]13.png
+
+Leiste1     = [special]bar1.png
+Leiste2     = [special]bar2.png
+
+JumpToBG    = [menu]jumpToBg.png
+SongMenuBG  = [menu]songMenuBg.png
+SongMenuSelectBG  = [menu]songMenuSelectBg.png
+
+
+# # # N O T E S # # #
+# sung notes - colorized with playercolors
+GrayLeft       = [sing]notesLeft.png
+GrayMid        = [sing]notesMid.png
+GrayRight      = [sing]notesRight.png
+# unsung notes - colorized with playercolors
+NotePlainLeft  = [sing]notesPlainLeft.png
+NotePlainMid   = [sing]notesPlainMid.png
+NotePlainRight = [sing]notesPlainRight.png
+# the glow around unsung/sung notes - colorized with playercolors
+NoteBGLeft     = [sing]notesBgLeft.png
+NoteBGMid      = [sing]notesBgMid.png
+NoteBGRight    = [sing]notesBgRight.png
+Pause          = [sing]pause.png
+
+
+# # # E F F E C T S # # #
+NoteStar        = [effect]goldenNoteStar.png
+NotePerfectStar = [effect]perfectNoteStar.png
+
+
+# # # dirty helpers # # #
+Rectangle  = [helper]rectangle.jpg
+ButtonFade = [helper]buttonFade.png
+BGFade     = [special]bg_fade.png
+
+
+# # # D U E T # # #
+LyricIcon_P1  = [sing.player1]lyric_active.png
+LyricIconD_P1 = [sing.player1]lyric_inactive.png
+LyricIcon_P2  = [sing.player2]lyric_active.png
+LyricIconD_P2 = [sing.player2]lyric_inactive.png
+LyricIcon_P3  = [sing.player3]lyric_active.png
+LyricIconD_P3 = [sing.player3]lyric_inactive.png
+LyricIcon_P4  = [sing.player4]lyric_active.png
+LyricIconD_P4 = [sing.player4]lyric_inactive.png
+LyricIcon_P5  = [sing.player5]lyric_active.png
+LyricIconD_P5 = [sing.player5]lyric_inactive.png
+LyricIcon_P6  = [sing.player6]lyric_active.png
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+\ No newline at end of file
diff --git a/cmake/game/themes/Deluxe/Ribbon.ini b/cmake/game/themes/Deluxe/Ribbon.ini
index 1631183e..73cae2ab 100644
--- a/cmake/game/themes/Deluxe/Ribbon.ini
+++ b/cmake/game/themes/Deluxe/Ribbon.ini
@@ -1,4 +1,4 @@
-never;0.5.1
+;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
@@ -6,9 +6,25 @@ never;0.5.1
 [Skin]
 Theme=Deluxe
 Name=Ribbon
-Color=Ani
+Color=Any
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
 
 # # # M A I N # # #
 Button         = [main]button.png
@@ -16,6 +32,9 @@ ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-video]ribbon.mov
 MainBG         = [bg-video]ribbon.mov
@@ -29,18 +48,16 @@ PartyBG        = [bg-video]ribbon.mov
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-VideoIcon      = [icon]video.png
 
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -80,9 +97,9 @@ Ball           = [sing]LyricsBall.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
-ScoreLevelRound = [score]levelround.png
+ScoreLevelRound = [score]levelRound.png
 
 ScoreLevel_Dark           = [score]level_dark.png
 ScoreLevel_Dark_Round     = [score]level_dark_round.png
@@ -122,6 +139,7 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
+
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -143,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -167,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -183,6 +201,7 @@ NotePlainRight = [sing]notesPlainRight.png
 NoteBGLeft     = [sing]notesBgLeft.png
 NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
+Pause          = [sing]pause.png
 
 
 # # # E F F E C T S # # #
@@ -194,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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/cmake/game/themes/Deluxe/Summer.ini b/cmake/game/themes/Deluxe/Summer.ini
index 3d40c2f8..36e9f5d7 100644
--- a/cmake/game/themes/Deluxe/Summer.ini
+++ b/cmake/game/themes/Deluxe/Summer.ini
@@ -9,12 +9,32 @@ Name=Summer
 Color=Blue
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]summer.jpg
 MainBG         = [bg-main]summer.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]summer.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-VideoIcon      = [icon]video.png
 
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -76,9 +94,10 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
+
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -120,6 +139,7 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
+
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -141,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -165,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -183,6 +203,7 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
+
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
@@ -192,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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/cmake/game/themes/Deluxe/Winter.ini b/cmake/game/themes/Deluxe/Winter.ini
index 32c37a02..72514a15 100644
--- a/cmake/game/themes/Deluxe/Winter.ini
+++ b/cmake/game/themes/Deluxe/Winter.ini
@@ -9,12 +9,32 @@ Name=Winter
 Color=Blue
 
 [Textures]
+/**
+ * Interface
+ */
+interface_selectbg_search   = interface/selectbg_search.png
+interface_dialog_background = interface/dialog_background.png
+
+Cursor = interface/cursor.png
+Cursor_Pressed = interface/cursor_pressed.png
+
+/**
+ * Icons
+ */
+icon_song_menu   = icon/song_menu.png
+icon_song_search = icon/song_search.png
+icon_song_video  = icon/song_video.png
+
+
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
+Select_ArrowLeft = interface/select_arrow_left.png
+Select_ArrowRight = interface/select_arrow_right.png
+
 #Backgrounds
 LoadingBG      = [bg-load]winter.jpg
 MainBG         = [bg-main]winter.jpg
@@ -28,18 +48,16 @@ PartyBG        = [bg-main]winter.jpg
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
-MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
 IconEdit       = [icon]options.png
-IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
 StatIcon       = [icon]stats.png
-VideoIcon      = [icon]video.png
 
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
+
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -79,7 +97,7 @@ Ball           = [sing]LyricsBall.png
 
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png 
+ScoreGlassBox   = [score]glass_box.png
 ScoreLevel      = [score]level.png
 ScoreLevelRound = [score]levelRound.png
 
@@ -121,6 +139,7 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
+
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -142,6 +161,7 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
+
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -166,7 +186,6 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
-PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -184,6 +203,7 @@ NoteBGMid      = [sing]notesBgMid.png
 NoteBGRight    = [sing]notesBgRight.png
 Pause          = [sing]pause.png
 
+
 # # # E F F E C T S # # #
 NoteStar        = [effect]goldenNoteStar.png
 NotePerfectStar = [effect]perfectNoteStar.png
@@ -193,3 +213,18 @@ NotePerfectStar = [effect]perfectNoteStar.png
 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/cmake/game/themes/Deluxe/[main]selectbg.png b/cmake/game/themes/Deluxe/[main]selectbg.png
index 093be9a5..f1b69eca 100644
--- a/cmake/game/themes/Deluxe/[main]selectbg.png
+++ b/cmake/game/themes/Deluxe/[main]selectbg.png
diff --git a/cmake/game/themes/Deluxe/interface/cursor.png b/cmake/game/themes/Deluxe/interface/cursor.png
new file mode 100644
index 00000000..6c222732
--- /dev/null
+++ b/cmake/game/themes/Deluxe/interface/cursor.png
diff --git a/cmake/game/themes/Deluxe/interface/cursor_pressed.png b/cmake/game/themes/Deluxe/interface/cursor_pressed.png
new file mode 100644
index 00000000..3fc36a5a
--- /dev/null
+++ b/cmake/game/themes/Deluxe/interface/cursor_pressed.png
diff --git a/cmake/game/themes/Deluxe/interface/select_arrow_left.png b/cmake/game/themes/Deluxe/interface/select_arrow_left.png
new file mode 100644
index 00000000..e4a32d2d
--- /dev/null
+++ b/cmake/game/themes/Deluxe/interface/select_arrow_left.png
diff --git a/cmake/game/themes/Deluxe/interface/select_arrow_right.png b/cmake/game/themes/Deluxe/interface/select_arrow_right.png
new file mode 100644
index 00000000..b2a29793
--- /dev/null
+++ b/cmake/game/themes/Deluxe/interface/select_arrow_right.png