diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 8772a966..9df8a799 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -208,9 +208,6 @@
     <Compile Include="Lib\Input\WiiMote\CWiiMote.cs" />
     <Compile Include="Lib\Input\WiiMote\WiiMoteLib.cs" />
     <Compile Include="Lib\Playlist\CPlaylistFile.cs" />
-    <Compile Include="Menu\CParticle.cs" />
-    <Compile Include="Menu\SingNotes\CNotes.cs" />
-    <Compile Include="Menu\SongMenu\CSong.cs" />
     <Compile Include="Lib\Sound\CDirectSoundRecord.cs" />
     <Compile Include="Lib\Sound\COpenALPlay.cs" />
     <Compile Include="Lib\Sound\COpenALRecord.cs" />
@@ -228,35 +225,7 @@
     <Compile Include="Lib\Video\IVideoDecoder.cs" />
     <Compile Include="Lib\Webcam\CAForgeNet.cs" />
     <Compile Include="Lib\Webcam\IWebcam.cs" />
-    <Compile Include="Menu\CBackground.cs" />
-    <Compile Include="Menu\CButton.cs" />
-    <Compile Include="Menu\CEqualizer.cs" />
     <Compile Include="Base\CGraphics.cs" />
-    <Compile Include="Menu\CHelper.cs" />
-    <Compile Include="Menu\CNameSelection.cs" />
-    <Compile Include="Menu\CLyric.cs" />
-    <Compile Include="Menu\CMenu.cs" />
-    <Compile Include="Menu\CInteraction.cs" />
-    <Compile Include="Menu\CObjectInteractions.cs" />
-    <Compile Include="Menu\CPlaylist.cs" />
-    <Compile Include="Menu\CSelectSlide.cs" />
-    <Compile Include="Menu\CStatic.cs" />
-    <Compile Include="Menu\CText.cs" />
-    <Compile Include="Menu\IMenu.cs" />
-    <Compile Include="Menu\IMenuElement.cs" />
-    <Compile Include="Menu\SingNotes\CSingNotes.cs" />
-    <Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
-    <Compile Include="Menu\SingNotes\ISingNotes.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenu.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuBook.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuDreidel.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuFramework.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuList.cs" />
-    <Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
-    <Compile Include="Menu\SongMenu\ISongMenu.cs" />
-    <Compile Include="PartyModes\CPartyMode.cs" />
-    <Compile Include="PartyModes\CPartyModeNone.cs" />
-    <Compile Include="PartyModes\IPartyMode.cs" />
     <Compile Include="Program.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -280,8 +249,6 @@
     <Compile Include="Screens\CScreenOptionsVideo.cs" />
     <Compile Include="Screens\CScreenOptionsRecord.cs" />
     <Compile Include="Screens\CScreenOptionsTheme.cs" />
-    <Compile Include="PartyModes\CScreenPartyDummy.cs" />
-    <Compile Include="Menu\CMenuParty.cs" />
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
@@ -310,7 +277,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\VocaluxeLib\VocaluxeLib.csproj">
+      <Project>{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}</Project>
+      <Name>VocaluxeLib</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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/Vocaluxe/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs
similarity index 100%
rename from Vocaluxe/Menu/CBackground.cs
rename to VocaluxeLib/Menu/CBackground.cs
diff --git a/Vocaluxe/Menu/CButton.cs b/VocaluxeLib/Menu/CButton.cs
similarity index 99%
rename from Vocaluxe/Menu/CButton.cs
rename to VocaluxeLib/Menu/CButton.cs
index 92f2edb1..a991e2cf 100644
--- a/Vocaluxe/Menu/CButton.cs
+++ b/VocaluxeLib/Menu/CButton.cs
@@ -18,7 +18,7 @@ namespace Vocaluxe.Menu
         public string STextureName;
     }
 
-    class CButton : IMenuElement
+    public class CButton : IMenuElement
     {
         private Basic _Base;
         private SThemeButton _Theme;
diff --git a/Vocaluxe/Menu/CEqualizer.cs b/VocaluxeLib/Menu/CEqualizer.cs
similarity index 99%
rename from Vocaluxe/Menu/CEqualizer.cs
rename to VocaluxeLib/Menu/CEqualizer.cs
index 92dbd700..6614d8fd 100644
--- a/Vocaluxe/Menu/CEqualizer.cs
+++ b/VocaluxeLib/Menu/CEqualizer.cs
@@ -26,7 +26,7 @@ namespace Vocaluxe.Menu
         public EOffOn DrawNegative;
     }
 
-    class CEqualizer : IMenuElement
+    public class CEqualizer : IMenuElement
     {
         private Basic _Base;
         private SThemeEqualizer _Theme;
diff --git a/Vocaluxe/Menu/CHelper.cs b/VocaluxeLib/Menu/CHelper.cs
similarity index 99%
rename from Vocaluxe/Menu/CHelper.cs
rename to VocaluxeLib/Menu/CHelper.cs
index f051e87e..fd9ac254 100644
--- a/Vocaluxe/Menu/CHelper.cs
+++ b/VocaluxeLib/Menu/CHelper.cs
@@ -9,7 +9,7 @@ using System.Xml.XPath;
 
 namespace Vocaluxe.Menu
 {
-    class CHelper
+    public class CHelper
     {
         /// <summary>
         /// Concat strings into one string with ", " as separator.
diff --git a/Vocaluxe/Menu/CInteraction.cs b/VocaluxeLib/Menu/CInteraction.cs
similarity index 100%
rename from Vocaluxe/Menu/CInteraction.cs
rename to VocaluxeLib/Menu/CInteraction.cs
diff --git a/Vocaluxe/Menu/CLyric.cs b/VocaluxeLib/Menu/CLyric.cs
similarity index 99%
rename from Vocaluxe/Menu/CLyric.cs
rename to VocaluxeLib/Menu/CLyric.cs
index 736ceb1d..ef91efa7 100644
--- a/Vocaluxe/Menu/CLyric.cs
+++ b/VocaluxeLib/Menu/CLyric.cs
@@ -26,7 +26,7 @@ namespace Vocaluxe.Menu
         public string SColorName;
     }
 
-    class CLyric : IMenuElement
+    public class CLyric : IMenuElement
     {
         private Basic _Base;
         private SThemeLyrics _Theme;
diff --git a/Vocaluxe/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs
similarity index 99%
rename from Vocaluxe/Menu/CMenu.cs
rename to VocaluxeLib/Menu/CMenu.cs
index 9528e0f0..1bf5b0eb 100644
--- a/Vocaluxe/Menu/CMenu.cs
+++ b/VocaluxeLib/Menu/CMenu.cs
@@ -20,7 +20,7 @@ namespace Vocaluxe.Menu
         public float z;
     }
 
-    abstract class CMenu : IMenu
+    public abstract class CMenu : IMenu
     {        
         private List<CInteraction> _Interactions;
         private int _Selection = 0;
diff --git a/Vocaluxe/Menu/CMenuParty.cs b/VocaluxeLib/Menu/CMenuParty.cs
similarity index 100%
rename from Vocaluxe/Menu/CMenuParty.cs
rename to VocaluxeLib/Menu/CMenuParty.cs
diff --git a/Vocaluxe/Menu/CNameSelection.cs b/VocaluxeLib/Menu/CNameSelection.cs
similarity index 99%
rename from Vocaluxe/Menu/CNameSelection.cs
rename to VocaluxeLib/Menu/CNameSelection.cs
index e0d27ff7..18eea9da 100644
--- a/Vocaluxe/Menu/CNameSelection.cs
+++ b/VocaluxeLib/Menu/CNameSelection.cs
@@ -22,7 +22,7 @@ namespace Vocaluxe.Menu
         public string NameColorName;
     }
 
-    class CNameSelection : IMenuElement
+    public class CNameSelection : IMenuElement
     {
         class CTile
         {
diff --git a/Vocaluxe/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs
similarity index 100%
rename from Vocaluxe/Menu/CObjectInteractions.cs
rename to VocaluxeLib/Menu/CObjectInteractions.cs
diff --git a/Vocaluxe/Menu/CParticle.cs b/VocaluxeLib/Menu/CParticle.cs
similarity index 99%
rename from Vocaluxe/Menu/CParticle.cs
rename to VocaluxeLib/Menu/CParticle.cs
index 1c63ae4f..67535c2e 100644
--- a/Vocaluxe/Menu/CParticle.cs
+++ b/VocaluxeLib/Menu/CParticle.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace Vocaluxe.Menu
 {
-    enum EParticeType
+    public enum EParticeType
     {
         Twinkle,
         Star,
@@ -286,7 +286,7 @@ namespace Vocaluxe.Menu
         }
     }
 
-    class CParticleEffect
+    public class CParticleEffect
     {
         private Basic _Base;
         private List<CParticle> _Stars;
diff --git a/Vocaluxe/Menu/CPlaylist.cs b/VocaluxeLib/Menu/CPlaylist.cs
similarity index 99%
rename from Vocaluxe/Menu/CPlaylist.cs
rename to VocaluxeLib/Menu/CPlaylist.cs
index 68cefb82..a6f79c14 100644
--- a/Vocaluxe/Menu/CPlaylist.cs
+++ b/VocaluxeLib/Menu/CPlaylist.cs
@@ -10,7 +10,7 @@ using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Menu
 {
-    enum EEditMode
+    public enum EEditMode
     {
         None,
         PlaylistName,
@@ -67,7 +67,7 @@ namespace Vocaluxe.Menu
         public CSelectSlide SelectSlideGameMode;
     }
 
-    class CPlaylist : IMenuElement
+    public class CPlaylist : IMenuElement
     {
         class PlaylistElementContent
         {
diff --git a/Vocaluxe/Menu/CSelectSlide.cs b/VocaluxeLib/Menu/CSelectSlide.cs
similarity index 99%
rename from Vocaluxe/Menu/CSelectSlide.cs
rename to VocaluxeLib/Menu/CSelectSlide.cs
index cc7fc151..04a1356a 100644
--- a/Vocaluxe/Menu/CSelectSlide.cs
+++ b/VocaluxeLib/Menu/CSelectSlide.cs
@@ -35,7 +35,7 @@ namespace Vocaluxe.Menu
         public EStyle TextStyle;
     }
 
-    class CSelectSlide : IMenuElement, ICloneable
+    public class CSelectSlide : IMenuElement, ICloneable
     {
         private Basic _Base;
         private SThemeSelectSlide _Theme;
diff --git a/Vocaluxe/Menu/CStatic.cs b/VocaluxeLib/Menu/CStatic.cs
similarity index 99%
rename from Vocaluxe/Menu/CStatic.cs
rename to VocaluxeLib/Menu/CStatic.cs
index 9fca430e..c91f3200 100644
--- a/Vocaluxe/Menu/CStatic.cs
+++ b/VocaluxeLib/Menu/CStatic.cs
@@ -14,7 +14,7 @@ namespace Vocaluxe.Menu
         public string ColorName;
     }
 
-    class CStatic : IMenuElement
+    public class CStatic : IMenuElement
     {
         private Basic _Base;
 
diff --git a/Vocaluxe/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs
similarity index 100%
rename from Vocaluxe/Menu/CText.cs
rename to VocaluxeLib/Menu/CText.cs
diff --git a/Vocaluxe/Menu/IMenu.cs b/VocaluxeLib/Menu/IMenu.cs
similarity index 99%
rename from Vocaluxe/Menu/IMenu.cs
rename to VocaluxeLib/Menu/IMenu.cs
index 38cc5db8..3110ce41 100644
--- a/Vocaluxe/Menu/IMenu.cs
+++ b/VocaluxeLib/Menu/IMenu.cs
@@ -9,7 +9,7 @@ using Vocaluxe.Menu.SongMenu;
 
 namespace Vocaluxe.Menu
 {
-    interface IMenu
+    public interface IMenu
     {
         void Initialize(Basic Base);
 
diff --git a/Vocaluxe/Menu/IMenuElement.cs b/VocaluxeLib/Menu/IMenuElement.cs
similarity index 100%
rename from Vocaluxe/Menu/IMenuElement.cs
rename to VocaluxeLib/Menu/IMenuElement.cs
diff --git a/Vocaluxe/Menu/SingNotes/CNotes.cs b/VocaluxeLib/Menu/SingNotes/CNotes.cs
similarity index 100%
rename from Vocaluxe/Menu/SingNotes/CNotes.cs
rename to VocaluxeLib/Menu/SingNotes/CNotes.cs
diff --git a/Vocaluxe/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
similarity index 99%
rename from Vocaluxe/Menu/SingNotes/CSingNotes.cs
rename to VocaluxeLib/Menu/SingNotes/CSingNotes.cs
index 2370d5cc..af27680c 100644
--- a/Vocaluxe/Menu/SingNotes/CSingNotes.cs
+++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
@@ -40,7 +40,7 @@ namespace Vocaluxe.Menu.SingNotes
         public string SkinPerfectNoteStarName;
     }
 
-    abstract class CSingNotes : ISingNotes, IMenuElement
+    public abstract class CSingNotes : ISingNotes, IMenuElement
     {
         private Basic _Base;
         private SThemeSingBar _Theme;
diff --git a/Vocaluxe/Menu/SingNotes/CSingNotesClassic.cs b/VocaluxeLib/Menu/SingNotes/CSingNotesClassic.cs
similarity index 100%
rename from Vocaluxe/Menu/SingNotes/CSingNotesClassic.cs
rename to VocaluxeLib/Menu/SingNotes/CSingNotesClassic.cs
diff --git a/Vocaluxe/Menu/SingNotes/ISingNotes.cs b/VocaluxeLib/Menu/SingNotes/ISingNotes.cs
similarity index 100%
rename from Vocaluxe/Menu/SingNotes/ISingNotes.cs
rename to VocaluxeLib/Menu/SingNotes/ISingNotes.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSong.cs
rename to VocaluxeLib/Menu/SongMenu/CSong.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenu.cs b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
similarity index 99%
rename from Vocaluxe/Menu/SongMenu/CSongMenu.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenu.cs
index 611b3c68..72de0fd2 100644
--- a/Vocaluxe/Menu/SongMenu/CSongMenu.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenu.cs
@@ -9,7 +9,7 @@ using Vocaluxe.PartyModes;
 
 namespace Vocaluxe.Menu.SongMenu
 {
-    class CSongMenu : ISongMenu
+    public class CSongMenu : ISongMenu
     {
         private Basic _Base;
 
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuBook.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuBook.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSongMenuBook.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenuBook.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuList.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSongMenuList.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
rename to VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
diff --git a/Vocaluxe/Menu/SongMenu/ISongMenu.cs b/VocaluxeLib/Menu/SongMenu/ISongMenu.cs
similarity index 100%
rename from Vocaluxe/Menu/SongMenu/ISongMenu.cs
rename to VocaluxeLib/Menu/SongMenu/ISongMenu.cs
diff --git a/Vocaluxe/PartyModes/CPartyMode.cs b/VocaluxeLib/PartyModes/CPartyMode.cs
similarity index 97%
rename from Vocaluxe/PartyModes/CPartyMode.cs
rename to VocaluxeLib/PartyModes/CPartyMode.cs
index 7fb72d5b..cf5809a4 100644
--- a/Vocaluxe/PartyModes/CPartyMode.cs
+++ b/VocaluxeLib/PartyModes/CPartyMode.cs
@@ -6,7 +6,7 @@ using Vocaluxe.Menu;
 
 namespace Vocaluxe.PartyModes
 {
-    abstract class CPartyMode : IPartyMode
+    public abstract class CPartyMode : IPartyMode
     {
         protected Basic _Base;
         protected ScreenSongOptions _ScreenSongOptions;
diff --git a/Vocaluxe/PartyModes/CPartyModeNone.cs b/VocaluxeLib/PartyModes/CPartyModeNone.cs
similarity index 96%
rename from Vocaluxe/PartyModes/CPartyModeNone.cs
rename to VocaluxeLib/PartyModes/CPartyModeNone.cs
index ec3ba712..d40523a5 100644
--- a/Vocaluxe/PartyModes/CPartyModeNone.cs
+++ b/VocaluxeLib/PartyModes/CPartyModeNone.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace Vocaluxe.PartyModes
 {
-    class CPartyModeNone : CPartyMode
+    public class CPartyModeNone : CPartyMode
     {
         //just a dummy for normal game mode
         public CPartyModeNone()
diff --git a/Vocaluxe/PartyModes/CScreenPartyDummy.cs b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs
similarity index 98%
rename from Vocaluxe/PartyModes/CScreenPartyDummy.cs
rename to VocaluxeLib/PartyModes/CScreenPartyDummy.cs
index 185ca508..407d15b3 100644
--- a/Vocaluxe/PartyModes/CScreenPartyDummy.cs
+++ b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs
@@ -7,7 +7,7 @@ using Vocaluxe.Menu;
 
 namespace Vocaluxe.PartyModes
 {
-    class CScreenPartyDummy : CMenu
+    public class CScreenPartyDummy : CMenu
     {
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         const int ScreenVersion = 1;
diff --git a/Vocaluxe/PartyModes/IPartyMode.cs b/VocaluxeLib/PartyModes/IPartyMode.cs
similarity index 97%
rename from Vocaluxe/PartyModes/IPartyMode.cs
rename to VocaluxeLib/PartyModes/IPartyMode.cs
index db915082..f05de2eb 100644
--- a/Vocaluxe/PartyModes/IPartyMode.cs
+++ b/VocaluxeLib/PartyModes/IPartyMode.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using Vocaluxe.Base;
 using Vocaluxe.Menu;
 
 namespace Vocaluxe.PartyModes
@@ -50,7 +49,7 @@ namespace Vocaluxe.PartyModes
     }
     #endregion Structs
 
-    interface IPartyMode
+    public interface IPartyMode
     {
         bool Init(string Folder);
         void Initialize(Basic Base);
diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj
index 4529a5fb..4867bf3b 100644
--- a/VocaluxeLib/VocaluxeLib.csproj
+++ b/VocaluxeLib/VocaluxeLib.csproj
@@ -15,91 +15,91 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN;ARCH_X86</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Output\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X86</DefineConstants>
+    <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN;ARCH_X64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Output\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X64</DefineConstants>
+    <DefineConstants>WIN</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;ARCH_X86</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Output\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX;ARCH_X86</DefineConstants>
+    <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;ARCH_X64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\Output\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>LINUX;ARCH_X64</DefineConstants>
+    <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <ItemGroup>
@@ -110,6 +110,39 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Menu\CBackground.cs" />
+    <Compile Include="Menu\CButton.cs" />
+    <Compile Include="Menu\CEqualizer.cs" />
+    <Compile Include="Menu\CHelper.cs" />
+    <Compile Include="Menu\CInteraction.cs" />
+    <Compile Include="Menu\CLyric.cs" />
+    <Compile Include="Menu\CMenu.cs" />
+    <Compile Include="Menu\CMenuParty.cs" />
+    <Compile Include="Menu\CNameSelection.cs" />
+    <Compile Include="Menu\CObjectInteractions.cs" />
+    <Compile Include="Menu\CParticle.cs" />
+    <Compile Include="Menu\CPlaylist.cs" />
+    <Compile Include="Menu\CSelectSlide.cs" />
+    <Compile Include="Menu\CStatic.cs" />
+    <Compile Include="Menu\CText.cs" />
+    <Compile Include="Menu\IMenu.cs" />
+    <Compile Include="Menu\IMenuElement.cs" />
+    <Compile Include="Menu\SingNotes\CNotes.cs" />
+    <Compile Include="Menu\SingNotes\CSingNotes.cs" />
+    <Compile Include="Menu\SingNotes\CSingNotesClassic.cs" />
+    <Compile Include="Menu\SingNotes\ISingNotes.cs" />
+    <Compile Include="Menu\SongMenu\CSong.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenu.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuBook.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuDreidel.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuFramework.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuList.cs" />
+    <Compile Include="Menu\SongMenu\CSongMenuTileBoard.cs" />
+    <Compile Include="Menu\SongMenu\ISongMenu.cs" />
+    <Compile Include="PartyModes\CPartyMode.cs" />
+    <Compile Include="PartyModes\CPartyModeNone.cs" />
+    <Compile Include="PartyModes\CScreenPartyDummy.cs" />
+    <Compile Include="PartyModes\IPartyMode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />