Changed namespace of VocaluxeLib

.gitignore

@@ -34,3 +34,4 @@ Output/Songs
 *.codeanalysis*
 *.nativecodeanalysis*
 *.lastcodeanalysissucceeded
+/PartyModes/*/*/*.dll

PartyModes/Excludes.txt

@@ -0,0 +1 @@
+GlobalSuppressions.cs

PartyModes/PartyModeChallenge/ChallengeRounds.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Vocaluxe.PartyModes.Challenge
+namespace VocaluxeLib.PartyModes.Challenge
 {
     public class ChallengeRounds
     {

PartyModes/PartyModeChallenge/PartyModeChallenge.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
-namespace Vocaluxe.PartyModes.Challenge
+namespace VocaluxeLib.PartyModes.Challenge
 {
     #region Communication
     #region ToScreen

PartyModes/PartyModeChallenge/PartyModeChallenge.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{5A4053F1-5AD5-441F-B254-D97A088127B6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Vocaluxe.PartyModes.Challenge</RootNamespace>
+    <RootNamespace>VocaluxeLib.PartyModes.Challenge</RootNamespace>
-    <AssemblyName>PartyModeChallenge</AssemblyName>
+    <AssemblyName>Challenge</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -42,7 +42,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -53,7 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -65,7 +65,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -75,7 +75,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -87,7 +87,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -97,7 +97,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\Challenge\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -108,22 +108,12 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ChallengeRounds.cs">
+    <Compile Include="ChallengeRounds.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeChallenge.cs">
+    <Compile Include="PartyModeChallenge.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Compile Include="PartyScreenChallengeConfig.cs" />
-    </Compile>
+    <Compile Include="PartyScreenChallengeMain.cs" />
-    <Compile Include="PartyScreenChallengeConfig.cs">
+    <Compile Include="PartyScreenChallengeNames.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenChallengeMain.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenChallengeNames.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -139,7 +129,13 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\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.
   <Target Name="BeforeBuild">

PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.Challenge
+namespace VocaluxeLib.PartyModes.Challenge
 {
     public class PartyScreenChallengeConfig : CMenuParty
     {

PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.Challenge
+namespace VocaluxeLib.PartyModes.Challenge
 {
     struct TableRow
     {

PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.Challenge
+namespace VocaluxeLib.PartyModes.Challenge
 {
     public class PartyScreenChallengeNames : CMenuParty
     {

PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Vocaluxe.PartyModes.ChallengeMedley
+namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
     public class ChallengeRounds
     {

PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
-namespace Vocaluxe.PartyModes.ChallengeMedley
+namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
     #region Communication
     #region ToScreen

PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593678}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Vocaluxe.PartyModes.ChallengeMedley</RootNamespace>
+    <RootNamespace>VocaluxeLib.PartyModes.ChallengeMedley</RootNamespace>
-    <AssemblyName>PartyModeChallengeMedley</AssemblyName>
+    <AssemblyName>ChallengeMedley</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -42,7 +42,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -53,7 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -65,7 +65,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -75,7 +75,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -87,7 +87,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -97,7 +97,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\ChallengeMedley\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -108,22 +108,12 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ChallengeRounds.cs">
+    <Compile Include="ChallengeRounds.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeChallengeMedley.cs">
+    <Compile Include="PartyModeChallengeMedley.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Compile Include="PartyScreenChallengeMedleyConfig.cs" />
-    </Compile>
+    <Compile Include="PartyScreenChallengeMedleyMain.cs" />
-    <Compile Include="PartyScreenChallengeMedleyConfig.cs">
+    <Compile Include="PartyScreenChallengeMedleyNames.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenChallengeMedleyMain.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenChallengeMedleyNames.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -139,7 +129,13 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\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.
   <Target Name="BeforeBuild">

PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.ChallengeMedley
+namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
     public class PartyScreenChallengeMedleyConfig : CMenuParty
     {

PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.ChallengeMedley
+namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
     struct TableRow
     {

PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.ChallengeMedley
+namespace VocaluxeLib.PartyModes.ChallengeMedley
 {
     public class PartyScreenChallengeMedleyNames : CMenuParty
     {

PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
-namespace Vocaluxe.PartyModes.TicTacToe
+namespace VocaluxeLib.PartyModes.TicTacToe
 {
     public enum ESongSource
     {

PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593679}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Vocaluxe.PartyModes.TicTacToe</RootNamespace>
+    <RootNamespace>VocaluxeLib.PartyModes.TicTacToe</RootNamespace>
-    <AssemblyName>PartyModeTicTacToe</AssemblyName>
+    <AssemblyName>TicTacToe</AssemblyName>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -30,7 +30,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -42,7 +42,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -53,7 +53,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -65,7 +65,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -75,7 +75,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -87,7 +87,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -97,7 +97,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\PartyModes\TicTacToe\Code</OutputPath>
+    <OutputPath>bin</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -109,18 +109,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeTicTacToe.cs">
+    <Compile Include="PartyModeTicTacToe.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Compile Include="PartyScreenTicTacToeConfig.cs" />
-    </Compile>
+    <Compile Include="PartyScreenTicTacToeMain.cs" />
-    <Compile Include="PartyScreenTicTacToeConfig.cs">
+    <Compile Include="PartyScreenTicTacToeNames.cs" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenTicTacToeMain.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
-    <Compile Include="PartyScreenTicTacToeNames.cs">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -136,7 +128,13 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy $(ProjectDir)*.cs $(SolutionDir)Output\PartyModes\$(TargetName)\Code\ /EXCLUDE:$(ProjectDir)..\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.
   <Target Name="BeforeBuild">

PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.TicTacToe
+namespace VocaluxeLib.PartyModes.TicTacToe
 {
     public class PartyScreenTicTacToeConfig : CMenuParty
     {

PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
+using VocaluxeLib.Menu.SongMenu;
 
-namespace Vocaluxe.PartyModes.TicTacToe
+namespace VocaluxeLib.PartyModes.TicTacToe
 {
     public class Field
     {
@@ -480,7 +481,7 @@ namespace Vocaluxe.PartyModes.TicTacToe
                 SingerTeam2 = GameData.PlayerTeam2[0];
                 GameData.PlayerTeam2.RemoveAt(0);
             }
-            Menu.SongMenu.CSong Song = CBase.Songs.GetSongByID(SongID);
+            CSong Song = CBase.Songs.GetSongByID(SongID);
 
             CBase.BackgroundMusic.SetStatus(true);
 
@@ -520,7 +521,7 @@ namespace Vocaluxe.PartyModes.TicTacToe
         private void FieldSelectedAgain()
         {
             int SongID = Fields[SelectedField].Content.SongID;
-            Menu.SongMenu.CSong Song = CBase.Songs.GetSongByID(SongID);
+            CSong Song = CBase.Songs.GetSongByID(SongID);
             CBase.BackgroundMusic.SetStatus(true);
 
             PreviewStream = CBase.Sound.Load(Song.GetMP3(), false);

PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
-namespace Vocaluxe.PartyModes.TicTacToe
+namespace VocaluxeLib.PartyModes.TicTacToe
 {
     public class PartyScreenTicTacToeNames : CMenuParty
     {

Vocaluxe/Base/CBackgroundMusic.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CConfig.cs

@@ -9,7 +9,7 @@ using System.Xml;
 
 using Vocaluxe.Lib.Sound;
 using Vocaluxe.Lib.Webcam;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CCover.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Xml;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CDataBase.cs

@@ -16,8 +16,8 @@ using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
 using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
 #endif
 using Community.CsharpSqlite;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CDraw.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 
 using Vocaluxe.Lib.Draw;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CFont.cs

@@ -6,8 +6,7 @@ using System.Drawing.Text;
 using System.IO;
 using System.Windows.Forms;
 using System.Xml;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {  

Vocaluxe/Base/CGame.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 
 using Vocaluxe.GameModes;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SingNotes;
+using VocaluxeLib.Menu.SingNotes;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CGraphics.cs

@@ -3,10 +3,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
-
-using Vocaluxe.Menu;
-using Vocaluxe.PartyModes;
 using Vocaluxe.Screens;
+using VocaluxeLib.Menu;
+using VocaluxeLib.PartyModes;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CInput.cs

@@ -1,7 +1,7 @@
 
 using Vocaluxe.Lib.Input;
 using Vocaluxe.Lib.Input.WiiMote;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CLanguage.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CMain.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CParty.cs

@@ -3,9 +3,8 @@ using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.PartyModes;
-using Vocaluxe.PartyModes;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CPlaylists.cs

@@ -4,8 +4,8 @@ using System.IO;
 using System.Text;
 
 using Vocaluxe.Lib.Playlist;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CProfiles.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {    

Vocaluxe/Base/CSettings.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongCategorizer.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongFilter.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongSorter.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongs.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-
+using VocaluxeLib.Menu;
-
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSound.cs

@@ -3,7 +3,7 @@ using System.Diagnostics;
 using System.IO;
 
 using Vocaluxe.Lib.Sound;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CTheme.cs

@@ -4,8 +4,7 @@ using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CUtility.cs

@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows.Forms;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CVideo.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using Vocaluxe.Lib.Video;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CWebcam.cs

@@ -1,8 +1,7 @@
 using System.Drawing;
 
 using Vocaluxe.Lib.Webcam;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Base
 {

Vocaluxe/GameModes/CGameMode.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.GameModes
 {

Vocaluxe/GameModes/IGameMode.cs

@@ -1,6 +1,5 @@
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.GameModes
 {

Vocaluxe/Lib/Draw/CDirect3D.cs

@@ -9,8 +9,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Lib.Draw
 {

Vocaluxe/Lib/Draw/CDrawWinForm.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Draw
 {

Vocaluxe/Lib/Draw/COpenGL.cs

@@ -9,7 +9,7 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Draw
 {

Vocaluxe/Lib/Draw/IDraw.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Lib.Draw
 {

Vocaluxe/Lib/Input/IInput.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Lib.Input
 {

Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Input.WiiMote
 {

Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Threading;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Input.WiiMote
 {

Vocaluxe/Lib/Playlist/CPlaylistFile.cs

@@ -4,8 +4,8 @@ using System.IO;
 using System.Xml;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Lib.Playlist
 {

Vocaluxe/Lib/Video/CVideoDecoder.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs

@@ -7,7 +7,7 @@ using System.Threading;
 
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Acinerella;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs

@@ -1,7 +1,7 @@
 using System;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Gstreamer;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/IVideoDecoder.cs

@@ -1,6 +1,5 @@
 using System;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Webcam/CAForgeNet.cs

@@ -5,7 +5,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Webcam
 {

Vocaluxe/Lib/Webcam/IWebcam.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Drawing;
-
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu;
 
 namespace Vocaluxe.Lib.Webcam
 {

Vocaluxe/Screens/CPopupScreenPlayerControl.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CPopupScreenVolumeControl.cs

@@ -1,6 +1,6 @@
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenCredits.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 enum EDirection
 {

Vocaluxe/Screens/CScreenHighscore.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenLoad.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenMain.cs

@@ -1,8 +1,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenNames.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptions.cs

@@ -1,8 +1,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsGame.cs

@@ -1,8 +1,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsLyrics.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsRecord.cs

@@ -4,8 +4,7 @@ using System.Windows.Forms;
 
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Sound;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsSound.cs

@@ -1,8 +1,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsTheme.cs

@@ -2,8 +2,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenOptionsVideo.cs

@@ -2,8 +2,7 @@
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Webcam;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenParty.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenProfiles.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenScore.cs

@@ -4,9 +4,8 @@ using System.Diagnostics;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenSing.cs

@@ -6,9 +6,9 @@ using System.IO;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SingNotes;
+using VocaluxeLib.Menu.SingNotes;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenSong.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
-using Vocaluxe.Menu.SongMenu;
+using VocaluxeLib.Menu.SongMenu;
-using Vocaluxe.PartyModes;
+using VocaluxeLib.PartyModes;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenTest.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Windows.Forms;
 
 using Vocaluxe.Base;
-using Vocaluxe.Menu;
+using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens
 {

VocaluxeLib/Menu/CBackground.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public enum EBackgroundTypes
     {

VocaluxeLib/Menu/CBasic.cs

@@ -1,5 +1,5 @@
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public static class CBase
     {

VocaluxeLib/Menu/CButton.cs

@@ -1,8 +1,7 @@
 using System;
-using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeButton
     {

VocaluxeLib/Menu/CEqualizer.cs

@@ -1,8 +1,7 @@
 using System;
-using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     enum EEqualizerStyle
     {

VocaluxeLib/Menu/CHelper.cs

@@ -5,7 +5,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public static class CHelper
     {

VocaluxeLib/Menu/CInteraction.cs

@@ -1,5 +1,5 @@
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public enum EType
     {

VocaluxeLib/Menu/CLyric.cs

@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Xml;
+using VocaluxeLib.Menu.SingNotes;
 
-using Vocaluxe.Menu.SingNotes;
+namespace VocaluxeLib.Menu
-
-namespace Vocaluxe.Menu
 {
     struct SNote
     {

VocaluxeLib/Menu/CMenu.cs

@@ -5,11 +5,10 @@ using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
+using VocaluxeLib.Menu.SingNotes;
+using VocaluxeLib.Menu.SongMenu;
 
-using Vocaluxe.Menu.SingNotes;
+namespace VocaluxeLib.Menu
-using Vocaluxe.Menu.SongMenu;
-
-namespace Vocaluxe.Menu
 {
     struct ZSort
     {

VocaluxeLib/Menu/CMenuParty.cs

@@ -1,8 +1,7 @@
 using System;
+using VocaluxeLib.PartyModes;
 
-using Vocaluxe.PartyModes;
+namespace VocaluxeLib.Menu
-
-namespace Vocaluxe.Menu
 {
     public abstract class CMenuParty : CMenu
     {

VocaluxeLib/Menu/CNameSelection.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeNameSelection
     {

VocaluxeLib/Menu/CObjectInteractions.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-
+namespace VocaluxeLib.Menu
-namespace Vocaluxe.Menu
 {
     class CObjectInteractions
     {

VocaluxeLib/Menu/COrderedDictionaryLite.cs

@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public class COrderedDictionaryLite<T> : IEnumerable<T>
     {

VocaluxeLib/Menu/CParticle.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeParticleEffect
     {

VocaluxeLib/Menu/CPlaylist.cs

@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Xml;
+using VocaluxeLib.Menu.SongMenu;
 
-using Vocaluxe.Menu.SongMenu;
+namespace VocaluxeLib.Menu
-
-namespace Vocaluxe.Menu
 {
     public enum EEditMode
     {

VocaluxeLib/Menu/CScreenSetting.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     enum ESettingType
     {

VocaluxeLib/Menu/CSelectSlide.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeSelectSlide
     {

VocaluxeLib/Menu/CStatic.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeStatic
     {

VocaluxeLib/Menu/CText.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     struct SThemeText
     {

VocaluxeLib/Menu/CXMLReader.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.XPath;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     public class CXMLReader
     {

VocaluxeLib/Menu/IMenu.cs

@@ -2,12 +2,11 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+using VocaluxeLib.Menu.SingNotes;
+using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.PartyModes;
 
-using Vocaluxe.Menu.SingNotes;
+namespace VocaluxeLib.Menu
-using Vocaluxe.Menu.SongMenu;
-using Vocaluxe.PartyModes;
-
-namespace Vocaluxe.Menu
 {
     public interface IMenu
     {

VocaluxeLib/Menu/IMenuElement.cs

@@ -1,6 +1,6 @@
 using System.Xml;
 
-namespace Vocaluxe.Menu
+namespace VocaluxeLib.Menu
 {
     interface IMenuElement
     {