diff --git a/GstreamerHelper/GstreamerHelper.vcxproj b/GstreamerHelper/GstreamerHelper.vcxproj
index fd3c7260..81d50d0e 100644
--- a/GstreamerHelper/GstreamerHelper.vcxproj
+++ b/GstreamerHelper/GstreamerHelper.vcxproj
@@ -9,12 +9,12 @@
       <Configuration>DebugWin</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="PortableWin|Win32">
-      <Configuration>PortableWin</Configuration>
+    <ProjectConfiguration Include="InstallerWin|Win32">
+      <Configuration>InstallerWin</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="PortableWin|x64">
-      <Configuration>PortableWin</Configuration>
+    <ProjectConfiguration Include="InstallerWin|x64">
+      <Configuration>InstallerWin</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="ReleaseWin|Win32">
@@ -51,7 +51,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110_xp</PlatformToolset>
@@ -65,7 +65,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110_xp</PlatformToolset>
@@ -84,13 +84,13 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -118,7 +118,7 @@
     <LibraryPath>$(MSBuildProjectDirectory)\x86\lib;$(LibraryPath)</LibraryPath>
     <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x86\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x86\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x86\include\glib-2.0;$(MSBuildProjectDirectory)\x86\include;$(IncludePath)</IncludePath>
@@ -132,7 +132,7 @@
     <LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
     <IntDir>obj\$(Configuration).$(Platform)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>bin\$(Configuration).$(Platform)\</OutDir>
     <IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
@@ -210,7 +210,7 @@
       <Message>Copying binary</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -258,7 +258,7 @@
       <Command>xcopy "$(OutDir)*.dll" "$(SolutionDir)Output\x64\gstreamer\" /I /Y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -299,16 +299,16 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
       </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">false</CompileAsManaged>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">false</CompileAsManaged>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">false</CompileAsManaged>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">
       </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">
       </PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">
       </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="GstreamerAudio.cpp" />
@@ -319,13 +319,13 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PortableWin|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='PortableWin|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='InstallerWin|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="VocaluxeClock.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index 52d14088..e9ca8fc6 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -106,8 +106,8 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x86'">
-    <OutputPath>bin\x86\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -116,8 +116,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x64'">
-    <OutputPath>bin\x64\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -161,4 +161,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
index 15bea0ed..4f6ab862 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
+++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
@@ -106,8 +106,8 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x86'">
-    <OutputPath>bin\x86\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -116,8 +116,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x64'">
-    <OutputPath>bin\x64\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -161,4 +161,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
index a03eafb6..fb739e23 100644
--- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
@@ -106,8 +106,8 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x86'">
-    <OutputPath>bin\x86\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -116,8 +116,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x64'">
-    <OutputPath>bin\x64\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+    <OutputPath>bin</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -160,4 +160,4 @@ xcopy "$(ProjectDir)*.cs" "$(SolutionDir)Output\PartyModes\$(TargetName)\Code\"
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Vocaluxe.sln b/Vocaluxe.sln
index 44172895..d894246e 100644
--- a/Vocaluxe.sln
+++ b/Vocaluxe.sln
@@ -26,8 +26,8 @@ Global
 		DebugLinux|x86 = DebugLinux|x86
 		DebugWin|x64 = DebugWin|x64
 		DebugWin|x86 = DebugWin|x86
-		PortableWin|x64 = PortableWin|x64
-		PortableWin|x86 = PortableWin|x86
+		InstallerWin|x64 = InstallerWin|x64
+		InstallerWin|x86 = InstallerWin|x86
 		ReleaseLinux|x64 = ReleaseLinux|x64
 		ReleaseLinux|x86 = ReleaseLinux|x86
 		ReleaseWin|x64 = ReleaseWin|x64
@@ -42,10 +42,10 @@ Global
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x64.Build.0 = DebugWin|x64
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x86.ActiveCfg = DebugWin|x86
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.DebugWin|x86.Build.0 = DebugWin|x86
-		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x64.Build.0 = PortableWin|x64
-		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x86.ActiveCfg = PortableWin|x86
-		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.PortableWin|x86.Build.0 = PortableWin|x86
+		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
+		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.InstallerWin|x86.Build.0 = InstallerWin|x86
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
 		{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
@@ -62,10 +62,10 @@ Global
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x64.Build.0 = DebugWin|x64
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.ActiveCfg = DebugWin|x86
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.DebugWin|x86.Build.0 = DebugWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x64.Build.0 = PortableWin|x64
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x86.ActiveCfg = PortableWin|x86
-		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.PortableWin|x86.Build.0 = PortableWin|x86
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
+		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.InstallerWin|x86.Build.0 = InstallerWin|x86
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
 		{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
@@ -82,10 +82,10 @@ Global
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.Build.0 = DebugWin|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.ActiveCfg = DebugWin|x86
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.Build.0 = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x64.Build.0 = PortableWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x86.ActiveCfg = PortableWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593679}.PortableWin|x86.Build.0 = PortableWin|x86
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
+		{6F3E1874-F28A-40E9-AFBD-31934D593679}.InstallerWin|x86.Build.0 = InstallerWin|x86
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
@@ -102,10 +102,10 @@ Global
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x64.Build.0 = DebugWin|x64
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.ActiveCfg = DebugWin|x86
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.DebugWin|x86.Build.0 = DebugWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x64.Build.0 = PortableWin|x64
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x86.ActiveCfg = PortableWin|x86
-		{5A4053F1-5AD5-441F-B254-D97A088127B6}.PortableWin|x86.Build.0 = PortableWin|x86
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
+		{5A4053F1-5AD5-441F-B254-D97A088127B6}.InstallerWin|x86.Build.0 = InstallerWin|x86
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
 		{5A4053F1-5AD5-441F-B254-D97A088127B6}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
@@ -122,10 +122,10 @@ Global
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x64.Build.0 = DebugWin|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.ActiveCfg = DebugWin|x86
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.DebugWin|x86.Build.0 = DebugWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x64.Build.0 = PortableWin|x64
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x86.ActiveCfg = PortableWin|x86
-		{6F3E1874-F28A-40E9-AFBD-31934D593678}.PortableWin|x86.Build.0 = PortableWin|x86
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.ActiveCfg = InstallerWin|x86
+		{6F3E1874-F28A-40E9-AFBD-31934D593678}.InstallerWin|x86.Build.0 = InstallerWin|x86
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x64.Build.0 = ReleaseLinux|x64
 		{6F3E1874-F28A-40E9-AFBD-31934D593678}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
@@ -140,10 +140,10 @@ Global
 		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x64.Build.0 = DebugWin|x64
 		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.ActiveCfg = DebugWin|Win32
 		{ED007796-367F-4142-AA55-5450C7645C2C}.DebugWin|x86.Build.0 = DebugWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x64.ActiveCfg = PortableWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x64.Build.0 = PortableWin|x64
-		{ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x86.ActiveCfg = PortableWin|Win32
-		{ED007796-367F-4142-AA55-5450C7645C2C}.PortableWin|x86.Build.0 = PortableWin|Win32
+		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x64.ActiveCfg = InstallerWin|x64
+		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x64.Build.0 = InstallerWin|x64
+		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x86.ActiveCfg = InstallerWin|Win32
+		{ED007796-367F-4142-AA55-5450C7645C2C}.InstallerWin|x86.Build.0 = InstallerWin|Win32
 		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x64.ActiveCfg = ReleaseWin|x64
 		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseLinux|x86.ActiveCfg = ReleaseWin|x64
 		{ED007796-367F-4142-AA55-5450C7645C2C}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 05dc6c37..7a68bc66 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -146,11 +146,10 @@ namespace Vocaluxe.Base
             _Settings.Encoding = Encoding.UTF8;
             _Settings.ConformanceLevel = ConformanceLevel.Document;
 
-#if PORTABLE
-            SongFolder.Add(Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderSongs));
-#else
-            SongFolder.Add(Path.Combine(CSettings.DataPath, CSettings.FolderSongs));
             SongFolder.Add(Path.Combine(Directory.GetCurrentDirectory(), CSettings.FolderSongs));
+
+#if INSTALLER
+            SongFolder.Add(Path.Combine(CSettings.DataPath, CSettings.FolderSongs));            
 #endif
 
             foreach (string folder in SongFolder)
diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index e349b2f5..cfcecb23 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -68,10 +68,10 @@ namespace Vocaluxe.Base
         public static bool IsFullScreen;
         public const int VertexBufferElements = 10000;
 
-#if PORTABLE
-        public static string DataPath = Environment.CurrentDirectory;
+#if INSTALLER
+        public static string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Vocaluxe");
 #else
-        public static string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),"Vocaluxe");
+        public static string DataPath = Environment.CurrentDirectory;
 #endif
 
         public const string Icon = "Vocaluxe.ico";
@@ -99,12 +99,10 @@ namespace Vocaluxe.Base
         public const string FolderProfiles = "Profiles";
         public static List<string> FoldersProfiles = new List<string>()
             {
-#if PORTABLE
-                Path.Combine(DataPath, FolderProfiles)
-#else
+#if INSTALLER
                 Path.Combine(Environment.CurrentDirectory, FolderProfiles),
-                Path.Combine(DataPath, FolderProfiles)
 #endif
+                Path.Combine(DataPath, FolderProfiles)
             };
         public const string FolderSongs = "Songs";
         public const string FolderSounds = "Sounds";
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index e74c7885..952a7804 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -120,7 +120,7 @@
     <DefineConstants>LINUX;ARCH_X64</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x86'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -128,10 +128,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X86;PORTABLE</DefineConstants>
+    <DefineConstants>WIN;ARCH_X86;INSTALLER</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
@@ -139,10 +139,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>WIN;ARCH_X64;PORTABLE</DefineConstants>
+    <DefineConstants>WIN;ARCH_X64;INSTALLER</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <ItemGroup Condition="'$(Platform)' == 'x86' And ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'PortableWin')">
+  <ItemGroup Condition="'$(Platform)' == 'x86' And ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')">
     <Reference Include="SlimDX">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Output\x86\SlimDX.dll</HintPath>
@@ -153,7 +153,7 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Platform)' == 'x64' And ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'PortableWin')">
+  <ItemGroup Condition="'$(Platform)' == 'x64' And ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')">
     <Reference Include="SlimDX">
       <HintPath>..\Output\x64\SlimDX.dll</HintPath>
       <Private>False</Private>
diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj
index 8ddaa65f..80048cf4 100644
--- a/VocaluxeLib/VocaluxeLib.csproj
+++ b/VocaluxeLib/VocaluxeLib.csproj
@@ -103,8 +103,8 @@
     <DefineConstants>LINUX</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x86'">
-    <OutputPath>bin\x86\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -113,8 +113,8 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'PortableWin|x64'">
-    <OutputPath>bin\x64\PortableWin\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
+    <OutputPath>bin\</OutputPath>
     <DefineConstants>WIN</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -188,4 +188,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>