diff --git a/data/templates/project/CSharp/AvalonApplication.xpt b/data/templates/project/CSharp/AvalonApplication.xpt
new file mode 100644
index 0000000000..181fa5548f
--- /dev/null
+++ b/data/templates/project/CSharp/AvalonApplication.xpt
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<Template originator   = "Mathias Simmack"
+          created      = "26/10/2005"
+          lastModified = "26/10/2005">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>Avalon Application Beta</Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Form</Icon>
+		<LanguageName>C#</LanguageName>
+		<Description>Creates a simple Avalon application</Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "AvalonApplication.txt"/>
+	</Actions>
+	
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options OutputType = "WinExe" />
+
+			<ProjectItems>
+				<Reference Include="System" />
+				<Reference Include="System.Data" />
+				<Reference Include="System.Xml" />
+				<Reference Include="WindowsBase" />
+				<Reference Include="PresentationCore" />
+				<Reference Include="PresentationFramework" />
+				<Reference Include="UIAutomationProvider" />
+				<Reference Include="UIAutomationTypes" />
+			</ProjectItems>
+
+			<Imports>
+				<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
+			</Imports>
+			
+			<Files>
+				<File name="MyApp.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application x:Class="${StandardNamespace}.MyApp"
+    xmlns="http://schemas.microsoft.com/winfx/avalon/2005"
+    xmlns:x="http://schemas.microsoft.com/winfx/xaml/2005"
+    Startup="AppStartup"
+    >
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>]]></File>
+				<File name="MyApp.xaml.cs"><![CDATA[using System;
+using System.Windows;
+using System.Data;
+using System.Xml;
+using System.Configuration;
+
+namespace ${StandardNamespace}
+{
+    /// <summary>
+    /// Interaction logic for MyApp.xaml
+    /// </summary>
+
+    public partial class MyApp : Application
+    {
+
+        void AppStartup(object sender, StartupEventArgs args)
+        {
+            Window1 mainWindow = new Window1();
+            mainWindow.Show();
+        }
+
+    }
+}]]></File>
+				<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="${StandardNamespace}.Window1"
+    xmlns="http://schemas.microsoft.com/winfx/avalon/2005"
+    xmlns:x="http://schemas.microsoft.com/winfx/xaml/2005"
+    Title="${StandardNamespace}"
+    >
+    <Grid>
+        
+    </Grid>
+</Window>]]></File>
+				<File name="Window1.xaml.cs"><![CDATA[using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+
+namespace ${StandardNamespace}
+{
+    /// <summary>
+    /// Interaction logic for Window1.xaml
+    /// </summary>
+
+    public partial class Window1 : Window
+    {
+        public Window1()
+        {
+            InitializeComponent();
+        }
+
+        // To use Loaded event put Loaded="WindowLoaded" attribute in root element of .xaml file.
+        // private void WindowLoaded(object sender, RoutedEventArgs e) {}
+
+        // Sample event handler:  
+        // private void ButtonClick(object sender, RoutedEventArgs e) {}
+
+    }
+}]]></File>
+				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[First of all let me say that this is just a simple Avalon application with an empty window.
+I hope I can fix and improve this template in the near future.
+If you want to build this Avalon application you need the following things:
+
+	1. The latest version of Microsoft's WinFX Runtime Components
+	2. The latest version of the WinFX SDK for the latest version of the Runtime Components
+
+The SDK is an optional choice, but it will definitely not work without the Runtime Components.
+I personally use the September Community Technology Preview (CTP) and it works fine.
+So, don't say I did not warn you. :-)
+
+Mathias
+(2005-10-26)]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>
diff --git a/data/templates/project/CSharp/AvalonPageApplication.xpt b/data/templates/project/CSharp/AvalonPageApplication.xpt
new file mode 100644
index 0000000000..785fce56f0
--- /dev/null
+++ b/data/templates/project/CSharp/AvalonPageApplication.xpt
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<Template originator   = "Mathias Simmack"
+          created      = "26/10/2005"
+          lastModified = "26/10/2005">
+	
+	<!-- Template Header -->
+	<TemplateConfiguration>
+		<Name>Avalon Page Application Beta</Name>
+		<Category>C#</Category>
+		<Icon>C#.Project.Form</Icon>
+		<LanguageName>C#</LanguageName>
+		<Description>Creates a simple Avalon application with one navigation page</Description>
+	</TemplateConfiguration>
+	
+	<!-- Actions -->
+	<Actions>
+		<Open filename = "AvalonApplication.txt"/>
+	</Actions>
+	
+	<Combine name = "${ProjectName}" directory = ".">
+		<Options>
+			<StartupProject>${ProjectName}</StartupProject>
+		</Options>
+		
+		<Project name = "${ProjectName}" directory = ".">
+			<Options OutputType = "WinExe" />
+
+			<ProjectItems>
+				<Reference Include="System" />
+				<Reference Include="System.Data" />
+				<Reference Include="System.Xml" />
+				<Reference Include="WindowsBase" />
+				<Reference Include="PresentationCore" />
+				<Reference Include="PresentationFramework" />
+				<Reference Include="UIAutomationProvider" />
+				<Reference Include="UIAutomationTypes" />
+			</ProjectItems>
+
+			<Imports>
+				<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
+			</Imports>
+			
+			<Files>
+				<File name="MyApp.xaml" buildAction="ApplicationDefinition" language="XML"><![CDATA[<Application xmlns="http://schemas.microsoft.com/winfx/avalon/2005"
+                       xmlns:x="http://schemas.microsoft.com/winfx/xaml/2005"
+                       x:Class="${StandardNamespace}.MyApp"
+                       StartupUri="Page1.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>]]></File>
+				<File name="MyApp.xaml.cs"><![CDATA[using System;
+using System.Windows;
+using System.Windows.Navigation;
+using System.Data;
+using System.Xml;
+using System.Configuration;
+
+
+namespace ${StandardNamespace}
+{
+    /// <summary>
+    /// Interaction logic for MyApp.xaml
+    /// </summary>
+
+    public partial class MyApp : Application
+    {
+
+    }
+}]]></File>
+				<File name="Page1.xaml" buildAction="Page"><![CDATA[<StackPanel xmlns="http://schemas.microsoft.com/winfx/avalon/2005">
+    
+</StackPanel>]]></File>
+				<File name="Page1.xaml.cs"><![CDATA[using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using System.ComponentModel;
+
+namespace ${StandardNamespace}
+{
+	public partial class Page1 : Page
+	{
+	}
+}]]></File>
+				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[First of all let me say that this is just a simple Avalon application with one empty page.
+I hope I can fix and improve this template in the near future.
+If you want to build this Avalon application you need the following things:
+
+	1. The latest version of Microsoft's WinFX Runtime Components
+	2. The latest version of the WinFX SDK for the latest version of the Runtime Components
+
+The SDK is an optional choice, but it will definitely not work without the Runtime Components.
+I personally use the September Community Technology Preview (CTP) and it works fine.
+So, don't say I did not warn you. :-)
+
+Mathias
+(2005-10-26)]]></File>
+			</Files>
+		</Project>
+	</Combine>
+</Template>
diff --git a/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
index e0088170ed..f4e326ff48 100644
--- a/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/FileProjectItem.cs
@@ -31,10 +31,13 @@ namespace ICSharpCode.SharpDevelop.Project
 		}
 		
 		public enum FileBuildAction {
-			None             = ItemType.None,
-			Compile          = ItemType.Compile,
-			EmbeddedResource = ItemType.EmbeddedResource,
-			Content          = ItemType.Content,
+			None                  = ItemType.None,
+			Compile               = ItemType.Compile,
+			EmbeddedResource      = ItemType.EmbeddedResource,
+			Resource              = ItemType.Resource,
+			Content               = ItemType.Content,
+			ApplicationDefinition = ItemType.ApplicationDefinition,
+			Page                  = ItemType.Page
 		}
 		
 		[LocalizedProperty("${res:ICSharpCode.SharpDevelop.Internal.Project.ProjectFile.BuildAction}",
diff --git a/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
index aa3cc25a89..b40397bd9e 100644
--- a/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
@@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		// FileProjectItem
 		Compile,
 		EmbeddedResource,
+		Resource,
 		None,
 		Content,
 		Folder,
diff --git a/src/Main/Base/Project/Src/Project/Items/ProjectItemFactory.cs b/src/Main/Base/Project/Src/Project/Items/ProjectItemFactory.cs
index 689345d724..1887c25c60 100644
--- a/src/Main/Base/Project/Src/Project/Items/ProjectItemFactory.cs
+++ b/src/Main/Base/Project/Src/Project/Items/ProjectItemFactory.cs
@@ -29,6 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				case "None":
 				case "Compile":
 				case "EmbeddedResource":
+				case "Resource":
 				case "Content":
 				case "WebReferences":
 				case "Folder":