diff --git a/ANX.Framework/NonXNA/OSInformation.cs b/ANX.Framework/NonXNA/OSInformation.cs
index ec1a8398..5ea2b60c 100644
--- a/ANX.Framework/NonXNA/OSInformation.cs
+++ b/ANX.Framework/NonXNA/OSInformation.cs
@@ -27,7 +27,7 @@ namespace ANX.Framework.NonXNA
 		public static PlatformName GetName()
 		{
 #if WINDOWSMETRO
-			return PlatformName.Windows8;
+			return PlatformName.Windows8ModernUI;
 #elif PSVITA
 			return PlatformName.PSVita;
 #elif ANDROID
@@ -88,8 +88,12 @@ namespace ANX.Framework.NonXNA
 						{
 							return PlatformName.WindowsVista;
 						}
+                        else if (osVersion.Minor == 2)
+                        {
+                            return PlatformName.Windows8;
+                        }
 
-						return PlatformName.Windows7;
+                        return PlatformName.Windows7;
 					}
 
 					return PlatformName.WindowsXP;
diff --git a/ANX.Framework/NonXNA/PlatformName.cs b/ANX.Framework/NonXNA/PlatformName.cs
index 415da45b..6b15b09d 100644
--- a/ANX.Framework/NonXNA/PlatformName.cs
+++ b/ANX.Framework/NonXNA/PlatformName.cs
@@ -11,6 +11,7 @@ namespace ANX.Framework.NonXNA
 		WindowsVista,
 		Windows7,
 		Windows8,
+        Windows8ModernUI,
 		Linux,
 		MacOSX,
 		Android,
diff --git a/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs b/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
index cf312434..8c1edb3f 100644
--- a/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
+++ b/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
@@ -68,6 +68,7 @@ namespace ANX.Framework.NonXNA.PlatformSystem
         {
             switch (platform)
             {
+                case PlatformName.Windows8:
                 case PlatformName.Windows7:
                 case PlatformName.WindowsVista:
                 case PlatformName.WindowsXP:
@@ -75,7 +76,7 @@ namespace ANX.Framework.NonXNA.PlatformSystem
                 case PlatformName.Linux:
                 case PlatformName.PSVita:
                     return prefix + platform.ToString() + suffix;
-                case PlatformName.Windows8:
+                case PlatformName.Windows8ModernUI:
                     return prefix + "Metro";
                 default:
                     throw new PlatformSystemInstanceException("couldn't solve assembly name for platform '" + platform.ToString() + "'");
diff --git a/InputSystems/ANX.InputSystem.Recording/Properties/AssemblyInfo.cs b/InputSystems/ANX.InputSystem.Recording/Properties/AssemblyInfo.cs
index 3f9b012e..0aff43ef 100644
--- a/InputSystems/ANX.InputSystem.Recording/Properties/AssemblyInfo.cs
+++ b/InputSystems/ANX.InputSystem.Recording/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.0")]
-[assembly: AssemblyFileVersion("0.0.2.0")]
+[assembly: AssemblyVersion("0.0.3.*")]
+[assembly: AssemblyFileVersion("0.0.3.0")]
diff --git a/InputSystems/ANX.InputSystem.Recording/SupportedPlatformsImpl.cs b/InputSystems/ANX.InputSystem.Recording/SupportedPlatformsImpl.cs
index 3d5a285e..068464f6 100644
--- a/InputSystems/ANX.InputSystem.Recording/SupportedPlatformsImpl.cs
+++ b/InputSystems/ANX.InputSystem.Recording/SupportedPlatformsImpl.cs
@@ -20,7 +20,8 @@ namespace ANX.InputSystem.Recording
 					PlatformName.WindowsXP,
 					PlatformName.WindowsVista,
 					PlatformName.Windows7,
-					PlatformName.Windows8
+					PlatformName.Windows8,
+                    PlatformName.Windows8ModernUI
 				};
 			}
 		}
diff --git a/PlatformSystems/ANX.PlatformSystem.Metro/Properties/AssemblyInfo.cs b/PlatformSystems/ANX.PlatformSystem.Metro/Properties/AssemblyInfo.cs
index 94d90620..8556de7a 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/Properties/AssemblyInfo.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.9.1.*")]
+[assembly: AssemblyFileVersion("0.9.1.0")]
diff --git a/PlatformSystems/ANX.PlatformSystem.Metro/SupportedPlatformsImpl.cs b/PlatformSystems/ANX.PlatformSystem.Metro/SupportedPlatformsImpl.cs
index cad1c9d7..55657b2f 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/SupportedPlatformsImpl.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/SupportedPlatformsImpl.cs
@@ -15,7 +15,7 @@ namespace ANX.PlatformSystem.Metro
 			{
 				return new PlatformName[]
 				{
-					PlatformName.Windows8,
+					PlatformName.Windows8ModernUI,
 				};
 			}
 		}
diff --git a/PlatformSystems/ANX.PlatformSystem.Windows/Properties/AssemblyInfo.cs b/PlatformSystems/ANX.PlatformSystem.Windows/Properties/AssemblyInfo.cs
index aaeee6f7..fbb698f8 100644
--- a/PlatformSystems/ANX.PlatformSystem.Windows/Properties/AssemblyInfo.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Windows/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.75.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.75.1.*")]
+[assembly: AssemblyFileVersion("0.75.1.0")]
diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/SupportedPlatformsImpl.cs b/RenderSystems/ANX.RenderSystem.Windows.Metro/SupportedPlatformsImpl.cs
index ca026feb..be84239d 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/SupportedPlatformsImpl.cs
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/SupportedPlatformsImpl.cs
@@ -15,7 +15,7 @@ namespace ANX.RenderSystem.Windows.Metro
 			{
 				return new PlatformName[]
 				{
-					PlatformName.Windows8,
+					PlatformName.Windows8ModernUI,
 				};
 			}
 		}
diff --git a/Samples/SimpleNoContent/Properties/AssemblyInfo.cs b/Samples/SimpleNoContent/Properties/AssemblyInfo.cs
index 407f0492..1f0f7ec5 100644
--- a/Samples/SimpleNoContent/Properties/AssemblyInfo.cs
+++ b/Samples/SimpleNoContent/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("SimpleModernUI")]
+[assembly: AssemblyTitle("SimpleNoContent")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SimpleModernUI")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyProduct("SimpleNoContent")]
+[assembly: AssemblyCopyright("Copyright © 2012 ANX.Framework Development Team")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SoundSystems/ANX.SoundSystem.Windows.XAudio/SupportedPlatformsImpl.cs b/SoundSystems/ANX.SoundSystem.Windows.XAudio/SupportedPlatformsImpl.cs
index e598d4c4..199dd976 100644
--- a/SoundSystems/ANX.SoundSystem.Windows.XAudio/SupportedPlatformsImpl.cs
+++ b/SoundSystems/ANX.SoundSystem.Windows.XAudio/SupportedPlatformsImpl.cs
@@ -19,6 +19,7 @@ namespace ANX.SoundSystem.Windows.XAudio
 					PlatformName.WindowsXP,
 					PlatformName.WindowsVista,
 					PlatformName.Windows8,
+                    PlatformName.Windows8ModernUI,
 				};
 			}
 		}
diff --git a/Tools/ProjectConverter/Program.cs b/Tools/ProjectConverter/Program.cs
index 076cf1ff..ed452ae3 100644
--- a/Tools/ProjectConverter/Program.cs
+++ b/Tools/ProjectConverter/Program.cs
@@ -31,6 +31,8 @@ namespace ProjectConverter
 			// For testing only
             //args = new[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" };
 
+            Directory.SetCurrentDirectory(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location));
+
             var switches = new List<string>();
             var keyValueParameters = new Dictionary<string,string>();
             var files = new List<string>();
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 94b685eb..5ae477f8 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -1,6 +1,7 @@
 <project name="ANX.Framework Build" default="build" basedir="./">
   <property name="build.platform" value="Any CPU" />
   <property name="build.dir" value="../../bin" />
+  <property name="build.dir.base" value="${build.dir}" />
   <property name="build.dir.tools" value="../bin" />
   <property name="build.solution_dir" value="../" />  
 
@@ -474,7 +475,7 @@
         <!--
         <include name="**/*_WindowsMetro.csproj" />
         -->
-        <exclude name="*" />
+        <include name="**/SimpleNoContent_WindowsMetro.csproj" />
       </fileset>
     </if>
 
@@ -516,7 +517,7 @@
           <arg value="/t:Build"/>
           <arg value="/p:Configuration=${build.configuration}"/>
           <arg value='/p:Platform="${build.platform}"'/>
-          <arg value="/p:OutputPath=${build.dir}/${build.configuration}" />
+          <arg value="/p:OutputPath=${build.dir.base}/${build.configuration}" />
           <arg value="/p:AllowUnsafeBlocks=true" />
           <arg value="/p:SolutionDir=${build.solution_dir}" />
           <arg value='/p:DefineConstants="${project.anx.directives}"' />
@@ -569,7 +570,7 @@
           <arg value="/t:Build"/>
           <arg value="/p:Configuration=${build.configuration}"/>
           <arg value='/p:Platform="${build.platform}"'/>
-          <arg value="/p:OutputPath=${build.dir}/${build.configuration}" />
+          <arg value="/p:OutputPath=${build.dir.base}/${build.configuration}" />
           <arg value="/p:AllowUnsafeBlocks=true" />
           <arg value="/p:SolutionDir=${build.solution_dir}" />
           <arg value='/p:DefineConstants="${project.anx.directives}"' />
@@ -662,7 +663,8 @@
       <include name="InputSystems/**/*.csproj" />
       <include name="PlatformSystems/**/*.csproj" />
       <include name="SoundSystems/**/*.csproj" />
-      <include name="Samples/**/*.csproj" unless="${project.anx.metro}"/>
+      <include name="Samples/**/*.csproj" />
+      <include name="Samples/**/SimpleNoContent.csproj" if="${project.anx.metro}" />
       <exclude name="**/*_Linux.csproj" />
       <exclude name="**/*_PSVita.csproj" />
       <exclude name="**/*_WindowsMetro.csproj" />