diff --git a/Vocaluxe/Base/CDraw.cs b/Vocaluxe/Base/CDraw.cs
index 82cc70c7..514d3adc 100644
--- a/Vocaluxe/Base/CDraw.cs
+++ b/Vocaluxe/Base/CDraw.cs
@@ -338,7 +338,7 @@ namespace Vocaluxe.Base
         #endregion private vars
 
         #region public vars
-        public bool Visible;
+        //public bool Visible;
         public float Alpha2 = 1f;
 
         public float X
diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs
index a6cb58da..07ea2d2d 100644
--- a/Vocaluxe/Base/CGame.cs
+++ b/Vocaluxe/Base/CGame.cs
@@ -229,7 +229,7 @@ namespace Vocaluxe.Base
 
         public static void UpdatePoints(float Time)
         {
-            const bool DEBUG_HIT = false;
+            bool DEBUG_HIT = false;
 
             CSong song = _GameMode.GetSong();
 
diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index 1a06b38b..2202638c 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -90,7 +90,7 @@ namespace Vocaluxe.Base
         public const float LyricHelperMoveTime = 1.5f;
         public const float LyricHelperMinTime = 0.2f;
 
-        public const bool TabNavigation = false;
+        public static bool TabNavigation = false;
 
         public const float BackgroundMusicFadeTime = 0.5f;
                 
diff --git a/Vocaluxe/Base/CTheme.cs b/Vocaluxe/Base/CTheme.cs
index a3394072..d28064da 100644
--- a/Vocaluxe/Base/CTheme.cs
+++ b/Vocaluxe/Base/CTheme.cs
@@ -482,6 +482,10 @@ namespace Vocaluxe.Base
                         if (skin.Name != String.Empty)
                         {
                             CHelper.GetValueFromXML("//root/Info/Author", navigator, ref skin.Author, String.Empty);
+                            CHelper.TryGetIntValueFromXML("//root/Info/SkinVersionMajor", navigator, ref skin.SkinVersionMajor);
+                            CHelper.TryGetIntValueFromXML("//root/Info/SkinVersionMinor", navigator, ref skin.SkinVersionMinor);
+
+
                             skin.Path = path;
                             skin.FileName = file;
 
diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs
index 64d191f3..d685857d 100644
--- a/Vocaluxe/Lib/Draw/CDirect3D.cs
+++ b/Vocaluxe/Lib/Draw/CDirect3D.cs
@@ -367,7 +367,7 @@ namespace Vocaluxe.Lib.Draw
                     {
                         _Device.Present();
                     }
-                    catch (Direct3D9Exception e)
+                    catch (Direct3D9Exception)
                     {
                         if (_Device.TestCooperativeLevel() == ResultCode.DeviceNotReset) //Do only reset when the device in a resetable state!
                         {
diff --git a/Vocaluxe/Menu/CLyric.cs b/Vocaluxe/Menu/CLyric.cs
index 3ce392e9..24651cc3 100644
--- a/Vocaluxe/Menu/CLyric.cs
+++ b/Vocaluxe/Menu/CLyric.cs
@@ -232,7 +232,21 @@ namespace Vocaluxe.Menu
         public void Draw(float ActualBeat)
         {
             if (Visible || CSettings.GameState == EGameState.EditTheme)
-                DrawSlide(ActualBeat);
+            {
+                switch (_Style)
+                {
+                    case ELyricStyle.Fill:
+                        break;
+                    case ELyricStyle.Jump:
+                        break;
+                    case ELyricStyle.Slide:
+                        DrawSlide(ActualBeat);
+                        break;
+                    default:
+                        DrawSlide(ActualBeat);
+                        break;
+                }            
+            }
         }
 
         private void DrawSlide(float CurrentBeat)
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs b/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs
index a7781a11..43cd6f28 100644
--- a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs
+++ b/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs
@@ -22,9 +22,9 @@ namespace Vocaluxe.Menu.SongMenu
 
         public string ColorName;
 
-        public SThemeSongMenuBook songMenuBook;
-        public SThemeSongMenuDreidel songMenuDreidel;
-        public SThemeSongMenuList songMenuList;
+        //public SThemeSongMenuBook songMenuBook;
+        //public SThemeSongMenuDreidel songMenuDreidel;
+        //public SThemeSongMenuList songMenuList;
         public SThemeSongMenuTileBoard songMenuTileBoard;
     }
 
diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs
index 402feb89..11ed8670 100644
--- a/Vocaluxe/Screens/CScreenMain.cs
+++ b/Vocaluxe/Screens/CScreenMain.cs
@@ -23,7 +23,7 @@ namespace Vocaluxe.Screens
         const string ButtonProfiles = "ButtonProfiles";
         const string ButtonExit = "ButtonExit";
 
-        CParticleEffect Snowflakes;
+        //CParticleEffect Snowflakes;
         
         public CScreenMain()
         {
@@ -114,8 +114,8 @@ namespace Vocaluxe.Screens
         {
             base.OnShow();
 
-            if (Snowflakes != null)
-                Snowflakes.Resume();
+            //if (Snowflakes != null)
+            //    Snowflakes.Resume();
         }
 
         public override bool UpdateGame()
@@ -145,8 +145,8 @@ namespace Vocaluxe.Screens
         {
             base.OnClose();
 
-            if (Snowflakes != null)
-                Snowflakes.Pause();
+            //if (Snowflakes != null)
+            //    Snowflakes.Pause();
         }
     }
 }
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 4681a79b..48ea1105 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -65,7 +65,7 @@ namespace Vocaluxe.Screens
 
         private int _CurrentBeat;
         private int _CurrentStream = -1;
-        private int _NextStream = -1;
+        //private int _NextStream = -1;
         private float _Volume = 100f;
         private int _CurrentVideo = -1;
         private EAspect _VideoAspect = EAspect.Crop;