From b0b3c09ab48db1832827fbbab758bc43dcaa71fb Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Sun, 24 Mar 2013 16:46:59 +0100
Subject: [PATCH] Bugfix to make it .Net2 compiler compliant Bugfix to allow
 spaces in project dir

---
 .../PartyModeChallenge/PartyModeChallenge.cs  | 22 +++++++++----------
 .../PartyModeChallenge.csproj                 |  3 ++-
 .../PartyScreenChallengeConfig.cs             |  4 ++--
 .../PartyScreenChallengeMain.cs               |  6 ++---
 .../PartyScreenChallengeNames.cs              |  2 +-
 .../PartyModeChallengeMedley.cs               | 22 +++++++++----------
 .../PartyModeChallengeMedley.csproj           |  3 ++-
 .../PartyScreenChallengeMedleyConfig.cs       |  4 ++--
 .../PartyScreenChallengeMedleyMain.cs         |  6 ++---
 .../PartyScreenChallengeMedleyNames.cs        |  2 +-
 .../PartyModeTicTacToe/PartyModeTicTacToe.cs  |  4 ++--
 .../PartyModeTicTacToe.csproj                 |  3 ++-
 .../PartyScreenTicTacToeConfig.cs             |  4 ++--
 .../PartyScreenTicTacToeMain.cs               |  6 ++---
 .../PartyScreenTicTacToeNames.cs              |  2 +-
 Re#Settings.DotSettings                       | 11 ++++++++--
 Vocaluxe/Base/CParty.cs                       |  4 ++--
 Vocaluxe/Base/CSongFilter.cs                  |  2 +-
 Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs      |  2 +-
 Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs |  3 ---
 Vocaluxe/Program.cs                           |  2 +-
 Vocaluxe/Screens/CPopupScreenPlayerControl.cs |  4 ++--
 Vocaluxe/Screens/CPopupScreenVolumeControl.cs |  6 ++---
 Vocaluxe/Screens/CScreenCredits.cs            |  8 +++----
 Vocaluxe/Screens/CScreenLoad.cs               |  4 ++--
 Vocaluxe/Screens/CScreenMain.cs               |  8 +++----
 Vocaluxe/Screens/CScreenNames.cs              | 11 +++++-----
 Vocaluxe/Screens/CScreenOptions.cs            |  2 +-
 Vocaluxe/Screens/CScreenOptionsGame.cs        |  4 ++--
 Vocaluxe/Screens/CScreenOptionsLyrics.cs      |  4 ++--
 Vocaluxe/Screens/CScreenOptionsRecord.cs      | 10 ++++-----
 Vocaluxe/Screens/CScreenOptionsSound.cs       | 10 ++++-----
 Vocaluxe/Screens/CScreenOptionsTheme.cs       |  4 ++--
 Vocaluxe/Screens/CScreenOptionsVideo.cs       |  6 ++---
 Vocaluxe/Screens/CScreenParty.cs              |  6 ++---
 Vocaluxe/Screens/CScreenProfiles.cs           |  7 +++---
 Vocaluxe/Screens/CScreenScore.cs              |  2 +-
 Vocaluxe/Screens/CScreenSing.cs               | 19 ++++++++--------
 Vocaluxe/Screens/CScreenSong.cs               |  8 +++----
 VocaluxeLib/Menu/CSelectSlide.cs              |  2 +-
 VocaluxeLib/Menu/SongMenu/CSong.cs            |  2 +-
 41 files changed, 126 insertions(+), 118 deletions(-)

diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.cs b/PartyModes/PartyModeChallenge/PartyModeChallenge.cs
index 2725a680..2b248af1 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.cs
@@ -149,8 +149,8 @@ namespace VocaluxeLib.PartyModes.Challenge
             _ScreenSongOptions.Selection.RandomOnly = false;
             _ScreenSongOptions.Selection.PartyMode = true;
             _ScreenSongOptions.Selection.CategoryChangeAllowed = true;
-            _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
-            _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+            _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
+            _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
 
             _ScreenSongOptions.Sorting.SearchString = String.Empty;
             _ScreenSongOptions.Sorting.SearchActive = false;
@@ -501,30 +501,30 @@ namespace VocaluxeLib.PartyModes.Challenge
             switch (GameData.NumPlayerAtOnce)
             {
                 case 1:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {10};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {10};
                     break;
 
                 case 2:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
                     break;
 
                 case 3:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {4, 4, 4};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {4, 4, 4};
                     break;
 
                 case 4:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {3, 3, 3, 3};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {3, 3, 3, 3};
                     break;
 
                 case 5:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {2, 2, 2, 2, 2};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2};
                     break;
 
                 case 6:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {2, 2, 2, 2, 2, 2};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2, 2};
                     break;
                 default:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
                     break;
             }
         }
@@ -535,13 +535,13 @@ namespace VocaluxeLib.PartyModes.Challenge
 
             if (profiles == null)
             {
-                _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+                _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
                 return;
             }
 
             if (GameData.NumPlayerAtOnce < 1 || GameData.ProfileIDs.Count < GameData.NumPlayerAtOnce || profiles.Length < GameData.NumPlayerAtOnce)
             {
-                _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+                _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
                 return;
             }
 
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index 2472f2fa..61103a08 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -134,7 +134,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\Excludes.txt /I /Y</PostBuildEvent>
+    <PostBuildEvent>cd $(SolutionDir)Partymodes\
+xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
index 96a02742..1c4d409c 100644
--- a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
+++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
@@ -28,8 +28,8 @@ namespace VocaluxeLib.PartyModes.Challenge
         {
             base.Init();
 
-            _ThemeSelectSlides = new[] {SelectSlideNumPlayers, SelectSlideNumMics, SelectSlideNumRounds};
-            _ThemeButtons = new[] {ButtonNext, ButtonBack};
+            _ThemeSelectSlides = new string[] {SelectSlideNumPlayers, SelectSlideNumMics, SelectSlideNumRounds};
+            _ThemeButtons = new string[] {ButtonNext, ButtonBack};
 
             Data = new DataFromScreen();
             FromScreenConfig config = new FromScreenConfig();
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
index f91e76d3..f6fa899f 100644
--- a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
+++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
@@ -85,14 +85,14 @@ namespace VocaluxeLib.PartyModes.Challenge
         {
             base.Init();
 
-            _ThemeTexts = new[]
+            _ThemeTexts = new string[]
                 {
                     TextPosition, TextPlayerName, TextNumPlayed, TextWon, TextSingPoints, TextGamePoints, TextNextPlayer, TextPopupReallyExit, TextRoundNumber, TextRoundPlayer,
                     TextRoundScore, TextFinishMessage, TextFinishPlayerWin, TextNextPlayerMessage
                 };
-            _ThemeButtons = new[]
+            _ThemeButtons = new string[]
                 {ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonPlayerScrollDown, ButtonPlayerScrollUp, ButtonRoundsScrollDown, ButtonRoundsScrollUp};
-            _ThemeStatics = new[] {StaticPopupBG, StaticNextPlayer};
+            _ThemeStatics = new string[] {StaticPopupBG, StaticNextPlayer};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
index b1132546..60811c80 100644
--- a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
+++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
@@ -66,7 +66,7 @@ namespace VocaluxeLib.PartyModes.Challenge
             Data.ScreenNames.ProfileIDs = new List<int>();
 
             List<string> buttons = new List<string>();
-            _ThemeButtons = new[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose};
+            _ThemeButtons = new string[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose};
 
             Data = new DataFromScreen();
             FromScreenNames names = new FromScreenNames();
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
index d183c0e8..36e54e63 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
+++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
@@ -151,8 +151,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
             _ScreenSongOptions.Selection.RandomOnly = false;
             _ScreenSongOptions.Selection.PartyMode = true;
             _ScreenSongOptions.Selection.CategoryChangeAllowed = true;
-            _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
-            _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+            _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
+            _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
 
             _ScreenSongOptions.Sorting.SearchString = String.Empty;
             _ScreenSongOptions.Sorting.SearchActive = false;
@@ -549,30 +549,30 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
             switch (GameData.NumPlayerAtOnce)
             {
                 case 1:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {10};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {10};
                     break;
 
                 case 2:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
                     break;
 
                 case 3:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {4, 4, 4};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {4, 4, 4};
                     break;
 
                 case 4:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {3, 3, 3, 3};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {3, 3, 3, 3};
                     break;
 
                 case 5:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {2, 2, 2, 2, 2};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2};
                     break;
 
                 case 6:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {2, 2, 2, 2, 2, 2};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {2, 2, 2, 2, 2, 2};
                     break;
                 default:
-                    _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
+                    _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
                     break;
             }
         }
@@ -583,13 +583,13 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
 
             if (profiles == null)
             {
-                _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+                _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
                 return;
             }
 
             if (GameData.NumPlayerAtOnce < 1 || GameData.ProfileIDs.Count < GameData.NumPlayerAtOnce || profiles.Length < GameData.NumPlayerAtOnce)
             {
-                _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+                _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
                 return;
             }
 
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
index 4895098a..a09574e8 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
+++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
@@ -134,7 +134,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\Excludes.txt /I /Y</PostBuildEvent>
+    <PostBuildEvent>cd $(SolutionDir)Partymodes\
+xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
index 96be3cc2..4bdecc8d 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
+++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
@@ -28,8 +28,8 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
         {
             base.Init();
 
-            _ThemeSelectSlides = new[] {SelectSlideNumPlayers, SelectSlideNumMics, SelectSlideNumRounds};
-            _ThemeButtons = new[] {ButtonNext, ButtonBack};
+            _ThemeSelectSlides = new string[] {SelectSlideNumPlayers, SelectSlideNumMics, SelectSlideNumRounds};
+            _ThemeButtons = new string[] {ButtonNext, ButtonBack};
 
             Data = new DataFromScreen();
             FromScreenConfig config = new FromScreenConfig();
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
index 42f55f68..fcd47460 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
+++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
@@ -85,14 +85,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
         {
             base.Init();
 
-            _ThemeTexts = new[]
+            _ThemeTexts = new string[]
                 {
                     TextPosition, TextPlayerName, TextNumPlayed, TextWon, TextSingPoints, TextGamePoints, TextNextPlayer, TextPopupReallyExit, TextRoundNumber, TextRoundPlayer,
                     TextRoundScore, TextFinishMessage, TextFinishPlayerWin, TextNextPlayerMessage
                 };
-            _ThemeButtons = new[]
+            _ThemeButtons = new string[]
                 {ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonPlayerScrollDown, ButtonPlayerScrollUp, ButtonRoundsScrollDown, ButtonRoundsScrollUp};
-            _ThemeStatics = new[] {StaticPopupBG, StaticNextPlayer};
+            _ThemeStatics = new string[] {StaticPopupBG, StaticNextPlayer};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
index fa285289..700bbcaa 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
+++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
@@ -66,7 +66,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
             Data.ScreenNames.ProfileIDs = new List<int>();
 
             List<string> buttons = new List<string>();
-            _ThemeButtons = new[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose};
+            _ThemeButtons = new string[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose};
 
             Data = new DataFromScreen();
             FromScreenNames names = new FromScreenNames();
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
index b9096e78..52118f69 100644
--- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
+++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
@@ -167,8 +167,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             _ScreenSongOptions.Selection.RandomOnly = false;
             _ScreenSongOptions.Selection.PartyMode = true;
             _ScreenSongOptions.Selection.CategoryChangeAllowed = true;
-            _ScreenSongOptions.Selection.NumJokers = new[] {5, 5};
-            _ScreenSongOptions.Selection.TeamNames = new[] {"foo", "bar"};
+            _ScreenSongOptions.Selection.NumJokers = new int[] {5, 5};
+            _ScreenSongOptions.Selection.TeamNames = new string[] {"foo", "bar"};
 
             _ScreenSongOptions.Sorting.SearchString = String.Empty;
             _ScreenSongOptions.Sorting.SearchActive = false;
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
index 4478481e..51727704 100644
--- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
@@ -133,7 +133,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\Excludes.txt /I /Y</PostBuildEvent>
+    <PostBuildEvent>cd $(SolutionDir)Partymodes\
+xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\" /EXCLUDE:Excludes.txt /I /Y</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
index 76fef6a6..5e4012ab 100644
--- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
+++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
@@ -30,9 +30,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         {
             base.Init();
 
-            _ThemeSelectSlides = new[]
+            _ThemeSelectSlides = new string[]
                 {SelectSlideNumPlayerTeam1, SelectSlideNumPlayerTeam2, SelectSlideNumFields, SelectSlideSongSource, SelectSlidePlaylist, SelectSlideCategory, SelectSlideGameMode};
-            _ThemeButtons = new[] {ButtonNext, ButtonBack};
+            _ThemeButtons = new string[] {ButtonNext, ButtonBack};
 
             Data = new DataFromScreen();
             FromScreenConfig config = new FromScreenConfig();
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
index 963b3941..ece24122 100644
--- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
+++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
@@ -74,13 +74,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
         {
             base.Init();
 
-            _ThemeTexts = new[] {TextPopupReallyExit, TextTeamChoosing, TextFinishMessage, TextNextPlayerT1, TextNextPlayerT2, TextNextPlayerNameT1, TextNextPlayerNameT2};
-            _ThemeButtons = new[]
+            _ThemeTexts = new string[] {TextPopupReallyExit, TextTeamChoosing, TextFinishMessage, TextNextPlayerT1, TextNextPlayerT2, TextNextPlayerNameT1, TextNextPlayerNameT2};
+            _ThemeButtons = new string[]
                 {
                     ButtonNextRound, ButtonBack, ButtonExit, ButtonPopupYes, ButtonPopupNo, ButtonField, ButtonJokerRandomT1, ButtonJokerRandomT2, ButtonJokerRetryT1,
                     ButtonJokerRetryT2
                 };
-            _ThemeStatics = new[] {StaticPopupBG, StaticAvatarT1, StaticAvatarT2};
+            _ThemeStatics = new string[] {StaticPopupBG, StaticAvatarT1, StaticAvatarT2};
 
             Data = new DataFromScreen();
             FromScreenMain config = new FromScreenMain();
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
index d82ea403..d83987d7 100644
--- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
+++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
@@ -70,7 +70,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
             Data.ScreenNames.ProfileIDsTeam2 = new List<int>();
 
             List<string> buttons = new List<string>();
-            _ThemeButtons = new[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose, ButtonPlayerChooseScrollUp, ButtonPlayerChooseScrollDown};
+            _ThemeButtons = new string[] {ButtonBack, ButtonNext, ButtonPlayerDestination, ButtonPlayerChoose, ButtonPlayerChooseScrollUp, ButtonPlayerChooseScrollDown};
 
             Data = new DataFromScreen();
             FromScreenNames names = new FromScreenNames();
diff --git a/Re#Settings.DotSettings b/Re#Settings.DotSettings
index c0cf12fa..e20afa3a 100644
--- a/Re#Settings.DotSettings
+++ b/Re#Settings.DotSettings
@@ -1,7 +1,13 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;DISABLED&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantExplicitArrayCreation/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyACultureInStringConversionExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_EXPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_EXPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_EXPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;Ignore&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Simple_0020Reformat/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Simple Reformat"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;False&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;StyleCop.Documentation&gt;&lt;SA1600ElementsMustBeDocumented&gt;False&lt;/SA1600ElementsMustBeDocumented&gt;&lt;SA1604ElementDocumentationMustHaveSummary&gt;False&lt;/SA1604ElementDocumentationMustHaveSummary&gt;&lt;SA1609PropertyDocumentationMustHaveValueDocumented&gt;False&lt;/SA1609PropertyDocumentationMustHaveValueDocumented&gt;&lt;SA1611ElementParametersMustBeDocumented&gt;False&lt;/SA1611ElementParametersMustBeDocumented&gt;&lt;SA1615ElementReturnValueMustBeDocumented&gt;False&lt;/SA1615ElementReturnValueMustBeDocumented&gt;&lt;SA1617VoidReturnValueMustNotBeDocumented&gt;False&lt;/SA1617VoidReturnValueMustNotBeDocumented&gt;&lt;SA1618GenericTypeParametersMustBeDocumented&gt;False&lt;/SA1618GenericTypeParametersMustBeDocumented&gt;&lt;SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;False&lt;/SA1626SingleLineCommentsMustNotUseDocumentationStyleSlashes&gt;&lt;SA1628DocumentationTextMustBeginWithACapitalLetter&gt;False&lt;/SA1628DocumentationTextMustBeginWithACapitalLetter&gt;&lt;SA1629DocumentationTextMustEndWithAPeriod&gt;False&lt;/SA1629DocumentationTextMustEndWithAPeriod&gt;&lt;SA1633SA1641UpdateFileHeader&gt;Ignore&lt;/SA1633SA1641UpdateFileHeader&gt;&lt;SA1639FileHeaderMustHaveSummary&gt;False&lt;/SA1639FileHeaderMustHaveSummary&gt;&lt;SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1642ConstructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;False&lt;/SA1643DestructorSummaryDocumentationMustBeginWithStandardText&gt;&lt;SA1644DocumentationHeadersMustNotContainBlankLines&gt;False&lt;/SA1644DocumentationHeadersMustNotContainBlankLines&gt;&lt;/StyleCop.Documentation&gt;&lt;StyleCop.Spacing&gt;&lt;SA1001CommasMustBeSpacedCorrectly&gt;False&lt;/SA1001CommasMustBeSpacedCorrectly&gt;&lt;SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;False&lt;/SA1005SingleLineCommentsMustBeginWithSingleSpace&gt;&lt;SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;True&lt;/SA1006PreprocessorKeywordsMustNotBePrecededBySpace&gt;&lt;SA1021NegativeSignsMustBeSpacedCorrectly&gt;True&lt;/SA1021NegativeSignsMustBeSpacedCorrectly&gt;&lt;SA1022PositiveSignsMustBeSpacedCorrectly&gt;True&lt;/SA1022PositiveSignsMustBeSpacedCorrectly&gt;&lt;SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;True&lt;/SA1025CodeMustNotContainMultipleWhitespaceInARow&gt;&lt;/StyleCop.Spacing&gt;&lt;StyleCop.Readability&gt;&lt;SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;True&lt;/SA1100DoNotPrefixCallsWithBaseUnlessLocalImplementationExists&gt;&lt;SA1106CodeMustNotContainEmptyStatements&gt;True&lt;/SA1106CodeMustNotContainEmptyStatements&gt;&lt;SA1108BlockStatementsMustNotContainEmbeddedComments&gt;True&lt;/SA1108BlockStatementsMustNotContainEmbeddedComments&gt;&lt;SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;True&lt;/SA1109BlockStatementsMustNotContainEmbeddedRegions&gt;&lt;SA1120CommentsMustContainText&gt;False&lt;/SA1120CommentsMustContainText&gt;&lt;SA1121UseBuiltInTypeAlias&gt;False&lt;/SA1121UseBuiltInTypeAlias&gt;&lt;SA1122UseStringEmptyForEmptyStrings&gt;False&lt;/SA1122UseStringEmptyForEmptyStrings&gt;&lt;SA1123DoNotPlaceRegionsWithinElements&gt;False&lt;/SA1123DoNotPlaceRegionsWithinElements&gt;&lt;SA1124CodeMustNotContainEmptyRegions&gt;True&lt;/SA1124CodeMustNotContainEmptyRegions&gt;&lt;/StyleCop.Readability&gt;&lt;StyleCop.Layout&gt;&lt;SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;False&lt;/SA1500CurlyBracketsForMultiLineStatementsMustNotShareLine&gt;&lt;SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;True&lt;/SA1509OpeningCurlyBracketsMustNotBePrecededByBlankLine&gt;&lt;SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;True&lt;/SA1510ChainedStatementBlocksMustNotBePrecededByBlankLine&gt;&lt;SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;True&lt;/SA1511WhileDoFooterMustNotBePrecededByBlankLine&gt;&lt;SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;True&lt;/SA1512SingleLineCommentsMustNotBeFollowedByBlankLine&gt;&lt;SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;False&lt;/SA1513ClosingCurlyBracketMustBeFollowedByBlankLine&gt;&lt;SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;False&lt;/SA1514ElementDocumentationHeaderMustBePrecededByBlankLine&gt;&lt;SA1515SingleLineCommentMustBeProceededByBlankLine&gt;False&lt;/SA1515SingleLineCommentMustBeProceededByBlankLine&gt;&lt;/StyleCop.Layout&gt;&lt;StyleCop.Ordering&gt;&lt;AlphabeticalUsingDirectives&gt;Ignore&lt;/AlphabeticalUsingDirectives&gt;&lt;ExpandUsingDirectives&gt;Ignore&lt;/ExpandUsingDirectives&gt;&lt;SA1212PropertyAccessorsMustFollowOrder&gt;True&lt;/SA1212PropertyAccessorsMustFollowOrder&gt;&lt;SA1213EventAccessorsMustFollowOrder&gt;True&lt;/SA1213EventAccessorsMustFollowOrder&gt;&lt;/StyleCop.Ordering&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Cleanup</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Default: Reformat Code</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Simple Reformat</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_FIELD/@EntryValue">0</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_INSIDE_REGION/@EntryValue">0</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EMPTY_BLOCK_STYLE/@EntryValue">TOGETHER_SAME_LINE</s:String>
@@ -20,6 +26,7 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_FOR_STMT_HEADER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">180</s:Int64>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index 0c27c84a..4f974b1d 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -270,7 +270,7 @@ namespace Vocaluxe.Base
                 return pm;
             }
 
-            object Instance = Output.CreateInstance("Vocaluxe.PartyModes." + pm.Folder + "." + pm.PartyModeFile);
+            object Instance = Output.CreateInstance(typeof(IPartyMode).Namespace + "." + pm.Folder + "." + pm.PartyModeFile);
             if (Instance == null)
             {
                 CLog.LogError("Error creating Instance of PartyMode file: " + file);
@@ -367,7 +367,7 @@ namespace Vocaluxe.Base
             if (Assembly == null)
                 return null;
 
-            object Instance = Assembly.CreateInstance("Vocaluxe.PartyModes." + partyModeName + "." + ScreenName);
+            object Instance = Assembly.CreateInstance(typeof(IPartyMode).Namespace + "." + partyModeName + "." + ScreenName);
             if (Instance == null)
             {
                 CLog.LogError("Error creating Instance of PartyScreen: " + ScreenName);
diff --git a/Vocaluxe/Base/CSongFilter.cs b/Vocaluxe/Base/CSongFilter.cs
index 9777661f..6c9ec90e 100644
--- a/Vocaluxe/Base/CSongFilter.cs
+++ b/Vocaluxe/Base/CSongFilter.cs
@@ -66,7 +66,7 @@ namespace Vocaluxe.Base
 
             string[] searchStrings = null;
             if (_SearchString.Length > 0)
-                searchStrings = _SearchString.ToUpper().Split(new[] {' '});
+                searchStrings = _SearchString.ToUpper().Split(new char[] {' '});
 
             foreach (CSong song in CSongs.Songs)
             {
diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
index f91dd505..f7271c59 100644
--- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
+++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs
@@ -633,7 +633,7 @@ namespace Vocaluxe.Lib.Input.WiiMote
 
         private void WriteData(int address, byte data)
         {
-            WriteData(address, 1, new[] {data});
+            WriteData(address, 1, new byte[] {data});
         }
 
         private void WriteData(int address, byte size, byte[] buff)
diff --git a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs
index ff6ee102..f737fcf4 100644
--- a/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs
+++ b/Vocaluxe/Lib/Sound/Portaudio/PortAudioASIO.cs
@@ -53,9 +53,6 @@ namespace PortAudioSharp
         public const int paAsioUseChannelSelectors = 0x01;
         #endregion
 
-        #region **** PORTAUDIO ENUMERATIONS ****
-        #endregion
-
         #region **** PORTAUDIO FUNCTIONS ****
         //		/// <summary> Retrieve legal latency settings for the specificed device, in samples. </summary>
         //		/// <param name="device"> The global index of the device about which the query is being made. </param>
diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index 9d87b376..89373317 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -199,7 +199,7 @@ namespace Vocaluxe
 
         private static Assembly AssemblyResolver(Object sender, ResolveEventArgs args)
         {
-            string[] arr = args.Name.Split(new[] {','});
+            string[] arr = args.Name.Split(new char[] {','});
             if (arr != null)
             {
 #if ARCH_X86
diff --git a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs
index 3e6b8ddb..b410b91e 100644
--- a/Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+++ b/Vocaluxe/Screens/CPopupScreenPlayerControl.cs
@@ -69,8 +69,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeStatics = new[] {StaticBG, StaticCover};
-            _ThemeTexts = new[] {TextCurrentSong};
+            _ThemeStatics = new string[] {StaticBG, StaticCover};
+            _ThemeTexts = new string[] {TextCurrentSong};
 
             List<string> buttons = new List<string>();
             buttons.Add(ButtonPlay);
diff --git a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
index 37e9fffc..0f4e829d 100644
--- a/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
+++ b/Vocaluxe/Screens/CPopupScreenVolumeControl.cs
@@ -19,8 +19,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeStatics = new[] {StaticBG};
-            _ThemeSelectSlides = new[] {SelectSlideVolume};
+            _ThemeStatics = new string[] {StaticBG};
+            _ThemeSelectSlides = new string[] {SelectSlideVolume};
         }
 
         public override void LoadTheme(string XmlPath)
@@ -28,7 +28,7 @@ namespace Vocaluxe.Screens
             base.LoadTheme(XmlPath);
 
             _ScreenArea = Statics[StaticBG].Rect;
-            SelectSlides[SelectSlideVolume].AddValues(new[]
+            SelectSlides[SelectSlideVolume].AddValues(new string[]
                 {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
         }
 
diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs
index f4a647f0..58a97264 100644
--- a/Vocaluxe/Screens/CScreenCredits.cs
+++ b/Vocaluxe/Screens/CScreenCredits.cs
@@ -139,14 +139,14 @@ namespace Vocaluxe.Screens
             paragraph = "Inspired by the achievements of UltraStar Deluxe and its variants and pursuing the goal of making " +
                         "a good thing even better, we ended up rewriting the game from scratch. And a new implementation in a new " +
                         "programming language called for a new name - and VOCALUXE [ˈvoʊˈkəˈlʌks] it is!";
-            words = paragraph.Split(new[] {' '});
+            words = paragraph.Split(new char[] {' '});
             paragraphs.Add(words);
 
             paragraph = "This first public version has already implemented many of the original features and it is fully " +
                         "compatible with all the song files in your existing song collection. The code design allows a much faster " +
                         "implementation of new features, thus the roadmap for the next few stable releases is packed and we expect much " +
                         "shorter release cycles than ever before. And, of course, our and your ideas may be the features of tomorrow.";
-            words = paragraph.Split(new[] {' '});
+            words = paragraph.Split(new char[] {' '});
             paragraphs.Add(words);
 
             paragraph = "We appreciate the feedback in the beta release phase and are, of course, always open for bug reports, " +
@@ -154,12 +154,12 @@ namespace Vocaluxe.Screens
                         "Vocaluxe an international experience from the very beginning and all those diligent song makers out there - " +
                         "there's something for everyone in the huge collection of available songs! Last but not least, thanks to " +
                         "Kosal Sen's Philly Sans type used in the Vocaluxe Logo.";
-            words = paragraph.Split(new[] {' '});
+            words = paragraph.Split(new char[] {' '});
             paragraphs.Add(words);
 
             paragraph = "Go ahead and grab your mics, crank up your stereo, warm up your voice and get ready to sing to the best " +
                         "of your abilities!";
-            words = paragraph.Split(new[] {' '});
+            words = paragraph.Split(new char[] {' '});
             paragraphs.Add(words);
         }
 
diff --git a/Vocaluxe/Screens/CScreenLoad.cs b/Vocaluxe/Screens/CScreenLoad.cs
index 7860d604..ae162cb8 100644
--- a/Vocaluxe/Screens/CScreenLoad.cs
+++ b/Vocaluxe/Screens/CScreenLoad.cs
@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
 
         private const string TextStatus = "TextStatus";
 
-        private readonly string[] IntroVideo = new[] {"IntroIn", "IntroMid", "IntroOut"};
+        private readonly string[] IntroVideo = new string[] {"IntroIn", "IntroMid", "IntroOut"};
 
         private Thread _SongLoaderThread;
         private Stopwatch _timer;
@@ -32,7 +32,7 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeTexts = new[] {TextStatus};
+            _ThemeTexts = new string[] {TextStatus};
             _Intros = new VideoPlayer[IntroVideo.Length];
             for (int i = 0; i < _Intros.Length; i++)
                 _Intros[i] = new VideoPlayer();
diff --git a/Vocaluxe/Screens/CScreenMain.cs b/Vocaluxe/Screens/CScreenMain.cs
index 389c42ee..b6a0cbd2 100644
--- a/Vocaluxe/Screens/CScreenMain.cs
+++ b/Vocaluxe/Screens/CScreenMain.cs
@@ -23,8 +23,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeStatics = new[] {"StaticMenuBar"};
-            _ThemeButtons = new[] {ButtonSing, ButtonParty, ButtonOptions, ButtonProfiles, ButtonExit};
+            _ThemeStatics = new string[] {"StaticMenuBar"};
+            _ThemeButtons = new string[] {ButtonSing, ButtonParty, ButtonOptions, ButtonProfiles, ButtonExit};
         }
 
         public override bool HandleInput(KeyEvent keyEvent)
@@ -120,14 +120,14 @@ namespace Vocaluxe.Screens
 
         public override bool Draw()
         {
-            this.DrawBG();
+            DrawBG();
 
             //if (Snowflakes == null)
             //    Snowflakes = new CParticleEffect(300, new SColorF(1, 1, 1, 1), new SRectF(0, 0, CSettings.iRenderW, 0, 0.5f), "Snowflake", 25, EParticeType.Snow);
 
             //Snowflakes.Update();
             //Snowflakes.Draw();
-            this.DrawFG();
+            DrawFG();
 
             if (CSettings.VersionRevision != ERevision.Release)
             {
diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs
index 35d4ad73..26e71ab3 100644
--- a/Vocaluxe/Screens/CScreenNames.cs
+++ b/Vocaluxe/Screens/CScreenNames.cs
@@ -26,12 +26,13 @@ namespace Vocaluxe.Screens
         private const string StaticWarningMics = "StaticWarningMics";
         private const string TextWarningProfiles = "TextWarningProfiles";
         private const string StaticWarningProfiles = "StaticWarningProfiles";
-        private readonly string[] StaticPlayer = new[] {"StaticPlayer1", "StaticPlayer2", "StaticPlayer3", "StaticPlayer4", "StaticPlayer5", "StaticPlayer6"};
-        private readonly string[] StaticPlayerAvatar = new[]
+        private readonly string[] StaticPlayer = new string[] {"StaticPlayer1", "StaticPlayer2", "StaticPlayer3", "StaticPlayer4", "StaticPlayer5", "StaticPlayer6"};
+        private readonly string[] StaticPlayerAvatar = new string[]
             {"StaticPlayerAvatar1", "StaticPlayerAvatar2", "StaticPlayerAvatar3", "StaticPlayerAvatar4", "StaticPlayerAvatar5", "StaticPlayerAvatar6"};
-        private readonly string[] TextPlayer = new[] {"TextPlayer1", "TextPlayer2", "TextPlayer3", "TextPlayer4", "TextPlayer5", "TextPlayer6"};
-        private readonly string[] EqualizerPlayer = new[] {"EqualizerPlayer1", "EqualizerPlayer2", "EqualizerPlayer3", "EqualizerPlayer4", "EqualizerPlayer5", "EqualizerPlayer6"};
-        private readonly string[] SelectSlideDuetPlayer = new[]
+        private readonly string[] TextPlayer = new string[] {"TextPlayer1", "TextPlayer2", "TextPlayer3", "TextPlayer4", "TextPlayer5", "TextPlayer6"};
+        private readonly string[] EqualizerPlayer = new string[]
+            {"EqualizerPlayer1", "EqualizerPlayer2", "EqualizerPlayer3", "EqualizerPlayer4", "EqualizerPlayer5", "EqualizerPlayer6"};
+        private readonly string[] SelectSlideDuetPlayer = new string[]
             {"SelectSlideDuetPlayer1", "SelectSlideDuetPlayer2", "SelectSlideDuetPlayer3", "SelectSlideDuetPlayer4", "SelectSlideDuetPlayer5", "SelectSlideDuetPlayer6"};
         private readonly STexture[] OriginalPlayerAvatarTextures = new STexture[CSettings.MaxNumPlayer];
 
diff --git a/Vocaluxe/Screens/CScreenOptions.cs b/Vocaluxe/Screens/CScreenOptions.cs
index 68ebd75e..66d08271 100644
--- a/Vocaluxe/Screens/CScreenOptions.cs
+++ b/Vocaluxe/Screens/CScreenOptions.cs
@@ -23,7 +23,7 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonOptionsGame, ButtonOptionsSound, ButtonOptionsRecord, ButtonOptionsVideo, ButtonOptionsLyrics, ButtonOptionsTheme};
+            _ThemeButtons = new string[] {ButtonOptionsGame, ButtonOptionsSound, ButtonOptionsRecord, ButtonOptionsVideo, ButtonOptionsLyrics, ButtonOptionsTheme};
         }
 
         public override bool HandleInput(KeyEvent keyEvent)
diff --git a/Vocaluxe/Screens/CScreenOptionsGame.cs b/Vocaluxe/Screens/CScreenOptionsGame.cs
index fb18cc5a..d8f4a3b4 100644
--- a/Vocaluxe/Screens/CScreenOptionsGame.cs
+++ b/Vocaluxe/Screens/CScreenOptionsGame.cs
@@ -25,8 +25,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonExit};
-            _ThemeSelectSlides = new[] {SelectSlideLanguage, SelectSlideDebugLevel, SelectSlideSongMenu, SelectSlideSongSorting, SelectSlideTabs, SelectSlideTimerMode};
+            _ThemeButtons = new string[] {ButtonExit};
+            _ThemeSelectSlides = new string[] {SelectSlideLanguage, SelectSlideDebugLevel, SelectSlideSongMenu, SelectSlideSongSorting, SelectSlideTabs, SelectSlideTimerMode};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/Vocaluxe/Screens/CScreenOptionsLyrics.cs b/Vocaluxe/Screens/CScreenOptionsLyrics.cs
index 8096ac7f..26f5ac1a 100644
--- a/Vocaluxe/Screens/CScreenOptionsLyrics.cs
+++ b/Vocaluxe/Screens/CScreenOptionsLyrics.cs
@@ -21,8 +21,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonExit};
-            _ThemeSelectSlides = new[] {SelectSlideLyricStyle, SelectSlideLyricsOnTop};
+            _ThemeButtons = new string[] {ButtonExit};
+            _ThemeSelectSlides = new string[] {SelectSlideLyricStyle, SelectSlideLyricsOnTop};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/Vocaluxe/Screens/CScreenOptionsRecord.cs b/Vocaluxe/Screens/CScreenOptionsRecord.cs
index 84678966..a34c7bd2 100644
--- a/Vocaluxe/Screens/CScreenOptionsRecord.cs
+++ b/Vocaluxe/Screens/CScreenOptionsRecord.cs
@@ -41,7 +41,7 @@ namespace Vocaluxe.Screens
         private const string EqualizerChannel1 = "EqualizerChannel1";
         private const string EqualizerChannel2 = "EqualizerChannel2";
 
-        private readonly string[] StaticEnergyChannel = new[] {"StaticEnergyChannel1", "StaticEnergyChannel2"};
+        private readonly string[] StaticEnergyChannel = new string[] {"StaticEnergyChannel1", "StaticEnergyChannel2"};
         private float[] ChannelEnergy;
 
         private SRecordDevice[] _devices;
@@ -61,10 +61,10 @@ namespace Vocaluxe.Screens
             values.AddRange(StaticEnergyChannel);
             _ThemeStatics = values.ToArray();
 
-            _ThemeTexts = new[] {TextWarning, TextDelayChannel1, TextDelayChannel2};
-            _ThemeButtons = new[] {ButtonExit, ButtonDelayTest};
-            _ThemeSelectSlides = new[] {SelectSlideRecordDevices, SelectSlideRecordInputs, SelectSlideRecordChannel1, SelectSlideRecordChannel2, SelectSlideDelay};
-            _ThemeEqualizers = new[] {EqualizerChannel1, EqualizerChannel2};
+            _ThemeTexts = new string[] {TextWarning, TextDelayChannel1, TextDelayChannel2};
+            _ThemeButtons = new string[] {ButtonExit, ButtonDelayTest};
+            _ThemeSelectSlides = new string[] {SelectSlideRecordDevices, SelectSlideRecordInputs, SelectSlideRecordChannel1, SelectSlideRecordChannel2, SelectSlideDelay};
+            _ThemeEqualizers = new string[] {EqualizerChannel1, EqualizerChannel2};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/Vocaluxe/Screens/CScreenOptionsSound.cs b/Vocaluxe/Screens/CScreenOptionsSound.cs
index aa6f1ab0..84b736ab 100644
--- a/Vocaluxe/Screens/CScreenOptionsSound.cs
+++ b/Vocaluxe/Screens/CScreenOptionsSound.cs
@@ -27,8 +27,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonExit};
-            _ThemeSelectSlides = new[]
+            _ThemeButtons = new string[] {ButtonExit};
+            _ThemeSelectSlides = new string[]
                 {SelectSlideBackgroundMusic, SelectSlideBackgroundMusicVolume, SelectSlideBackgroundMusicSource, SelectSlidePreviewMusicVolume, SelectSlideGameMusicVolume};
         }
 
@@ -36,15 +36,15 @@ namespace Vocaluxe.Screens
         {
             base.LoadTheme(XmlPath);
             SelectSlides[SelectSlideBackgroundMusic].SetValues<EOffOn>((int)CConfig.BackgroundMusic);
-            SelectSlides[SelectSlideBackgroundMusicVolume].AddValues(new[]
+            SelectSlides[SelectSlideBackgroundMusicVolume].AddValues(new string[]
                 {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
             SelectSlides[SelectSlideBackgroundMusicVolume].Selection = CConfig.BackgroundMusicVolume / 5;
             SelectSlides[SelectSlideBackgroundMusicSource].SetValues<EBackgroundMusicSource>((int)CConfig.BackgroundMusicSource);
             SelectSlides[SelectSlideBackgroundMusicSource].Selection = (int)CConfig.BackgroundMusicSource;
-            SelectSlides[SelectSlidePreviewMusicVolume].AddValues(new[]
+            SelectSlides[SelectSlidePreviewMusicVolume].AddValues(new string[]
                 {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
             SelectSlides[SelectSlidePreviewMusicVolume].Selection = CConfig.PreviewMusicVolume / 5;
-            SelectSlides[SelectSlideGameMusicVolume].AddValues(new[]
+            SelectSlides[SelectSlideGameMusicVolume].AddValues(new string[]
                 {"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
             SelectSlides[SelectSlideGameMusicVolume].Selection = CConfig.GameMusicVolume / 5;
         }
diff --git a/Vocaluxe/Screens/CScreenOptionsTheme.cs b/Vocaluxe/Screens/CScreenOptionsTheme.cs
index 2a98ecd6..54592b5d 100644
--- a/Vocaluxe/Screens/CScreenOptionsTheme.cs
+++ b/Vocaluxe/Screens/CScreenOptionsTheme.cs
@@ -34,8 +34,8 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonExit};
-            _ThemeSelectSlides = new[]
+            _ThemeButtons = new string[] {ButtonExit};
+            _ThemeSelectSlides = new string[]
                 {
                     SelectSlideTheme,
                     SelectSlideSkin,
diff --git a/Vocaluxe/Screens/CScreenOptionsVideo.cs b/Vocaluxe/Screens/CScreenOptionsVideo.cs
index 9a4f12c7..c37ea343 100644
--- a/Vocaluxe/Screens/CScreenOptionsVideo.cs
+++ b/Vocaluxe/Screens/CScreenOptionsVideo.cs
@@ -34,9 +34,9 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeStatics = new[] {StaticWebcamOutput};
-            _ThemeButtons = new[] {ButtonExit};
-            _ThemeSelectSlides = new[]
+            _ThemeStatics = new string[] {StaticWebcamOutput};
+            _ThemeButtons = new string[] {ButtonExit};
+            _ThemeSelectSlides = new string[]
                 {
                     SelectSlideVideoBackgrounds, SelectSlideVideoPreview, SelectSlideVideosInSongs, SelectSlideVideosToBackground, SelectSlideWebcamDevices,
                     SelectSlideWebcamCapabilities
diff --git a/Vocaluxe/Screens/CScreenParty.cs b/Vocaluxe/Screens/CScreenParty.cs
index 1d8beb92..8610b257 100644
--- a/Vocaluxe/Screens/CScreenParty.cs
+++ b/Vocaluxe/Screens/CScreenParty.cs
@@ -30,9 +30,9 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeTexts = new[] {TextDescription, TextTargetAudience, TextNumTeams, TextNumPlayers, TextAuthor, TextVersion, TextError};
-            _ThemeButtons = new[] {ButtonStart, ButtonExit};
-            _ThemeSelectSlides = new[] {SelectSlideModes};
+            _ThemeTexts = new string[] {TextDescription, TextTargetAudience, TextNumTeams, TextNumPlayers, TextAuthor, TextVersion, TextError};
+            _ThemeButtons = new string[] {ButtonStart, ButtonExit};
+            _ThemeSelectSlides = new string[] {SelectSlideModes};
         }
 
         public override bool HandleInput(KeyEvent keyEvent)
diff --git a/Vocaluxe/Screens/CScreenProfiles.cs b/Vocaluxe/Screens/CScreenProfiles.cs
index 99569293..c8f840d3 100644
--- a/Vocaluxe/Screens/CScreenProfiles.cs
+++ b/Vocaluxe/Screens/CScreenProfiles.cs
@@ -48,9 +48,10 @@ namespace Vocaluxe.Screens
         {
             base.Init();
 
-            _ThemeButtons = new[] {ButtonPlayerName, ButtonExit, ButtonSave, ButtonNew, ButtonDelete, ButtonWebcam, ButtonSaveSnapshot, ButtonDiscardSnapshot, ButtonTakeSnapshot};
-            _ThemeSelectSlides = new[] {SelectSlideProfiles, SelectSlideDifficulty, SelectSlideAvatars, SelectSlideGuestProfile, SelectSlideActive};
-            _ThemeStatics = new[] {StaticAvatar};
+            _ThemeButtons = new string[]
+                {ButtonPlayerName, ButtonExit, ButtonSave, ButtonNew, ButtonDelete, ButtonWebcam, ButtonSaveSnapshot, ButtonDiscardSnapshot, ButtonTakeSnapshot};
+            _ThemeSelectSlides = new string[] {SelectSlideProfiles, SelectSlideDifficulty, SelectSlideAvatars, SelectSlideGuestProfile, SelectSlideActive};
+            _ThemeStatics = new string[] {StaticAvatar};
 
             _EditMode = EEditMode.None;
         }
diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs
index 117c09c3..f5a86341 100644
--- a/Vocaluxe/Screens/CScreenScore.cs
+++ b/Vocaluxe/Screens/CScreenScore.cs
@@ -51,7 +51,7 @@ namespace Vocaluxe.Screens
 
             _ThemeStatics = statics.ToArray();
 
-            _ThemeScreenSettings = new[] {ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty, ScreenSettingAnimationDirection};
+            _ThemeScreenSettings = new string[] {ScreenSettingShortScore, ScreenSettingShortRating, ScreenSettingShortDifficulty, ScreenSettingAnimationDirection};
 
             StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer];
         }
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index e7ee2ed0..99f19377 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -131,8 +131,8 @@ namespace Vocaluxe.Screens
             buttons.Add(ButtonSkip);
             _ThemeButtons = buttons.ToArray();
 
-            _ThemeLyrics = new[] {LyricMain, LyricSub, LyricMainDuet, LyricSubDuet, LyricMainTop, LyricSubTop};
-            _ThemeSingNotes = new[] {SingBars};
+            _ThemeLyrics = new string[] {LyricMain, LyricSub, LyricMainDuet, LyricSubDuet, LyricMainTop, LyricSubTop};
+            _ThemeSingNotes = new string[] {SingBars};
 
             _TimeRects = new List<TimeRect>();
             _TimerSongText = new Stopwatch();
@@ -465,7 +465,7 @@ namespace Vocaluxe.Screens
                 }
             }
 
-            this.DrawBG();
+            DrawBG();
 
             foreach (CStatic stat in Statics)
                 stat.Draw();
@@ -652,7 +652,6 @@ namespace Vocaluxe.Screens
                     NoteLines[3] = SingNotes[SingBars].AddPlayer(new SRectF(640f, 350f, 590f, 200f, -0.5f), CTheme.ThemeColors.Player[3]);
                     break;
             */
-
             _TimerSongText.Stop();
             _TimerSongText.Reset();
             _TimerDuetText1.Stop();
@@ -909,14 +908,14 @@ namespace Vocaluxe.Screens
                     {
                         Texts[TextScores[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer;
                         Texts[TextNames[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer)
-                                                                       &&
-                                                                       (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
-                                                                        CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME);
+                                                                      &&
+                                                                      (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
+                                                                       CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME);
                         Statics[StaticScores[player, numplayer]].Visible = numplayer + 1 == CGame.NumPlayer;
                         Statics[StaticAvatars[player, numplayer]].Visible = (numplayer + 1 == CGame.NumPlayer)
-                                                                             &&
-                                                                             (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
-                                                                              CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR);
+                                                                            &&
+                                                                            (CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
+                                                                             CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR);
                     }
                 }
             }
diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 50b2cc38..184f6f42 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -109,12 +109,12 @@ namespace Vocaluxe.Screens
             tlist.Add(TextSearchBar);
             tlist.Add(TextOptionsTitle);
 
-            _ThemeStatics = new[] {StaticSearchBar, StaticOptionsBG};
+            _ThemeStatics = new string[] {StaticSearchBar, StaticOptionsBG};
             _ThemeTexts = tlist.ToArray();
             _ThemeButtons = blist.ToArray();
-            _ThemeSelectSlides = new[] {SelectSlideOptionsMode, SelectSlideOptionsPlaylistAdd, SelectSlideOptionsPlaylistOpen, SelectSlideOptionsNumMedleySongs};
-            _ThemeSongMenus = new[] {SongMenu};
-            _ThemePlaylists = new[] {Playlist};
+            _ThemeSelectSlides = new string[] {SelectSlideOptionsMode, SelectSlideOptionsPlaylistAdd, SelectSlideOptionsPlaylistOpen, SelectSlideOptionsNumMedleySongs};
+            _ThemeSongMenus = new string[] {SongMenu};
+            _ThemePlaylists = new string[] {Playlist};
         }
 
         public override void LoadTheme(string XmlPath)
diff --git a/VocaluxeLib/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
index b9482346..93745af2 100644
--- a/VocaluxeLib/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -808,7 +808,7 @@ namespace VocaluxeLib.Menu
 
         public object Clone()
         {
-            return this.MemberwiseClone();
+            return MemberwiseClone();
         }
 
         #region ThemeEdit
diff --git a/VocaluxeLib/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs
index 7ffb8a5e..8dabe808 100644
--- a/VocaluxeLib/Menu/SongMenu/CSong.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSong.cs
@@ -1035,7 +1035,7 @@ namespace VocaluxeLib.Menu.SongMenu
 
         public object Clone()
         {
-            return this.MemberwiseClone();
+            return MemberwiseClone();
         }
     }
 }
\ No newline at end of file