diff --git a/Vocaluxe/Lib/Song/CSong.cs b/Vocaluxe/Lib/Song/CSong.cs
index f3240472..f325d691 100644
--- a/Vocaluxe/Lib/Song/CSong.cs
+++ b/Vocaluxe/Lib/Song/CSong.cs
@@ -371,29 +371,16 @@ namespace Vocaluxe.Lib.Song
             CheckFiles();
 
             //Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
-            if (this.ArtistSorting == "") 
+            if (this.ArtistSorting == String.Empty) 
             {
                 this.ArtistSorting = this.Artist;
             }
 
-            if (this.TitleSorting == "")
+            if (this.TitleSorting == String.Empty)
             {
                 this.TitleSorting = this.Title;
             }
 
-            //Check if Duet-Tags are set
-            if (IsDuet)
-            {
-                if (DuetPart1 == String.Empty)
-                {
-                    DuetPart1 = "Part 1";
-                }
-                if (DuetPart2 == String.Empty)
-                {
-                    DuetPart2 = "Part 2";
-                }
-            }
-
             return true;
         }
 
@@ -534,6 +521,8 @@ namespace Vocaluxe.Lib.Song
                 return false;
             }
             _NotesLoaded = true;
+            if(IsDuet)
+                CheckDuet();
             return true;
         }
 
@@ -599,5 +588,19 @@ namespace Vocaluxe.Lib.Song
                 }
             }
         }
+
+        private void CheckDuet()
+        {
+            if (DuetPart1 == String.Empty)
+            {
+                DuetPart1 = "Part 1";
+                CLog.LogError("Warning: Can't find #P1-tag for duets in \"" + this.Artist + " - " + this.Title + "\".");
+            }
+            if (DuetPart2 == String.Empty)
+            {
+                DuetPart2 = "Part 2";
+                CLog.LogError("Warning: Can't find #P2-tag for duets in \"" + this.Artist + " - " + this.Title + "\".");
+            }
+        }
     }
 }
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs b/Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs
index 7ab6a6af..6a4aae66 100644
--- a/Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs
+++ b/Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs
@@ -13,6 +13,8 @@ namespace Vocaluxe.Menu.SongMenu
     class CSongMenuDreidel : CSongMenuFramework
     {
         private SRectF _ScrollRect;
+        private CStatic _CoverBig;
+        private CStatic _TextBG;
 
         private CStatic _DuetIcon;
         private CStatic _VideoIcon;
@@ -27,5 +29,20 @@ namespace Vocaluxe.Menu.SongMenu
         {
             return _actualSelection;
         }
+
+        public override void Init()
+        {
+            base.Init();
+            /**
+            _CoverBig = _Theme.songMenuDreidel.StaticCoverBig;
+            _TextBG = _Theme.songMenuDreidel.StaticTextBG;
+            _DuetIcon = _Theme.songMenuDreidel.StaticDuetIcon;
+            _VideoIcon = _Theme.songMenuDreidel.StaticVideoIcon;
+
+            _Artist = _Theme.songMenuDreidel.TextArtist;
+            _Title = _Theme.songMenuDreidel.TextTitle;
+            _SongLength = _Theme.songMenuDreidel.TextSongLength;
+             **/
+        }
     }
 }
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index 626863ea..e9f475cc 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -589,6 +589,7 @@ namespace Vocaluxe.Screens
                 }
                 if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet)
                 {
+                    SelectSlides[htSelectSlides(SelectSlideDuetPlayer[i])].Clear();
                     if (i + 1 <= CGame.NumPlayer)
                         SelectSlides[htSelectSlides(SelectSlideDuetPlayer[i])].Visible = true;
                     else