diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/AssetsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/AssetsDatabase.uexml
index fd3da35d..a3b0ff95 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/AssetsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/AssetsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{86F141C1-A729-4092-A883-CDBEF377FF47}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{86F141C1-A729-4092-A883-CDBEF377FF47}">
 			<Information>
 				<Title>Assets</Title>
 				<Description>Keep track of assets, including asset details and owners.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ContactsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ContactsDatabase.uexml
index 5bfeaa1d..01dc5afa 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ContactsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ContactsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{C507C886-6D3B-4B58-9C42-94A35152E4A6}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{C507C886-6D3B-4B58-9C42-94A35152E4A6}">
 			<Information>
 				<Title>Contacts</Title>
 				<Description>Manage information about people that your team works with, such as customers and partners.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/EventsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/EventsDatabase.uexml
index bbe67ac3..c16fb02c 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/EventsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/EventsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{74EBA601-237F-428D-B02D-141805348209}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{74EBA601-237F-428D-B02D-141805348209}">
 			<Information>
 				<Title>Events</Title>
 				<Description>Track upcoming meetings, deadlines, and other important events.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/FacultyDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/FacultyDatabase.uexml
index 98c004c8..cdb5f04f 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/FacultyDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/FacultyDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{DCEB4CE5-2832-42A9-BA61-8682926ED629}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{DCEB4CE5-2832-42A9-BA61-8682926ED629}">
 			<Information>
 				<Title>Faculty</Title>
 				<Description>Keep track of information about faculty members, including emergency contacts and information about their education history.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Education</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Education</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/IssuesDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/IssuesDatabase.uexml
index 3aa03ba6..c480d2e2 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/IssuesDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/IssuesDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{4A16562A-8D1A-46B7-A0BF-AFBF759EB439}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{4A16562A-8D1A-46B7-A0BF-AFBF759EB439}">
 			<Information>
 				<Title>Issues</Title>
 				<Description>Manage a set of issues or problems. Assign, prioritize, and follow the progress of issues from start to finish.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/MarketingProjectsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/MarketingProjectsDatabase.uexml
index 002bd24a..1f448070 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/MarketingProjectsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/MarketingProjectsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{7ABE2F3D-B169-47D2-95F1-92571A8AEB32}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{7ABE2F3D-B169-47D2-95F1-92571A8AEB32}">
 			<Information>
 				<Title>Marketing Projects</Title>
 				<Description>Track time-sensitive deliverables and vendor status for projects.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/NorthwindDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/NorthwindDatabase.uexml
index 15cb6f6e..010ccb84 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/NorthwindDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/NorthwindDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{8A945438-2E6E-4647-8108-CC5960417DF0}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{8A945438-2E6E-4647-8108-CC5960417DF0}">
 			<Information>
 				<Title>Northwind 2007</Title>
 				<Description>Northwind Sample</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Samples</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Samples</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ProjectsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ProjectsDatabase.uexml
index 9715dae7..326d4743 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ProjectsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/ProjectsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{58874798-2E63-4C2B-8C93-C31FCFA29AD7}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{58874798-2E63-4C2B-8C93-C31FCFA29AD7}">
 			<Information>
 				<Title>Projects</Title>
 				<Description>Track multiple projects and assign tasks to different people.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/SalesPipelineDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/SalesPipelineDatabase.uexml
index af37440c..25a4f7aa 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/SalesPipelineDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/SalesPipelineDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{A7B4581E-94F1-4FF0-935E-5B5BB80E3F38}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{A7B4581E-94F1-4FF0-935E-5B5BB80E3F38}">
 			<Information>
 				<Title>Sales Pipeline</Title>
 				<Description>Track the progress of prospective sales within a small group of sales professionals.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/StudentsDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/StudentsDatabase.uexml
index 79ad5417..6ea82504 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/StudentsDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/StudentsDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{5A9DF75F-123E-4AF9-96BE-1FC9CF1E0CB9}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{5A9DF75F-123E-4AF9-96BE-1FC9CF1E0CB9}">
 			<Information>
 				<Title>Students</Title>
 				<Description>Keep track of information about your students, including emergency contacts, medical information, and information about their guardians.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Education</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Education</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/TasksDatabase.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/TasksDatabase.uexml
index 1287661a..96e3ff7a 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/TasksDatabase.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Database/TasksDatabase.uexml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{C70DFF06-DF83-45EB-9891-CEF6BF253C2F}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{C70DFF06-DF83-45EB-9891-CEF6BF253C2F}">
 			<Information>
 				<Title>Tasks</Title>
 				<Description>Track a group of work items that you or your team need to complete.</Description>
 				<IconPath FileName="database.ico" />
-				<CategoryParts>
-					<CategoryPart>Business</CategoryPart>
-				</CategoryParts>
+				<Path>
+					<Part>General</Part>
+					<Part>Database</Part>
+					<Part>Business</Part>
+				</Path>
 			</Information>
-			<Content ObjectModelType="UniversalEditor.ObjectModels.DatabaseManagement.DatabaseObjectModel">
+			<Content ObjectModelType="UniversalEditor.ObjectModels.Database.DatabaseObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/FileSystem/WindowsFileSystem.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/FileSystem/WindowsFileSystem.uexml
index 5e86b454..b9d1c0b3 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/FileSystem/WindowsFileSystem.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/FileSystem/WindowsFileSystem.uexml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{F63140FB-C539-45b0-8045-506397ADE75B}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{F63140FB-C539-45b0-8045-506397ADE75B}">
 			<Information>
 				<Title>Windows filesystem</Title>
 				<Description>Creates a standard Windows NT file structure.</Description>
@@ -58,6 +58,6 @@
 					</Folder>
 				</Folders>
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Asset Tracking.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Asset Tracking.uexml
index d8222f7e..f45bf2a6 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Asset Tracking.uexml	
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Asset Tracking.uexml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{25CCF4D0-9DBD-40D2-936D-4F0BEA4FCC7D}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{25CCF4D0-9DBD-40D2-936D-4F0BEA4FCC7D}">
 			<Information>
 				<Title>Asset Tracking</Title>
 				<IconPath LargeFileName="icon_32x32.png" SmallFileName="icon_16x16.png" />
@@ -57,6 +57,6 @@
 					</Folder>
 				</Folders>
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Expense Report.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Expense Report.uexml
index 375a5181..f86eb234 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Expense Report.uexml	
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Expense Report.uexml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{DD66CB5B-9B3F-47CB-B71C-9BB70E7BA5AA}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{DD66CB5B-9B3F-47CB-B71C-9BB70E7BA5AA}">
 			<Information>
 				<Title>Expense Report</Title>
 				<IconPath LargeFileName="icon_32x32.png" SmallFileName="icon_16x16.png" />
@@ -57,6 +57,6 @@
 					</Folder>
 				</Folders>
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Meeting Agenda.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Meeting Agenda.uexml
index 3718e644..0056db8a 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Meeting Agenda.uexml	
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Meeting Agenda.uexml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{B8F7B746-8F5D-48E3-8977-89EE39362A6A}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{B8F7B746-8F5D-48E3-8977-89EE39362A6A}">
 			<Information>
 				<Title>Meeting Agenda</Title>
 				<IconPath LargeFileName="icon_32x32.png" SmallFileName="icon_16x16.png" />
@@ -57,6 +57,6 @@
 					</Folder>
 				</Folders>
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Status Report.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Status Report.uexml
index f6ec5539..ce072455 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Status Report.uexml	
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Status Report.uexml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{170F4DB0-57BA-4B89-BD13-4B05473455A1}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{170F4DB0-57BA-4B89-BD13-4B05473455A1}">
 			<Information>
 				<Title>Status Report</Title>
 				<IconPath LargeFileName="icon_32x32.png" SmallFileName="icon_16x16.png" />
@@ -57,6 +57,6 @@
 					</Folder>
 				</Folders>
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Travel Request.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Travel Request.uexml
index 4b1fd1e3..7e59bc65 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Travel Request.uexml	
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Templates/Document/Form/Travel Request.uexml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <UniversalEditor Version="2.0">
-	<Templates>
-		<Template ID="{3C01AD64-A0C1-4A4E-9952-2E1002DDB206}">
+	<DocumentTemplates>
+		<DocumentTemplate ID="{3C01AD64-A0C1-4A4E-9952-2E1002DDB206}">
 			<Information>
 				<Title>Travel Request</Title>
 				<IconPath LargeFileName="icon_32x32.png" SmallFileName="icon_16x16.png" />
@@ -9,6 +9,6 @@
 			<Content ObjectModelType="UniversalEditor.ObjectModels.RIFF.RIFFObjectModel">
 				
 			</Content>
-		</Template>
-	</Templates>
+		</DocumentTemplate>
+	</DocumentTemplates>
 </UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Libraries/UniversalEditor.Core/ObjectModelReference.cs b/CSharp/Libraries/UniversalEditor.Core/ObjectModelReference.cs
index 25e929dc..c9ccff6b 100644
--- a/CSharp/Libraries/UniversalEditor.Core/ObjectModelReference.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/ObjectModelReference.cs
@@ -220,7 +220,7 @@ namespace UniversalEditor
 		{
 			if (mvarType == null && mvarTypeName != null)
 			{
-				mvarType = Type.GetType(mvarTypeName);
+				mvarType = MBS.Framework.Reflection.FindType(mvarTypeName);
 			}
 			if (mvarType != null)
 			{
diff --git a/CSharp/Libraries/UniversalEditor.Essential/DataFormats/UEPackage/UEPackageXMLDataFormat.cs b/CSharp/Libraries/UniversalEditor.Essential/DataFormats/UEPackage/UEPackageXMLDataFormat.cs
index 550533f3..a8db2580 100644
--- a/CSharp/Libraries/UniversalEditor.Essential/DataFormats/UEPackage/UEPackageXMLDataFormat.cs
+++ b/CSharp/Libraries/UniversalEditor.Essential/DataFormats/UEPackage/UEPackageXMLDataFormat.cs
@@ -440,6 +440,20 @@ namespace UniversalEditor.DataFormats.UEPackage
 											template.Description = tagInformation.Elements["Description"].Value;
 										}
 
+										MarkupTagElement tagPath = (tagInformation.Elements["Path"] as MarkupTagElement);
+										if (tagPath != null)
+										{
+											List<string> pathParts = new List<string>();
+											foreach (MarkupElement elPart in tagPath.Elements)
+											{
+												MarkupTagElement tagPart = (elPart as MarkupTagElement);
+												if (tagPart == null) continue;
+												if (tagPart.FullName != "Part") continue;
+												pathParts.Add(tagPart.Value);
+											}
+											template.Path = pathParts.ToArray();
+										}
+
 										MarkupTagElement tagIconPath = (tagInformation.Elements["IconPath"] as MarkupTagElement);
 										if (tagIconPath != null)
 										{
diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
index fb42674f..f8711ace 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
@@ -370,8 +370,6 @@ namespace UniversalEditor.UserInterface.Dialogs
 		
 		private void InitializeObjectModelTreeView()
 		{
-			tmObjectModel.Rows.Clear();
-
 			ObjectModelReference[] omrs = UniversalEditor.Common.Reflection.GetAvailableObjectModels();
 			foreach (ObjectModelReference omr in omrs)
 			{
@@ -505,7 +503,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 					}
 				}
 
-				if (tn == null || tvObjectModel.SelectedRows.Contains(tn))
+				if (tn != null && tvObjectModel.SelectedRows.Contains(tn))
 				{
 					TreeModelRow lvi = new TreeModelRow(new TreeModelRowColumn[]
 					{