diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml
index 8d400dac..b30335bc 100644
--- a/Output/Languages/Swedish.xml
+++ b/Output/Languages/Swedish.xml
@@ -46,7 +46,7 @@
   <string name="TR_CONFIG_LEVEL2">Nivå 2</string>
   <string name="TR_CONFIG_LEVEL3">Nivå 3</string>
   <string name="TR_CONFIG_LEVEL_MAX">Max</string>
-  <string name="TR_CONFIG_LIST">Lista</string>
+  <string name="TR_CONFIG_LIST">Låtlista</string>
   <string name="TR_CONFIG_DREIDEL">Dreidel</string>
   <string name="TR_CONFIG_TILE_BOARD">Bricktavla</string>
   <string name="TR_CONFIG_BOOK">Bok</string>
@@ -213,7 +213,7 @@
   <string name="TR_SCREENOVIDEO_WEBCAMDEVICES">Webkameror</string>
   <string name="TR_SCREENOVIDEO_WEBCAMRESOLUTION">Webkamera Upplösning</string>
   <string name="TR_SCREENOVIDEO_BUTTON_ADJUSTMENTS">Skärmjusteringar</string>
-  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTR + ALT (+ SHIFT) + Pilar"+" för att justera skärmen</string>
+  <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTES">Tryck CTR + ALT (+ SHIFT) + Pilar\"+\" för att justera skärmen</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_NOTESRESET">CTR + ALT + 0 för att återställa</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPLEFT">Överst till vänster</string>
   <string name="TR_SCREENOVIDEOADJUSTMENTS_TOPRIGHT">Överst till höger</string>
diff --git a/Output/PartyModes/Challenge/Languages/German.xml b/Output/PartyModes/Challenge/Languages/German.xml
index 15701514..04f5648a 100644
--- a/Output/PartyModes/Challenge/Languages/German.xml
+++ b/Output/PartyModes/Challenge/Languages/German.xml
@@ -15,6 +15,8 @@
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Anzahl der Spieler</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Anzahl der Mikrofone</string>
   <string name="TR_SCREENCONFIG_NUMROUNDS">Anzahl der Runden</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Joker-Anzahl</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Joker nach jeder Runde auffüllen</string>
   <string name="TR_SCREENNAMES_TITLE">Challenge Modus: Spielerwahl</string>
   <string name="TR_SCREENNAMES_BUTTON_RANDOM">Zufällig auswählen</string>
   <string name="TR_SCREENMAIN_TITLE">Challenge Modus: Übersicht</string>
diff --git a/Output/PartyModes/Challenge/Languages/Swedish.xml b/Output/PartyModes/Challenge/Languages/Swedish.xml
index ba2d9d97..a4f19260 100644
--- a/Output/PartyModes/Challenge/Languages/Swedish.xml
+++ b/Output/PartyModes/Challenge/Languages/Swedish.xml
@@ -15,7 +15,10 @@
   <string name="TR_SCREENCONFIG_NUMPLAYERS">Antal spelare</string>
   <string name="TR_SCREENCONFIG_NUMMICS">Antal mikrofoner</string>
   <string name="TR_SCREENCONFIG_NUMROUNDS">Antal omgångar</string>
+  <string name="TR_SCREENCONFIG_NUMJOKERS">Antal joker</string>
+  <string name="TR_SCREENCONFIG_REFILLJOKERS">Fyll på jokers varje runda</string>
   <string name="TR_SCREENNAMES_TITLE">Utmanarläge: Välj Spelare</string>
+  <string name="TR_SCREENNAMES_BUTTON_RANDOM">Välj slumpmässig</string>
   <string name="TR_SCREENMAIN_TITLE">Utmanarläge: Översikt</string>
   <string name="TR_SCREENMAIN_TABLE_POS">Position</string>
   <string name="TR_SCREENMAIN_TABLE_PLAYERNAME">Namn</string>
diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs
index d595bee2..ea7e9364 100644
--- a/Vocaluxe/Base/CBackgroundMusic.cs
+++ b/Vocaluxe/Base/CBackgroundMusic.cs
@@ -296,10 +296,12 @@ namespace Vocaluxe.Base
                 CSound.SetGlobalVolume(CConfig.PreviewMusicVolume);
             }
 
+            bool songChanged = _CurPlayer.SongID != song.ID;
+
             _PreviewPlayer.Load(song);
 
             //Change song position only if song is changed or near to end
-            if (_CurPlayer.SongID != _PreviewPlayer.SongID && _CurPlayer.Position + 30 < _CurPlayer.Length)
+            if (songChanged || _CurPlayer.Position + 30 < _CurPlayer.Length)
             {
                 float length = _PreviewPlayer.Length;
                 if (length < 1)