diff --git a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
index fadf0e752d..da9653e0a5 100644
--- a/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
+++ b/data/templates/file/CSharp/CSharp.WPFFlowDocument.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF FlowDocument"
+		  name        = "WinFX Flow Document"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "FlowDocument${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>A Windows Presentation Foundation FlowDocument.</Description>
+	<Description>A WinFX Flow Document</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.WPFPage.xft b/data/templates/file/CSharp/CSharp.WPFPage.xft
index 1073a56425..567473633a 100644
--- a/data/templates/file/CSharp/CSharp.WPFPage.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPage.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF Page"
+		  name        = "WinFX Page"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Page${Number}.xaml"
 		  language    = "C#"/>
 	 
-	<Description>A Windows Presentation Foundation page.</Description>
+	<Description>A WinFX Page</Description>
 	
 	<!-- 
 	Special new file templates:
@@ -46,10 +46,10 @@ namespace ${StandardNamespace}
 
     public partial class ${FileNameWithoutExtension} : Page
     {
-        // To use PageLoaded put Loaded="PageLoaded" in root element of .xaml file.
-        // private void PageLoaded(object sender, RoutedEventArgs e) {}
-        // Sample event handler:  
-        // private void ButtonClick(object sender, RoutedEventArgs e) {}
+        public ${FileNameWithoutExtension}()
+        {
+            InitializeComponent();
+        }
 
     }
 }]]></File>
diff --git a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
index 294ab73c8f..e8b2c0dd3a 100644
--- a/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
+++ b/data/templates/file/CSharp/CSharp.WPFPageFunction.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF PageFunction"
+		  name        = "WinFX Page Function"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "PageFunction${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>A Windows Presentation Foundation PageFunction.</Description>
+	<Description>A WinFX Page Function</Description>
 	
 	<!-- 
 	Special new file templates:
@@ -47,6 +47,12 @@ namespace ${StandardNamespace}
 
     public partial class ${FileNameWithoutExtension} : PageFunction<String>
     {
+
+        public ${FileNameWithoutExtension}()
+        {
+            InitializeComponent();
+        }
+
         // The OnLoaded handler can be run automatically when the class is loaded. To use it, add Loaded="OnLoaded" to the attributes of the root element of the .xaml file and uncomment the following line.
         // private void OnLoaded(object sender, RoutedEventArgs e) {}
         //
diff --git a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
index 25d7ca4587..603679d96c 100644
--- a/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
+++ b/data/templates/file/CSharp/CSharp.WPFResourceDictionary.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF ResourceDictionary"
+		  name        = "WinFX Resource Dictionary"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Dictionary${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>A Windows Presentation Foundation ResourceDictionary.</Description>
+	<Description>A WinFX Resource Dictionary</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.WPFUserControl.xft b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
index 0ea31bbcb0..5fd80d1b6b 100644
--- a/data/templates/file/CSharp/CSharp.WPFUserControl.xft
+++ b/data/templates/file/CSharp/CSharp.WPFUserControl.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF User Control"
+		  name        = "WinFX User Control"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "UserControl${Number}.xaml"
 		  language    = "XML"/>
 	 
-	<Description>A Windows Presentation Foundation User Control.</Description>
+	<Description>A WinFX User Control</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/file/CSharp/CSharp.WPFWindow.xft b/data/templates/file/CSharp/CSharp.WPFWindow.xft
index d9c752fa30..8a8961a35e 100644
--- a/data/templates/file/CSharp/CSharp.WPFWindow.xft
+++ b/data/templates/file/CSharp/CSharp.WPFWindow.xft
@@ -2,13 +2,13 @@
 <Template author="Mathias Simmack" version="1.0">
 	
 	<Config
-		  name        = "WPF Window"
+		  name        = "WinFX Window"
 		  icon        = "Icons.32x32.XMLFileIcon"
 		  category    = "C#"
 		  defaultname = "Window${Number}.xaml"
 		  language    = "C#"/>
 	 
-	<Description>A Windows Presentation Foundation window.</Description>
+	<Description>A WinFX Window</Description>
 	
 	<!-- 
 	Special new file templates:
diff --git a/data/templates/project/CSharp/WPFApplication.xpt b/data/templates/project/CSharp/WPFApplication.xpt
index 2f79437da2..320d05cc5e 100644
--- a/data/templates/project/CSharp/WPFApplication.xpt
+++ b/data/templates/project/CSharp/WPFApplication.xpt
@@ -1,20 +1,19 @@
 <?xml version="1.0"?>
 <Template originator   = "Mathias Simmack"
           created      = "26/10/2005"
-          lastModified = "26/10/2005">
+          lastModified = "20/11/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>WPF Application Template Beta</Name>
+		<Name>WinFX Application</Name>
 		<Category>C#</Category>
 		<Icon>C#.Project.Form</Icon>
 		<LanguageName>C#</LanguageName>
-		<Description>Creates a simple Windows Presentation Foundation application.</Description>
+		<Description>Creates a simple WinFX application.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
 	<Actions>
-		<Open filename = "WPF.txt"/>
 	</Actions>
 	
 	<Combine name = "${ProjectName}" directory = ".">
@@ -28,10 +27,15 @@
 			<ProjectItems>
 				<Reference Include="System" />
 				<Reference Include="System.Data" />
+				<Reference Include="System.Printing"/>
+				<Reference Include="System.Runtime.Serialization"/>
+				<Reference Include="System.Security.Authorization"/>
+				<!-- Reference Include="System.ServiceModel"/ -->
 				<Reference Include="System.Xml" />
 				<Reference Include="WindowsBase" />
 				<Reference Include="PresentationCore" />
 				<Reference Include="PresentationFramework" />
+				<Reference Include="ReachFramework" />
 				<Reference Include="UIAutomationProvider" />
 				<Reference Include="UIAutomationTypes" />
 			</ProjectItems>
@@ -112,19 +116,6 @@ namespace ${StandardNamespace}
 
     }
 }]]></File>
-				<File name="WPF.txt" buildAction="None" language="Default"><![CDATA[This template is just a simple WPF (formerly known as "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-30)]]></File>
 				<File name="AssemblyInfo.cs"><![CDATA[#region Using directives
 
 using System.Reflection;
@@ -160,10 +151,10 @@ using System.Runtime.InteropServices;
 
 
 [assembly: ThemeInfo(
-    DictionaryLocation.None, //where theme specific resource dictionaries are located
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
     //(used if a resource is not found in the page, 
     // or application resource dictionaries)
-    DictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
     //(used if a resource is not found in the page, 
     // app, or any theme specific resource dictionaries)
 )]
diff --git a/data/templates/project/CSharp/WPFNavigationApplication.xpt b/data/templates/project/CSharp/WPFNavigationApplication.xpt
index 06838f2425..8ff6c6858e 100644
--- a/data/templates/project/CSharp/WPFNavigationApplication.xpt
+++ b/data/templates/project/CSharp/WPFNavigationApplication.xpt
@@ -1,20 +1,19 @@
 <?xml version="1.0"?>
 <Template originator   = "Mathias Simmack"
           created      = "26/10/2005"
-          lastModified = "26/10/2005">
+          lastModified = "20/11/2005">
 	
 	<!-- Template Header -->
 	<TemplateConfiguration>
-		<Name>WPF Navigation Application Template Beta</Name>
+		<Name>WinFX Navigation Application</Name>
 		<Category>C#</Category>
 		<Icon>C#.Project.Form</Icon>
 		<LanguageName>C#</LanguageName>
-		<Description>Creates a simple Windows Presentation Foundation application with one navigation page.</Description>
+		<Description>Creates a simple WinFX application with one navigation page.</Description>
 	</TemplateConfiguration>
 	
 	<!-- Actions -->
 	<Actions>
-		<Open filename = "AvalonApplication.txt"/>
 	</Actions>
 	
 	<Combine name = "${ProjectName}" directory = ".">
@@ -28,10 +27,15 @@
 			<ProjectItems>
 				<Reference Include="System" />
 				<Reference Include="System.Data" />
+				<Reference Include="System.Printing"/>
+				<Reference Include="System.Runtime.Serialization"/>
+				<Reference Include="System.Security.Authorization"/>
+				<!-- Reference Include="System.ServiceModel"/ -->
 				<Reference Include="System.Xml" />
 				<Reference Include="WindowsBase" />
 				<Reference Include="PresentationCore" />
 				<Reference Include="PresentationFramework" />
+				<Reference Include="ReachFramework" />
 				<Reference Include="UIAutomationProvider" />
 				<Reference Include="UIAutomationTypes" />
 			</ProjectItems>
@@ -85,21 +89,12 @@ namespace ${StandardNamespace}
 {
 	public partial class Page1 : Page
 	{
+		public Page1()
+		{
+			InitializeComponent();
+		}
 	}
 }]]></File>
-				<File name="AvalonApplication.txt" buildAction="None" language="Default"><![CDATA[This template is just a simple WPF (formerly known as "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-30)]]></File>
 				<File name="AssemblyInfo.cs"><![CDATA[#region Using directives
 
 using System.Reflection;
@@ -135,10 +130,10 @@ using System.Runtime.InteropServices;
 
 
 [assembly: ThemeInfo(
-    DictionaryLocation.None, //where theme specific resource dictionaries are located
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
     //(used if a resource is not found in the page, 
     // or application resource dictionaries)
-    DictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
     //(used if a resource is not found in the page, 
     // app, or any theme specific resource dictionaries)
 )]