From b415722817e1555d9a6a018ab70faaab0edd263c Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Mon, 20 May 2019 21:35:08 -0400
Subject: [PATCH] Some configuration files are ApplicationFramework-global

---
 .../Configuration/CommandBars.uexml           |  46 +-
 .../Configuration/Commands.uexml              | 704 +++++++++---------
 .../Configuration/MainMenu.uexml              |  30 +-
 .../Languages/English.uexml                   | 328 ++++----
 .../Languages/Japanese.uexml                  | 238 +++---
 .../Common/Reflection.cs                      |   9 +-
 6 files changed, 676 insertions(+), 679 deletions(-)

diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/CommandBars.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/CommandBars.uexml
index 8e2e7703..e6324db7 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/CommandBars.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/CommandBars.uexml
@@ -1,24 +1,22 @@
-<UniversalEditor>
-	<Application>
-		<CommandBars LargeButtons="false" ScreenTips="true" ScreenTipShortcutKeys="true">
-			<CommandBar ID="tbStandard" Title="Standard">
-				<Items>
-					<CommandReference CommandID="FileNew" />
-					<CommandReference CommandID="FileOpen" />
-					<CommandReference CommandID="FileSave" />
-					<CommandReference CommandID="FilePrint" />
-					<Separator />
-					<CommandReference CommandID="EditCut" />
-					<CommandReference CommandID="EditCopy" />
-					<CommandReference CommandID="EditPaste" />
-					<CommandReference CommandID="EditDelete" />
-					<Separator />
-					<CommandReference CommandID="EditUndo" />
-					<CommandReference CommandID="EditRedo" />
-					<Separator />
-					<CommandReference CommandID="Help" />
-				</Items>
-			</CommandBar>
-		</CommandBars>
-	</Application>
-</UniversalEditor>
\ No newline at end of file
+<ApplicationFramework>
+	<CommandBars LargeButtons="false" ScreenTips="true" ScreenTipShortcutKeys="true">
+		<CommandBar ID="tbStandard" Title="Standard">
+			<Items>
+				<CommandReference CommandID="FileNew" />
+				<CommandReference CommandID="FileOpen" />
+				<CommandReference CommandID="FileSave" />
+				<CommandReference CommandID="FilePrint" />
+				<Separator />
+				<CommandReference CommandID="EditCut" />
+				<CommandReference CommandID="EditCopy" />
+				<CommandReference CommandID="EditPaste" />
+				<CommandReference CommandID="EditDelete" />
+				<Separator />
+				<CommandReference CommandID="EditUndo" />
+				<CommandReference CommandID="EditRedo" />
+				<Separator />
+				<CommandReference CommandID="Help" />
+			</Items>
+		</CommandBar>
+	</CommandBars>
+</ApplicationFramework>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/Commands.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/Commands.uexml
index bdf91ab4..39486203 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/Commands.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/Commands.uexml
@@ -1,354 +1,352 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<UniversalEditor>
-	<Application>
-		<Commands>
-			<!-- File -->
-			<Command ID="File">
-				<Items>
-					<CommandReference CommandID="FileNew" />
-					<CommandReference CommandID="FileOpen" />
-					<CommandReference CommandID="FileSave" />
-					<CommandReference CommandID="FileClose" />
-					<Separator />
-					<CommandReference CommandID="FilePrint" />
-					<Separator />
-					<CommandReference CommandID="FileRecentFiles" />
-					<CommandReference CommandID="FileRecentProjects" />
-					<Separator />
-					<CommandReference CommandID="FileRestart" />
-					<CommandReference CommandID="FileExit" />
-				</Items>
-			</Command>
-			<Command ID="FileNew" DefaultCommandID="FileNewDocument">
-				<Items>
-					<!--
-					<CommandReference CommandID="FileNewDocumentFileSystem" />
-					<Separator />
-					-->
-					<CommandReference CommandID="FileNewDocument" />
-					<CommandReference CommandID="FileNewProject" />
-				</Items>
-			</Command>
-			<Command ID="FileNewDocument">
-				<Shortcut Modifiers="Control" Key="N" />
-				<Parameters>
-					<!-- This command takes one parameter which is not set by default -->
-					<Parameter Name="ObjectModelTypeName" />
-				</Parameters>
-			</Command>
-			<Command ID="FileNewDocumentFileSystem" ParentCommandID="FileNewDocument">
-				<!-- Execute FileNewDocument with the specified parameters -->
-				<ParameterValues>
-					<ParameterValue Name="ObjectModelTypeName" Value="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
-				</ParameterValues>
-			</Command>
-			<Command ID="FileNewProject">
-				<Shortcut Modifiers="Control,Shift" Key="N" />
-			</Command>
-			<Command ID="FileOpen" DefaultCommandID="FileOpenDocument">
-				<Items>
-					<CommandReference CommandID="FileOpenDocument" />
-					<CommandReference CommandID="FileOpenProject" />
-				</Items>
-			</Command>
-			<Command ID="FileOpenDocument">
-				<Shortcut Modifiers="Control" Key="O" />
-			</Command>
-			<Command ID="FileOpenProject">
-				<Shortcut Modifiers="Control,Shift" Key="O" />
-			</Command>
-			<Command ID="FileSave" DefaultCommandID="FileSaveDocument">
-				<Items>
-					<CommandReference CommandID="FileSaveDocument" />
-					<CommandReference CommandID="FileSaveDocumentAs" />
-					<Separator />
-					<CommandReference CommandID="FileSaveProject" />
-					<CommandReference CommandID="FileSaveProjectAs" />
-					<Separator />
-					<CommandReference CommandID="FileSaveAll" />
-				</Items>
-			</Command>
-			<Command ID="FileSaveDocument">
-				<Shortcut Modifiers="Control" Key="S" />
-			</Command>
-			<Command ID="FileSaveDocumentAs" />
-			<Command ID="FileSaveProject" />
-			<Command ID="FileSaveProjectAs" />
-			<Command ID="FileSaveAll">
-				<Shortcut Modifiers="Control,Shift" Key="S" />
-			</Command>
-			<Command ID="FileClose">
-				<Items>
-					<CommandReference CommandID="FileCloseDocument" />
-					<CommandReference CommandID="FileCloseProject" />
-					<Separator />
-					<CommandReference CommandID="FileCloseWindow" />
-				</Items>
-			</Command>
-			<Command ID="FileCloseDocument">
-				<Shortcut Modifiers="Control" Key="W" />
-			</Command>
-			<Command ID="FileCloseProject">
-				<Shortcut Modifiers="Control,Shift" Key="W" />
-			</Command>
-			<Command ID="FileCloseWindow">
-				<Shortcut Modifiers="Alt" Key="F4" />
-			</Command>
-			<Command ID="FilePrint">
-				<Shortcut Modifiers="Control" Key="P" />
-			</Command>
-			<Command ID="FileRecentFiles">
-				<Items>
-					<CommandPlaceholder PlaceholderID="RecentFiles" />
-				</Items>
-			</Command>
-			<Command ID="FileRecentProjects">
-				<Items>
-					<CommandPlaceholder PlaceholderID="RecentProjects" />
-				</Items>
-			</Command>
-			<Command ID="FileRestart" />
-			<Command ID="FileExit">
-				<Shortcut Modifiers="Control" Key="Q" />
-			</Command>
-			
-			<!-- Edit -->
-			<Command ID="Edit">
-				<Items>
-					<CommandReference CommandID="EditUndo" />
-					<CommandReference CommandID="EditRedo" />
-					<Separator />
-					<CommandReference CommandID="EditCut" />
-					<CommandReference CommandID="EditCopy" />
-					<CommandReference CommandID="EditPaste" />
-					<CommandReference CommandID="EditDelete" />
-					<Separator />
-					<CommandReference CommandID="EditSelectAll" />
-					<CommandReference CommandID="EditInvertSelection" />
-					<Separator />
-					<CommandReference CommandID="EditFindReplace" />
-					<CommandReference CommandID="EditGoTo" />
-				</Items>
-			</Command>
-			<Command ID="EditUndo">
-				<Shortcut Modifiers="Control" Key="Z" />
-			</Command>
-			<Command ID="EditRedo">
-				<Shortcut Modifiers="Control" Key="Y" />
-			</Command>
-			<Command ID="EditCut">
-				<Shortcut Modifiers="Control" Key="X" />
-			</Command>
-			<Command ID="EditCopy">
-				<Shortcut Modifiers="Control" Key="C" />
-			</Command>
-			<Command ID="EditPaste">
-				<Shortcut Modifiers="Control" Key="V" />
-			</Command>
-			<Command ID="EditDelete">
-				<Shortcut Key="Delete" />
-			</Command>
-			<Command ID="EditSelectAll">
-				<Shortcut Modifiers="Control" Key="A" />
-			</Command>
-			<Command ID="EditInvertSelection">
-				<Shortcut Modifiers="Control,Shift" Key="A" />
-			</Command>
-			<Command ID="EditFindReplace">
-				<Shortcut Modifiers="Control" Key="F" />
-			</Command>
-			<Command ID="EditGoTo">
-				<Shortcut Modifiers="Control" Key="G" />
-			</Command>
-			
-			<!-- View -->
-			<Command ID="View">
-				<Items>
-					<CommandReference CommandID="ViewToolbars" />
-					<CommandReference CommandID="ViewStatusBar" />
-					<Separator />
-					<CommandReference CommandID="ViewPanels" />
-					<Separator />
-					<CommandReference CommandID="ViewPerspective" />
-					<Separator />
-					<CommandReference CommandID="ViewStartPage" />
-					<CommandReference CommandID="ViewFullScreen" />
-					<Separator />
-					<CommandReference CommandID="ViewRefresh" />
-				</Items>
-			</Command>
-			<Command ID="ViewToolbars">
-				<Items>
-					<CommandReference CommandID="ViewToolbarsCustomize" />
-				</Items>
-			</Command>
-			<Command ID="ViewToolbarsCustomize" />
-			<Command ID="ViewStatusBar" />
-			<Command ID="ViewPanels" />
-			<Command ID="ViewPerspective">
-				<Items>
-					<CommandReference CommandID="ViewPerspective1" />
-					<CommandReference CommandID="ViewPerspective2" />
-					<CommandReference CommandID="ViewPerspective3" />
-					<CommandReference CommandID="ViewPerspective4" />
-					<CommandReference CommandID="ViewPerspective5" />
-					<CommandReference CommandID="ViewPerspective6" />
-					<CommandReference CommandID="ViewPerspective7" />
-					<CommandReference CommandID="ViewPerspective8" />
-					<CommandReference CommandID="ViewPerspective9" />
-					<Separator />
-					<CommandReference CommandID="ViewPerspectiveCustomize" />
-				</Items>
-			</Command>
-			<Command ID="ViewPerspective1">
-				<Shortcut Key="TopRow1" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective2">
-				<Shortcut Key="TopRow2" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective3">
-				<Shortcut Key="TopRow3" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective4">
-				<Shortcut Key="TopRow4" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective5">
-				<Shortcut Key="TopRow5" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective6">
-				<Shortcut Key="TopRow6" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective7">
-				<Shortcut Key="TopRow7" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective8">
-				<Shortcut Key="TopRow8" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspective9">
-				<Shortcut Key="TopRow9" Modifiers="Control,Alt" />
-			</Command>
-			<Command ID="ViewPerspectiveCustomize" />
-			
-			<Command ID="ViewStartPage" />
-			<Command ID="ViewFullScreen">
-				<Shortcut Key="F11" />
-			</Command>
-			
-			<!-- Project -->
-			<Command ID="Project">
-				<Items>
-					<CommandReference CommandID="ProjectAddNew" />
-					<CommandReference CommandID="ProjectAddExisting" />
-					<Separator />
-					<CommandReference CommandID="ProjectExclude" />
-					<CommandReference CommandID="ProjectShowAllFiles" />
-					<Separator />
-					<CommandReference CommandID="ProjectProperties" />
-				</Items>
-			</Command>
-			<Command ID="ProjectAddNew">
-				<Shortcut Modifiers="Control" Key="A" />
-			</Command>
-			<Command ID="ProjectAddExisting">
-				<Shortcut Modifiers="Control,Shift" Key="A" />
-			</Command>
-			<Command ID="ProjectExclude" />
-			<Command ID="ProjectShowAllFiles" />
-			<Command ID="ProjectProperties" />
-			
-			<Command ID="Bookmarks">
-				<Items>
-					<CommandReference CommandID="BookmarksAdd" />
-					<CommandReference CommandID="BookmarksAddAll" />
-					<Separator />
-					<CommandReference CommandID="BookmarksManage" />
-				</Items>
-			</Command>
-			<Command ID="BookmarksAdd">
-				<Shortcut Modifiers="Control" Key="D" />
-			</Command>
-			<Command ID="BookmarksAddAll">
-				<Shortcut Modifiers="Control,Shift" Key="D" />
-			</Command>
-			<Command ID="BookmarksManage" />
-			
-			<Command ID="Tools">
-				<Items>
-					<CommandReference CommandID="ToolsSessionManager" />
-					<Separator />
-					<CommandReference CommandID="ToolsExternalTools" />
-					<Separator />
-					<CommandReference CommandID="ToolsCustomize" />
-					<CommandReference CommandID="ToolsOptions" />
-				</Items>
-			</Command>
-			<Command ID="ToolsSessionManager" />
-			<Command ID="ToolsExternalTools">
-				<Items>
-					<CommandPlaceholder PlaceholderID="ExternalTools" />
-					<Separator />
-					<CommandReference CommandID="ToolsExternalToolsCustomize" />
-				</Items>
-			</Command>
-			<Command ID="ToolsExternalToolsCustomize" />
-			
-			<Command ID="ToolsCustomize" />
-			<Command ID="ToolsOptions" />
-			
-			<Command ID="Window">
-				<Items>
-					<CommandReference CommandID="WindowNewWindow" />
-					<CommandReference CommandID="WindowSplit" />
-					<Separator />
-					<CommandReference CommandID="WindowFloat" />
-					<CommandReference CommandID="WindowFloatAll" />
-					<CommandReference CommandID="WindowDock" />
-					<CommandReference CommandID="WindowAutoHide" />
-					<CommandReference CommandID="WindowAutoHideAll" />
-					<CommandReference CommandID="WindowHide" />
-					<Separator />
-					<CommandReference CommandID="WindowPinTab" />
-					<Separator />
-					<CommandReference CommandID="WindowNewTabGroupHorizontal" />
-					<CommandReference CommandID="WindowNewTabGroupVertical" />
-					<CommandReference CommandID="WindowCloseAllDocuments" />
-					<CommandReference CommandID="WindowResetWindowLayout" />
-					<Separator />
-					<CommandReference CommandID="WindowWindows" />
-				</Items>
-			</Command>
-			<Command ID="WindowNewWindow" />
-			<Command ID="WindowSplit" />
-			<Command ID="WindowFloat" />
-			<Command ID="WindowFloatAll" />
-			<Command ID="WindowDock" />
-			<Command ID="WindowAutoHide" />
-			<Command ID="WindowAutoHideAll" />
-			<Command ID="WindowHide" />
-			<Command ID="WindowPinTab" />
-			<Command ID="WindowNewTabGroupHorizontal" />
-			<Command ID="WindowNewTabGroupVertical" />
-			<Command ID="WindowCloseAllDocuments" />
-			<Command ID="WindowResetWindowLayout" />
-			<Command ID="WindowWindows" />
-			
-			<Command ID="Help" DefaultCommandID="HelpViewHelp">
-				<Items>
-					<CommandReference CommandID="HelpViewHelp" />
-					<Separator />
-					<CommandReference CommandID="HelpCustomerFeedbackOptions" />
-					<CommandReference CommandID="HelpLicensingAndActivation" />
-					<Separator />
-					<CommandReference CommandID="HelpSoftwareManager" />
-					<Separator />
-					<CommandReference CommandID="HelpAboutPlatform" />
-				</Items>
-			</Command>
-			<Command ID="HelpViewHelp" />
-			<Command ID="HelpCustomerFeedbackOptions" />
-			<Command ID="HelpLicensingAndActivation" />
-			<Command ID="HelpSoftwareManager" />
-			<Command ID="HelpAboutPlatform" />
-		</Commands>
-	</Application>
-</UniversalEditor>
\ No newline at end of file
+<ApplicationFramework>
+	<Commands>
+		<!-- File -->
+		<Command ID="File">
+			<Items>
+				<CommandReference CommandID="FileNew" />
+				<CommandReference CommandID="FileOpen" />
+				<CommandReference CommandID="FileSave" />
+				<CommandReference CommandID="FileClose" />
+				<Separator />
+				<CommandReference CommandID="FilePrint" />
+				<Separator />
+				<CommandReference CommandID="FileRecentFiles" />
+				<CommandReference CommandID="FileRecentProjects" />
+				<Separator />
+				<CommandReference CommandID="FileRestart" />
+				<CommandReference CommandID="FileExit" />
+			</Items>
+		</Command>
+		<Command ID="FileNew" DefaultCommandID="FileNewDocument">
+			<Items>
+				<!--
+				<CommandReference CommandID="FileNewDocumentFileSystem" />
+				<Separator />
+				-->
+				<CommandReference CommandID="FileNewDocument" />
+				<CommandReference CommandID="FileNewProject" />
+			</Items>
+		</Command>
+		<Command ID="FileNewDocument">
+			<Shortcut Modifiers="Control" Key="N" />
+			<Parameters>
+				<!-- This command takes one parameter which is not set by default -->
+				<Parameter Name="ObjectModelTypeName" />
+			</Parameters>
+		</Command>
+		<Command ID="FileNewDocumentFileSystem" ParentCommandID="FileNewDocument">
+			<!-- Execute FileNewDocument with the specified parameters -->
+			<ParameterValues>
+				<ParameterValue Name="ObjectModelTypeName" Value="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
+			</ParameterValues>
+		</Command>
+		<Command ID="FileNewProject">
+			<Shortcut Modifiers="Control,Shift" Key="N" />
+		</Command>
+		<Command ID="FileOpen" DefaultCommandID="FileOpenDocument">
+			<Items>
+				<CommandReference CommandID="FileOpenDocument" />
+				<CommandReference CommandID="FileOpenProject" />
+			</Items>
+		</Command>
+		<Command ID="FileOpenDocument">
+			<Shortcut Modifiers="Control" Key="O" />
+		</Command>
+		<Command ID="FileOpenProject">
+			<Shortcut Modifiers="Control,Shift" Key="O" />
+		</Command>
+		<Command ID="FileSave" DefaultCommandID="FileSaveDocument">
+			<Items>
+				<CommandReference CommandID="FileSaveDocument" />
+				<CommandReference CommandID="FileSaveDocumentAs" />
+				<Separator />
+				<CommandReference CommandID="FileSaveProject" />
+				<CommandReference CommandID="FileSaveProjectAs" />
+				<Separator />
+				<CommandReference CommandID="FileSaveAll" />
+			</Items>
+		</Command>
+		<Command ID="FileSaveDocument">
+			<Shortcut Modifiers="Control" Key="S" />
+		</Command>
+		<Command ID="FileSaveDocumentAs" />
+		<Command ID="FileSaveProject" />
+		<Command ID="FileSaveProjectAs" />
+		<Command ID="FileSaveAll">
+			<Shortcut Modifiers="Control,Shift" Key="S" />
+		</Command>
+		<Command ID="FileClose">
+			<Items>
+				<CommandReference CommandID="FileCloseDocument" />
+				<CommandReference CommandID="FileCloseProject" />
+				<Separator />
+				<CommandReference CommandID="FileCloseWindow" />
+			</Items>
+		</Command>
+		<Command ID="FileCloseDocument">
+			<Shortcut Modifiers="Control" Key="W" />
+		</Command>
+		<Command ID="FileCloseProject">
+			<Shortcut Modifiers="Control,Shift" Key="W" />
+		</Command>
+		<Command ID="FileCloseWindow">
+			<Shortcut Modifiers="Alt" Key="F4" />
+		</Command>
+		<Command ID="FilePrint">
+			<Shortcut Modifiers="Control" Key="P" />
+		</Command>
+		<Command ID="FileRecentFiles">
+			<Items>
+				<CommandPlaceholder PlaceholderID="RecentFiles" />
+			</Items>
+		</Command>
+		<Command ID="FileRecentProjects">
+			<Items>
+				<CommandPlaceholder PlaceholderID="RecentProjects" />
+			</Items>
+		</Command>
+		<Command ID="FileRestart" />
+		<Command ID="FileExit">
+			<Shortcut Modifiers="Control" Key="Q" />
+		</Command>
+		
+		<!-- Edit -->
+		<Command ID="Edit">
+			<Items>
+				<CommandReference CommandID="EditUndo" />
+				<CommandReference CommandID="EditRedo" />
+				<Separator />
+				<CommandReference CommandID="EditCut" />
+				<CommandReference CommandID="EditCopy" />
+				<CommandReference CommandID="EditPaste" />
+				<CommandReference CommandID="EditDelete" />
+				<Separator />
+				<CommandReference CommandID="EditSelectAll" />
+				<CommandReference CommandID="EditInvertSelection" />
+				<Separator />
+				<CommandReference CommandID="EditFindReplace" />
+				<CommandReference CommandID="EditGoTo" />
+			</Items>
+		</Command>
+		<Command ID="EditUndo">
+			<Shortcut Modifiers="Control" Key="Z" />
+		</Command>
+		<Command ID="EditRedo">
+			<Shortcut Modifiers="Control" Key="Y" />
+		</Command>
+		<Command ID="EditCut">
+			<Shortcut Modifiers="Control" Key="X" />
+		</Command>
+		<Command ID="EditCopy">
+			<Shortcut Modifiers="Control" Key="C" />
+		</Command>
+		<Command ID="EditPaste">
+			<Shortcut Modifiers="Control" Key="V" />
+		</Command>
+		<Command ID="EditDelete">
+			<Shortcut Key="Delete" />
+		</Command>
+		<Command ID="EditSelectAll">
+			<Shortcut Modifiers="Control" Key="A" />
+		</Command>
+		<Command ID="EditInvertSelection">
+			<Shortcut Modifiers="Control,Shift" Key="A" />
+		</Command>
+		<Command ID="EditFindReplace">
+			<Shortcut Modifiers="Control" Key="F" />
+		</Command>
+		<Command ID="EditGoTo">
+			<Shortcut Modifiers="Control" Key="G" />
+		</Command>
+		
+		<!-- View -->
+		<Command ID="View">
+			<Items>
+				<CommandReference CommandID="ViewToolbars" />
+				<CommandReference CommandID="ViewStatusBar" />
+				<Separator />
+				<CommandReference CommandID="ViewPanels" />
+				<Separator />
+				<CommandReference CommandID="ViewPerspective" />
+				<Separator />
+				<CommandReference CommandID="ViewStartPage" />
+				<CommandReference CommandID="ViewFullScreen" />
+				<Separator />
+				<CommandReference CommandID="ViewRefresh" />
+			</Items>
+		</Command>
+		<Command ID="ViewToolbars">
+			<Items>
+				<CommandReference CommandID="ViewToolbarsCustomize" />
+			</Items>
+		</Command>
+		<Command ID="ViewToolbarsCustomize" />
+		<Command ID="ViewStatusBar" />
+		<Command ID="ViewPanels" />
+		<Command ID="ViewPerspective">
+			<Items>
+				<CommandReference CommandID="ViewPerspective1" />
+				<CommandReference CommandID="ViewPerspective2" />
+				<CommandReference CommandID="ViewPerspective3" />
+				<CommandReference CommandID="ViewPerspective4" />
+				<CommandReference CommandID="ViewPerspective5" />
+				<CommandReference CommandID="ViewPerspective6" />
+				<CommandReference CommandID="ViewPerspective7" />
+				<CommandReference CommandID="ViewPerspective8" />
+				<CommandReference CommandID="ViewPerspective9" />
+				<Separator />
+				<CommandReference CommandID="ViewPerspectiveCustomize" />
+			</Items>
+		</Command>
+		<Command ID="ViewPerspective1">
+			<Shortcut Key="TopRow1" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective2">
+			<Shortcut Key="TopRow2" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective3">
+			<Shortcut Key="TopRow3" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective4">
+			<Shortcut Key="TopRow4" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective5">
+			<Shortcut Key="TopRow5" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective6">
+			<Shortcut Key="TopRow6" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective7">
+			<Shortcut Key="TopRow7" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective8">
+			<Shortcut Key="TopRow8" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspective9">
+			<Shortcut Key="TopRow9" Modifiers="Control,Alt" />
+		</Command>
+		<Command ID="ViewPerspectiveCustomize" />
+		
+		<Command ID="ViewStartPage" />
+		<Command ID="ViewFullScreen">
+			<Shortcut Key="F11" />
+		</Command>
+		
+		<!-- Project -->
+		<Command ID="Project">
+			<Items>
+				<CommandReference CommandID="ProjectAddNew" />
+				<CommandReference CommandID="ProjectAddExisting" />
+				<Separator />
+				<CommandReference CommandID="ProjectExclude" />
+				<CommandReference CommandID="ProjectShowAllFiles" />
+				<Separator />
+				<CommandReference CommandID="ProjectProperties" />
+			</Items>
+		</Command>
+		<Command ID="ProjectAddNew">
+			<Shortcut Modifiers="Control" Key="A" />
+		</Command>
+		<Command ID="ProjectAddExisting">
+			<Shortcut Modifiers="Control,Shift" Key="A" />
+		</Command>
+		<Command ID="ProjectExclude" />
+		<Command ID="ProjectShowAllFiles" />
+		<Command ID="ProjectProperties" />
+		
+		<Command ID="Bookmarks">
+			<Items>
+				<CommandReference CommandID="BookmarksAdd" />
+				<CommandReference CommandID="BookmarksAddAll" />
+				<Separator />
+				<CommandReference CommandID="BookmarksManage" />
+			</Items>
+		</Command>
+		<Command ID="BookmarksAdd">
+			<Shortcut Modifiers="Control" Key="D" />
+		</Command>
+		<Command ID="BookmarksAddAll">
+			<Shortcut Modifiers="Control,Shift" Key="D" />
+		</Command>
+		<Command ID="BookmarksManage" />
+		
+		<Command ID="Tools">
+			<Items>
+				<CommandReference CommandID="ToolsSessionManager" />
+				<Separator />
+				<CommandReference CommandID="ToolsExternalTools" />
+				<Separator />
+				<CommandReference CommandID="ToolsCustomize" />
+				<CommandReference CommandID="ToolsOptions" />
+			</Items>
+		</Command>
+		<Command ID="ToolsSessionManager" />
+		<Command ID="ToolsExternalTools">
+			<Items>
+				<CommandPlaceholder PlaceholderID="ExternalTools" />
+				<Separator />
+				<CommandReference CommandID="ToolsExternalToolsCustomize" />
+			</Items>
+		</Command>
+		<Command ID="ToolsExternalToolsCustomize" />
+		
+		<Command ID="ToolsCustomize" />
+		<Command ID="ToolsOptions" />
+		
+		<Command ID="Window">
+			<Items>
+				<CommandReference CommandID="WindowNewWindow" />
+				<CommandReference CommandID="WindowSplit" />
+				<Separator />
+				<CommandReference CommandID="WindowFloat" />
+				<CommandReference CommandID="WindowFloatAll" />
+				<CommandReference CommandID="WindowDock" />
+				<CommandReference CommandID="WindowAutoHide" />
+				<CommandReference CommandID="WindowAutoHideAll" />
+				<CommandReference CommandID="WindowHide" />
+				<Separator />
+				<CommandReference CommandID="WindowPinTab" />
+				<Separator />
+				<CommandReference CommandID="WindowNewTabGroupHorizontal" />
+				<CommandReference CommandID="WindowNewTabGroupVertical" />
+				<CommandReference CommandID="WindowCloseAllDocuments" />
+				<CommandReference CommandID="WindowResetWindowLayout" />
+				<Separator />
+				<CommandReference CommandID="WindowWindows" />
+			</Items>
+		</Command>
+		<Command ID="WindowNewWindow" />
+		<Command ID="WindowSplit" />
+		<Command ID="WindowFloat" />
+		<Command ID="WindowFloatAll" />
+		<Command ID="WindowDock" />
+		<Command ID="WindowAutoHide" />
+		<Command ID="WindowAutoHideAll" />
+		<Command ID="WindowHide" />
+		<Command ID="WindowPinTab" />
+		<Command ID="WindowNewTabGroupHorizontal" />
+		<Command ID="WindowNewTabGroupVertical" />
+		<Command ID="WindowCloseAllDocuments" />
+		<Command ID="WindowResetWindowLayout" />
+		<Command ID="WindowWindows" />
+		
+		<Command ID="Help" DefaultCommandID="HelpViewHelp">
+			<Items>
+				<CommandReference CommandID="HelpViewHelp" />
+				<Separator />
+				<CommandReference CommandID="HelpCustomerFeedbackOptions" />
+				<CommandReference CommandID="HelpLicensingAndActivation" />
+				<Separator />
+				<CommandReference CommandID="HelpSoftwareManager" />
+				<Separator />
+				<CommandReference CommandID="HelpAboutPlatform" />
+			</Items>
+		</Command>
+		<Command ID="HelpViewHelp" />
+		<Command ID="HelpCustomerFeedbackOptions" />
+		<Command ID="HelpLicensingAndActivation" />
+		<Command ID="HelpSoftwareManager" />
+		<Command ID="HelpAboutPlatform" />
+	</Commands>
+</ApplicationFramework>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/MainMenu.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/MainMenu.uexml
index 5275d841..b6713ac5 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/MainMenu.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Configuration/MainMenu.uexml
@@ -1,16 +1,14 @@
-<UniversalEditor>
-	<Application>
-		<MainMenu>
-			<Items>
-				<CommandReference CommandID="File" />
-				<CommandReference CommandID="Edit" />
-				<CommandReference CommandID="View" />
-				<CommandReference CommandID="Project" />
-				<CommandReference CommandID="Bookmarks" />
-				<CommandReference CommandID="Tools" />
-				<CommandReference CommandID="Window" />
-				<CommandReference CommandID="Help" />
-			</Items>
-		</MainMenu>
-	</Application>
-</UniversalEditor>
\ No newline at end of file
+<ApplicationFramework>
+	<MainMenu>
+		<Items>
+			<CommandReference CommandID="File" />
+			<CommandReference CommandID="Edit" />
+			<CommandReference CommandID="View" />
+			<CommandReference CommandID="Project" />
+			<CommandReference CommandID="Bookmarks" />
+			<CommandReference CommandID="Tools" />
+			<CommandReference CommandID="Window" />
+			<CommandReference CommandID="Help" />
+		</Items>
+	</MainMenu>
+</ApplicationFramework>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/English.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/English.uexml
index be2b803f..452073bc 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/English.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/English.uexml
@@ -1,166 +1,164 @@
-<UniversalEditor>
-	<Application>
-		<Languages DefaultLanguageID="English">
-			<Language ID="English">
-				<StringTable>
-					<StringTableEntry ID="ApplicationTitle" Value="Universal Editor" />
-				</StringTable>
-				<OptionPanels>
-					<OptionPanel ID="{6B7D5857-CDC7-482E-A6D1-A13E0E273C45}" Title="Application">
-						<Content>
-							<OptionGroup ID="{1195B01E-3A92-4657-8571-5C4E79532330}" Title="Window layout">
-								<RadioButton ID="{7DA81430-F43B-43F0-8304-26AF47359B9B}" Title="_Tabbed documents" />
-								<RadioButton ID="{9126C5AD-E8EB-490E-8FE9-D642D3047498}" Title="_Multiple documents" />
-								<RadioButton ID="{2B66334E-1461-4EC1-B3B9-6A81F8DFE463}" Title="_Separate windows" />
-							</OptionGroup>
-							<OptionGroup ID="{84A39D7E-5315-4C8E-8807-A91AD69CC253}" Title="Title bar behavior">
-								<RadioButton ID="{C14E3ED3-BC07-4485-8094-8CAB40FFB4DD}" Title="Do not display document-specific information in the title bar" />
-								<RadioButton ID="{E7E7AEBE-FD6E-4B25-96B4-F8DC9E8E7DE5}" Title="Display the file _name of the current in the title bar" />
-								<RadioButton ID="{C409D76D-268E-479E-A089-3AC967991F2B}" Title="Display the full _path to the current document in the title bar" />
-							</OptionGroup>
-							<OptionGroup ID="{BBF31831-AD72-4F15-9D46-5679E5F60125}" Title="Extensions">
-								<CheckBox ID="{D3FA1630-EA02-4220-98E9-6D90431955A6}" Title="Enable access to extensions in the Online _Gallery" />
-								<TextBox ID="{61C019AB-8E3E-43E4-8545-2BF342474C4B}" Title="Online gallery _URL:" />
-								<CheckBox ID="{F9C65C4C-C8EE-43B0-94B6-D29FF957C7F8}" Title="Automatically check for up_dates to installed extensions" />
-								<CheckBox ID="{8C135D1E-D647-4843-B826-52B442B0B2EA}" Title="Load _per-user extensions when running as Administrator" />
-							</OptionGroup>
-						</Content>
-						<OptionPanels>
-							<OptionPanel ID="{F14BC2DB-DD07-4579-92D0-7E467758B284}" Title="Documents">
-								<Content>
-									<File ID="{5BAC3438-91F6-4120-A389-DF8CD797AF01}" Title="Default user docu_ments location" />
-									<File ID="{2D4F5BDE-CA6C-41CA-AF36-696DF1219377}" Title="Default user _projects location" />
-									<CheckBox ID="{EE6D4B91-A5F4-452D-A718-E63E12EC539C}" Title="_Detect when file is changed in another program" />
-									<CheckBox ID="{80B3F83D-85E4-4BFC-9611-82BDA8C619C0}" Title="Automatically re_load the changed file without prompting if the file has been saved" />
-									<CheckBox ID="{148B7EF4-337B-4569-8FCD-E2CFD230C96E}" Title="Allo_w editing of read-only files, warn when attempting to save" />
-									<CheckBox ID="{BDC05545-3F90-4B3D-AD7E-B74B3FAF365F}" Title="K_eep a record of recently-opened documents" />
-									<Number ID="{9376CE92-B15D-43D0-B367-E8F2916C1C98}" Prefix="Store a ma_ximum of " Suffix="items in the Recent Files list" />
-									<CheckBox ID="{40BFB292-8FB4-46D9-9986-6619424F84E5}" Title="K_eep a record of recently-opened projects" />
-									<Number ID="{06913599-E19A-4C85-BD8B-D5BCFFD3C34A}" Prefix="Store a ma_ximum of " Suffix="items in the Recent Projects list" />
-									<CheckBox ID="{B6772081-4283-4F6A-B248-B4CD310D0BB1}" Title="Keep a record of _changes made to each document (undo history)" />
-									<Number ID="{45E113A5-137C-49EE-8AC5-E1CB652E4B98}" Prefix="Store a ma_ximum of " Suffix="items in the undo history" />
-									<CheckBox ID="{10BA02ED-053D-4EF8-8D46-7F268EC5137A}" Title="_Save automatic recovery information" />
-									<Number ID="{14C57DB1-3CD0-4A4B-9CAE-C2F71CCF2E9D}" Prefix="Sa_ve every" Suffix="minutes" />
-									<Number ID="{A3BC89EE-4FCC-40A2-A4BC-637BACF2C59F}" Prefix="_Keep for" Suffix="days" />
-									<Directory ID="{83B97141-AB4E-402F-A6E4-2F1659273EA8}" Title="Automatic _recovery location" />
-								</Content>
-							</OptionPanel>
-						</OptionPanels>
-					</OptionPanel>
-				</OptionPanels>
-				<Commands>
-					<!-- File -->
-					<Command ID="File" Title="_File" />
-					<Command ID="FileNew" Title="_New" />
-					<Command ID="FileNewDocumentFileSystem" Title="_File System" />
-					
-					<Command ID="FileNewDocument" Title="_Document..." />
-					<Command ID="FileNewProject" Title="_Project/Solution..." />
-					
-					<Command ID="FileOpen" Title="_Open" />
-					<Command ID="FileOpenDocument" Title="_Document..." />
-					<Command ID="FileOpenProject" Title="_Project/Solution..." />
-					
-					<Command ID="FileSave" Title="_Save" />
-					<Command ID="FileSaveDocument" Title="_Document..." />
-					<Command ID="FileSaveDocumentAs" Title="Document with Other N_ame..." />
-					<Command ID="FileSaveProject" Title="_Project/Solution..." />
-					<Command ID="FileSaveProjectAs" Title="Pro_ject/Solution with Other Name..." />
-					<Command ID="FileSaveAll" Title="A_ll Documents and Projects" />
-					
-					<Command ID="FileClose" Title="_Close" />
-					<Command ID="FileCloseDocument" Title="_Document" />
-					<Command ID="FileCloseProject" Title="_Project/Solution" />
-					<Command ID="FileCloseWindow" Title="_Window" />
-					
-					<Command ID="FilePrint" Title="_Print..." />
+<ApplicationFramework>
+	<Languages DefaultLanguageID="English">
+		<Language ID="English">
+			<StringTable>
+				<StringTableEntry ID="ApplicationTitle" Value="Universal Editor" />
+			</StringTable>
+			<OptionPanels>
+				<OptionPanel ID="{6B7D5857-CDC7-482E-A6D1-A13E0E273C45}" Title="Application">
+					<Content>
+						<OptionGroup ID="{1195B01E-3A92-4657-8571-5C4E79532330}" Title="Window layout">
+							<RadioButton ID="{7DA81430-F43B-43F0-8304-26AF47359B9B}" Title="_Tabbed documents" />
+							<RadioButton ID="{9126C5AD-E8EB-490E-8FE9-D642D3047498}" Title="_Multiple documents" />
+							<RadioButton ID="{2B66334E-1461-4EC1-B3B9-6A81F8DFE463}" Title="_Separate windows" />
+						</OptionGroup>
+						<OptionGroup ID="{84A39D7E-5315-4C8E-8807-A91AD69CC253}" Title="Title bar behavior">
+							<RadioButton ID="{C14E3ED3-BC07-4485-8094-8CAB40FFB4DD}" Title="Do not display document-specific information in the title bar" />
+							<RadioButton ID="{E7E7AEBE-FD6E-4B25-96B4-F8DC9E8E7DE5}" Title="Display the file _name of the current in the title bar" />
+							<RadioButton ID="{C409D76D-268E-479E-A089-3AC967991F2B}" Title="Display the full _path to the current document in the title bar" />
+						</OptionGroup>
+						<OptionGroup ID="{BBF31831-AD72-4F15-9D46-5679E5F60125}" Title="Extensions">
+							<CheckBox ID="{D3FA1630-EA02-4220-98E9-6D90431955A6}" Title="Enable access to extensions in the Online _Gallery" />
+							<TextBox ID="{61C019AB-8E3E-43E4-8545-2BF342474C4B}" Title="Online gallery _URL:" />
+							<CheckBox ID="{F9C65C4C-C8EE-43B0-94B6-D29FF957C7F8}" Title="Automatically check for up_dates to installed extensions" />
+							<CheckBox ID="{8C135D1E-D647-4843-B826-52B442B0B2EA}" Title="Load _per-user extensions when running as Administrator" />
+						</OptionGroup>
+					</Content>
+					<OptionPanels>
+						<OptionPanel ID="{F14BC2DB-DD07-4579-92D0-7E467758B284}" Title="Documents">
+							<Content>
+								<File ID="{5BAC3438-91F6-4120-A389-DF8CD797AF01}" Title="Default user docu_ments location" />
+								<File ID="{2D4F5BDE-CA6C-41CA-AF36-696DF1219377}" Title="Default user _projects location" />
+								<CheckBox ID="{EE6D4B91-A5F4-452D-A718-E63E12EC539C}" Title="_Detect when file is changed in another program" />
+								<CheckBox ID="{80B3F83D-85E4-4BFC-9611-82BDA8C619C0}" Title="Automatically re_load the changed file without prompting if the file has been saved" />
+								<CheckBox ID="{148B7EF4-337B-4569-8FCD-E2CFD230C96E}" Title="Allo_w editing of read-only files, warn when attempting to save" />
+								<CheckBox ID="{BDC05545-3F90-4B3D-AD7E-B74B3FAF365F}" Title="K_eep a record of recently-opened documents" />
+								<Number ID="{9376CE92-B15D-43D0-B367-E8F2916C1C98}" Prefix="Store a ma_ximum of " Suffix="items in the Recent Files list" />
+								<CheckBox ID="{40BFB292-8FB4-46D9-9986-6619424F84E5}" Title="K_eep a record of recently-opened projects" />
+								<Number ID="{06913599-E19A-4C85-BD8B-D5BCFFD3C34A}" Prefix="Store a ma_ximum of " Suffix="items in the Recent Projects list" />
+								<CheckBox ID="{B6772081-4283-4F6A-B248-B4CD310D0BB1}" Title="Keep a record of _changes made to each document (undo history)" />
+								<Number ID="{45E113A5-137C-49EE-8AC5-E1CB652E4B98}" Prefix="Store a ma_ximum of " Suffix="items in the undo history" />
+								<CheckBox ID="{10BA02ED-053D-4EF8-8D46-7F268EC5137A}" Title="_Save automatic recovery information" />
+								<Number ID="{14C57DB1-3CD0-4A4B-9CAE-C2F71CCF2E9D}" Prefix="Sa_ve every" Suffix="minutes" />
+								<Number ID="{A3BC89EE-4FCC-40A2-A4BC-637BACF2C59F}" Prefix="_Keep for" Suffix="days" />
+								<Directory ID="{83B97141-AB4E-402F-A6E4-2F1659273EA8}" Title="Automatic _recovery location" />
+							</Content>
+						</OptionPanel>
+					</OptionPanels>
+				</OptionPanel>
+			</OptionPanels>
+			<Commands>
+				<!-- File -->
+				<Command ID="File" Title="_File" />
+				<Command ID="FileNew" Title="_New" />
+				<Command ID="FileNewDocumentFileSystem" Title="_File System" />
+				
+				<Command ID="FileNewDocument" Title="_Document..." />
+				<Command ID="FileNewProject" Title="_Project/Solution..." />
+				
+				<Command ID="FileOpen" Title="_Open" />
+				<Command ID="FileOpenDocument" Title="_Document..." />
+				<Command ID="FileOpenProject" Title="_Project/Solution..." />
+				
+				<Command ID="FileSave" Title="_Save" />
+				<Command ID="FileSaveDocument" Title="_Document..." />
+				<Command ID="FileSaveDocumentAs" Title="Document with Other N_ame..." />
+				<Command ID="FileSaveProject" Title="_Project/Solution..." />
+				<Command ID="FileSaveProjectAs" Title="Pro_ject/Solution with Other Name..." />
+				<Command ID="FileSaveAll" Title="A_ll Documents and Projects" />
+				
+				<Command ID="FileClose" Title="_Close" />
+				<Command ID="FileCloseDocument" Title="_Document" />
+				<Command ID="FileCloseProject" Title="_Project/Solution" />
+				<Command ID="FileCloseWindow" Title="_Window" />
+				
+				<Command ID="FilePrint" Title="_Print..." />
 
-					<Command ID="FileRestart" Title="_Restart" />
-					<Command ID="FileExit" Title="E_xit" />
-					
-					<!-- Edit -->
-					<Command ID="Edit" Title="_Edit" />
-					<Command ID="EditUndo" Title="_Undo" />
-					<Command ID="EditRedo" Title="_Redo" />
-					<Command ID="EditCut" Title="Cu_t" />
-					<Command ID="EditCopy" Title="_Copy" />
-					<Command ID="EditPaste" Title="_Paste" />
-					<Command ID="EditDelete" Title="_Delete" />
-					<Command ID="EditSelectAll" Title="Select _All" />
-					<Command ID="EditInvertSelection" Title="_Invert Selection" />
-					<Command ID="EditFindReplace" Title="_Find/Replace..." />
-					<Command ID="EditGoTo" Title="_Go To..." />
-					
-					<!-- View -->
-					<Command ID="View" Title="_View" />
-					<Command ID="ViewToolbars" Title="_Toolbars" />
-					<Command ID="ViewToolbarsCustomize" Title="_Customize..." />
-					<Command ID="ViewStatusBar" Title="Status _Bar" />
-					
-					<Command ID="ViewPerspective" Title="P_erspective" />
-					<Command ID="ViewPerspective1" Title="_1 Perspective 1" />
-					<Command ID="ViewPerspective2" Title="_2 Perspective 2" />
-					<Command ID="ViewPerspective3" Title="_3 Perspective 3" />
-					<Command ID="ViewPerspective4" Title="_4 Perspective 4" />
-					<Command ID="ViewPerspective5" Title="_5 Perspective 5" />
-					<Command ID="ViewPerspective6" Title="_6 Perspective 6" />
-					<Command ID="ViewPerspective7" Title="_7 Perspective 7" />
-					<Command ID="ViewPerspective8" Title="_8 Perspective 8" />
-					<Command ID="ViewPerspective9" Title="_9 Perspective 9" />
-					<Command ID="ViewPerspectiveCustomize" Title="C_ustomize..." />
-					
-					<Command ID="ViewPanels" Title="_Panels" />
-					<Command ID="ViewStartPage" Title="Start Pa_ge" />
-					<Command ID="ViewFullScreen" Title="F_ull Screen" />
-					
-					<!-- Project -->
-					<Command ID="Project" Title="_Project" />
-					<Command ID="ProjectAddNew" Title="Add Ne_w Item..." />
-					<Command ID="ProjectAddExisting" Title="Add Existin_g Item..." />
-					<Command ID="ProjectExclude" Title="Exclude from Pro_ject" />
-					<Command ID="ProjectShowAllFiles" Title="Sh_ow All Files" />
-					<Command ID="ProjectProperties" Title="Project _Properties..." />
-					
-					<!-- Bookmarks -->
-					<Command ID="Bookmarks" Title="Book_marks" />
-					<Command ID="BookmarksAdd" Title="Add to Boo_kmarks" />
-					<Command ID="BookmarksAddAll" Title="Add _All to Bookmarks" />
-					<Command ID="BookmarksManage" Title="_Manage Bookmarks..." />
-					
-					<!-- Tools -->
-					<Command ID="Tools" Title="_Tools" />
-					<Command ID="ToolsSessionManager" Title="_Session Manager..." />
-					<Command ID="ToolsExternalTools" Title="_External Tools..." />
-					<Command ID="ToolsExternalToolsCustomize" Title="_Customize..." />
-					<Command ID="ToolsCustomize" Title="_Customize..." />
-					<Command ID="ToolsOptions" Title="_Options..." />
-					
-					<!-- Window -->
-					<Command ID="Window" Title="_Window" />
-					<Command ID="WindowNewWindow" Title="_New Window" />
-					<Command ID="WindowSplit" Title="S_plit" />
-					<Command ID="WindowFloat" Title="_Float" />
-					<Command ID="WindowFloatAll" Title="Float All" />
-					<Command ID="WindowDock" Title="Doc_k" />
-					<Command ID="WindowAutoHide" Title="_Auto Hide" />
-					<Command ID="WindowAutoHideAll" Title="A_uto Hide All" />
-					<Command ID="WindowHide" Title="_Hide" />
-					<Command ID="WindowPinTab" Title="_Pin Tab" />
-					<Command ID="WindowNewTabGroupHorizontal" Title="New Hori_zontal Tab Group" />
-					<Command ID="WindowNewTabGroupVertical" Title="New _Vertical Tab Group" />
-					<Command ID="WindowCloseAllDocuments" Title="Close A_ll Documents" />
-					<Command ID="WindowResetWindowLayout" Title="_Reset Window Layout" />
-					<Command ID="WindowWindows" Title="_Windows..." />
-					
-					<!-- Help -->
-					<Command ID="Help" Title="_Help" />
-					<Command ID="HelpViewHelp" Title="View _Help" />
-					<Command ID="HelpCustomerFeedbackOptions" Title="Customer _Feedback Options..." />
-					<Command ID="HelpLicensingAndActivation" Title="_Licensing and Activation..." />
-					<Command ID="HelpSoftwareManager" Title="Software and Update _Manager..." />
-					<Command ID="HelpAboutPlatform" Title="_About {0}" />
-				</Commands>
-			</Language>
-		</Languages>
-	</Application>
-</UniversalEditor>
\ No newline at end of file
+				<Command ID="FileRestart" Title="_Restart" />
+				<Command ID="FileExit" Title="E_xit" />
+				
+				<!-- Edit -->
+				<Command ID="Edit" Title="_Edit" />
+				<Command ID="EditUndo" Title="_Undo" />
+				<Command ID="EditRedo" Title="_Redo" />
+				<Command ID="EditCut" Title="Cu_t" />
+				<Command ID="EditCopy" Title="_Copy" />
+				<Command ID="EditPaste" Title="_Paste" />
+				<Command ID="EditDelete" Title="_Delete" />
+				<Command ID="EditSelectAll" Title="Select _All" />
+				<Command ID="EditInvertSelection" Title="_Invert Selection" />
+				<Command ID="EditFindReplace" Title="_Find/Replace..." />
+				<Command ID="EditGoTo" Title="_Go To..." />
+				
+				<!-- View -->
+				<Command ID="View" Title="_View" />
+				<Command ID="ViewToolbars" Title="_Toolbars" />
+				<Command ID="ViewToolbarsCustomize" Title="_Customize..." />
+				<Command ID="ViewStatusBar" Title="Status _Bar" />
+				
+				<Command ID="ViewPerspective" Title="P_erspective" />
+				<Command ID="ViewPerspective1" Title="_1 Perspective 1" />
+				<Command ID="ViewPerspective2" Title="_2 Perspective 2" />
+				<Command ID="ViewPerspective3" Title="_3 Perspective 3" />
+				<Command ID="ViewPerspective4" Title="_4 Perspective 4" />
+				<Command ID="ViewPerspective5" Title="_5 Perspective 5" />
+				<Command ID="ViewPerspective6" Title="_6 Perspective 6" />
+				<Command ID="ViewPerspective7" Title="_7 Perspective 7" />
+				<Command ID="ViewPerspective8" Title="_8 Perspective 8" />
+				<Command ID="ViewPerspective9" Title="_9 Perspective 9" />
+				<Command ID="ViewPerspectiveCustomize" Title="C_ustomize..." />
+				
+				<Command ID="ViewPanels" Title="_Panels" />
+				<Command ID="ViewStartPage" Title="Start Pa_ge" />
+				<Command ID="ViewFullScreen" Title="F_ull Screen" />
+				
+				<!-- Project -->
+				<Command ID="Project" Title="_Project" />
+				<Command ID="ProjectAddNew" Title="Add Ne_w Item..." />
+				<Command ID="ProjectAddExisting" Title="Add Existin_g Item..." />
+				<Command ID="ProjectExclude" Title="Exclude from Pro_ject" />
+				<Command ID="ProjectShowAllFiles" Title="Sh_ow All Files" />
+				<Command ID="ProjectProperties" Title="Project _Properties..." />
+				
+				<!-- Bookmarks -->
+				<Command ID="Bookmarks" Title="Book_marks" />
+				<Command ID="BookmarksAdd" Title="Add to Boo_kmarks" />
+				<Command ID="BookmarksAddAll" Title="Add _All to Bookmarks" />
+				<Command ID="BookmarksManage" Title="_Manage Bookmarks..." />
+				
+				<!-- Tools -->
+				<Command ID="Tools" Title="_Tools" />
+				<Command ID="ToolsSessionManager" Title="_Session Manager..." />
+				<Command ID="ToolsExternalTools" Title="_External Tools..." />
+				<Command ID="ToolsExternalToolsCustomize" Title="_Customize..." />
+				<Command ID="ToolsCustomize" Title="_Customize..." />
+				<Command ID="ToolsOptions" Title="_Options..." />
+				
+				<!-- Window -->
+				<Command ID="Window" Title="_Window" />
+				<Command ID="WindowNewWindow" Title="_New Window" />
+				<Command ID="WindowSplit" Title="S_plit" />
+				<Command ID="WindowFloat" Title="_Float" />
+				<Command ID="WindowFloatAll" Title="Float All" />
+				<Command ID="WindowDock" Title="Doc_k" />
+				<Command ID="WindowAutoHide" Title="_Auto Hide" />
+				<Command ID="WindowAutoHideAll" Title="A_uto Hide All" />
+				<Command ID="WindowHide" Title="_Hide" />
+				<Command ID="WindowPinTab" Title="_Pin Tab" />
+				<Command ID="WindowNewTabGroupHorizontal" Title="New Hori_zontal Tab Group" />
+				<Command ID="WindowNewTabGroupVertical" Title="New _Vertical Tab Group" />
+				<Command ID="WindowCloseAllDocuments" Title="Close A_ll Documents" />
+				<Command ID="WindowResetWindowLayout" Title="_Reset Window Layout" />
+				<Command ID="WindowWindows" Title="_Windows..." />
+				
+				<!-- Help -->
+				<Command ID="Help" Title="_Help" />
+				<Command ID="HelpViewHelp" Title="View _Help" />
+				<Command ID="HelpCustomerFeedbackOptions" Title="Customer _Feedback Options..." />
+				<Command ID="HelpLicensingAndActivation" Title="_Licensing and Activation..." />
+				<Command ID="HelpSoftwareManager" Title="Software and Update _Manager..." />
+				<Command ID="HelpAboutPlatform" Title="_About {0}" />
+			</Commands>
+		</Language>
+	</Languages>
+</ApplicationFramework>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/Japanese.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/Japanese.uexml
index 05406c4f..cae5546e 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/Japanese.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Languages/Japanese.uexml
@@ -1,122 +1,120 @@
-<UniversalEditor>
-	<Application>
-		<Languages>
-			<Language ID="Japanese">
-				<StringTable>
-					<StringTableEntry ID="ApplicationTitle" Value="ユニバーサル·エディター" />
-					<StringTableEntry ID="Contributors" Value="貢献者" />
-				</StringTable>
-				<Commands>
-					<!-- File -->
-					<Command ID="File" Title="ファイル(_F)" />
-					<Command ID="FileNew" Title="新しい(_N)" />
-					<Command ID="FileNewDocument" Title="ドキュメント(_D)" />
-					<Command ID="FileNewProject" Title="プロジェクト／ソリューション(_P)" />
-					
-					<Command ID="FileOpen" Title="オープン(_O)" />
-					<Command ID="FileOpenDocument" Title="ドキュメント(_D)" />
-					<Command ID="FileOpenProject" Title="プロジェクト／ソリューション(_P)" />
-					
-					<Command ID="FileSave" Title="保存(_S)" />
-					<Command ID="FileSaveDocument" Title="ドキュメント(_D)" />
-					<Command ID="FileSaveDocumentAs" Title="文書としての保存(_A)" />
-					<Command ID="FileSaveProject" Title="プロジェクト／ソリューション(_P)" />
-					<Command ID="FileSaveProjectAs" Title="プロジェクト／ソリューションとしての保存(_J)" />
-					<Command ID="FileSaveAll" Title="すべての保存(_L)" />
-					
-					<Command ID="FileClose" Title="クローズ(_C)" />
-					<Command ID="FileCloseDocument" Title="ドキュメント(_D)" />
-					<Command ID="FileCloseProject" Title="プロジェクト／ソリューション(_P)" />
-					<Command ID="FileCloseWindow" Title="ウィンドウ(_W)" />
-					
-					<Command ID="FilePrint" Title="印刷(_P)" />
+<ApplicationFramework>
+	<Languages>
+		<Language ID="Japanese">
+			<StringTable>
+				<StringTableEntry ID="ApplicationTitle" Value="ユニバーサル·エディター" />
+				<StringTableEntry ID="Contributors" Value="貢献者" />
+			</StringTable>
+			<Commands>
+				<!-- File -->
+				<Command ID="File" Title="ファイル(_F)" />
+				<Command ID="FileNew" Title="新しい(_N)" />
+				<Command ID="FileNewDocument" Title="ドキュメント(_D)" />
+				<Command ID="FileNewProject" Title="プロジェクト／ソリューション(_P)" />
+				
+				<Command ID="FileOpen" Title="オープン(_O)" />
+				<Command ID="FileOpenDocument" Title="ドキュメント(_D)" />
+				<Command ID="FileOpenProject" Title="プロジェクト／ソリューション(_P)" />
+				
+				<Command ID="FileSave" Title="保存(_S)" />
+				<Command ID="FileSaveDocument" Title="ドキュメント(_D)" />
+				<Command ID="FileSaveDocumentAs" Title="文書としての保存(_A)" />
+				<Command ID="FileSaveProject" Title="プロジェクト／ソリューション(_P)" />
+				<Command ID="FileSaveProjectAs" Title="プロジェクト／ソリューションとしての保存(_J)" />
+				<Command ID="FileSaveAll" Title="すべての保存(_L)" />
+				
+				<Command ID="FileClose" Title="クローズ(_C)" />
+				<Command ID="FileCloseDocument" Title="ドキュメント(_D)" />
+				<Command ID="FileCloseProject" Title="プロジェクト／ソリューション(_P)" />
+				<Command ID="FileCloseWindow" Title="ウィンドウ(_W)" />
+				
+				<Command ID="FilePrint" Title="印刷(_P)" />
 
-					<Command ID="FileRestart" Title="リスタート(_R)" />
-					<Command ID="FileExit" Title="出口(_X)" />
-					
-					<!-- Edit -->
-					<Command ID="Edit" Title="編集(_E)" />
-					<Command ID="EditUndo" Title="取り消す(_U)" />
-					<Command ID="EditRedo" Title="やり直す(_R)" />
-					<Command ID="EditCut" Title="カット(_T)" />
-					<Command ID="EditCopy" Title="コピー(C)" />
-					<Command ID="EditPaste" Title="ペースト(_P)" />
-					<Command ID="EditDelete" Title="削除する(_D)" />
-					<Command ID="EditSelectAll" Title="すべてを選択(_A)" />
-					<Command ID="EditInvertSelection" Title="_Invert Selection" />
-					<Command ID="EditFindReplace" Title="検索と置換(_F)" />
-					<Command ID="EditGoTo" Title="に行く(_G)" />
-					
-					<!-- View -->
-					<Command ID="View" Title="_View" />
-					<Command ID="ViewToolbars" Title="_Toolbars" />
-					<Command ID="ViewToolbarsCustomize" Title="_Customize..." />
-					<Command ID="ViewStatusBar" Title="Status _Bar" />
-					<Command ID="ViewPanels" Title="_Panels" />
+				<Command ID="FileRestart" Title="リスタート(_R)" />
+				<Command ID="FileExit" Title="出口(_X)" />
+				
+				<!-- Edit -->
+				<Command ID="Edit" Title="編集(_E)" />
+				<Command ID="EditUndo" Title="取り消す(_U)" />
+				<Command ID="EditRedo" Title="やり直す(_R)" />
+				<Command ID="EditCut" Title="カット(_T)" />
+				<Command ID="EditCopy" Title="コピー(C)" />
+				<Command ID="EditPaste" Title="ペースト(_P)" />
+				<Command ID="EditDelete" Title="削除する(_D)" />
+				<Command ID="EditSelectAll" Title="すべてを選択(_A)" />
+				<Command ID="EditInvertSelection" Title="_Invert Selection" />
+				<Command ID="EditFindReplace" Title="検索と置換(_F)" />
+				<Command ID="EditGoTo" Title="に行く(_G)" />
+				
+				<!-- View -->
+				<Command ID="View" Title="_View" />
+				<Command ID="ViewToolbars" Title="_Toolbars" />
+				<Command ID="ViewToolbarsCustomize" Title="_Customize..." />
+				<Command ID="ViewStatusBar" Title="Status _Bar" />
+				<Command ID="ViewPanels" Title="_Panels" />
 
-					<Command ID="ViewPerspective" Title="P_erspective" />
-					<Command ID="ViewPerspective1" Title="_1 Perspective 1" />
-					<Command ID="ViewPerspective2" Title="_2 Perspective 2" />
-					<Command ID="ViewPerspective3" Title="_3 Perspective 3" />
-					<Command ID="ViewPerspective4" Title="_4 Perspective 4" />
-					<Command ID="ViewPerspective5" Title="_5 Perspective 5" />
-					<Command ID="ViewPerspective6" Title="_6 Perspective 6" />
-					<Command ID="ViewPerspective7" Title="_7 Perspective 7" />
-					<Command ID="ViewPerspective8" Title="_8 Perspective 8" />
-					<Command ID="ViewPerspective9" Title="_9 Perspective 9" />
-					<Command ID="ViewPerspectiveCustomize" Title="C_ustomize..." />
-					
-					<Command ID="ViewStartPage" Title="Start Pa_ge" />
-					<Command ID="ViewFullScreen" Title="F_ull Screen" />
-					
-					<!-- Project -->
-					<Command ID="Project" Title="_Project" />
-					<Command ID="ProjectAddNew" Title="Add Ne_w Item..." />
-					<Command ID="ProjectAddExisting" Title="Add Existin_g Item..." />
-					<Command ID="ProjectExclude" Title="Exclude from Pro_ject" />
-					<Command ID="ProjectShowAllFiles" Title="Sh_ow All Files" />
-					<Command ID="ProjectProperties" Title="Project _Properties..." />
-					
-					<!-- Bookmarks -->
-					<Command ID="Bookmarks" Title="Book_marks" />
-					<Command ID="BookmarksAdd" Title="Add to Boo_kmarks" />
-					<Command ID="BookmarksAddAll" Title="Add _All to Bookmarks" />
-					<Command ID="BookmarksManage" Title="_Manage Bookmarks..." />
-					
-					<!-- Tools -->
-					<Command ID="Tools" Title="_Tools" />
-					<Command ID="ToolsSessionManager" Title="_Session Manager..." />
-					<Command ID="ToolsExternalTools" Title="_External Tools..." />
-					<Command ID="ToolsExternalToolsCustomize" Title="_Customize..." />
-					<Command ID="ToolsCustomize" Title="_Customize..." />
-					<Command ID="ToolsOptions" Title="_Options..." />
-					
-					<!-- Window -->
-					<Command ID="Window" Title="_Window" />
-					<Command ID="WindowNewWindow" Title="_New Window" />
-					<Command ID="WindowSplit" Title="S_plit" />
-					<Command ID="WindowFloat" Title="_Float" />
-					<Command ID="WindowFloatAll" Title="Float All" />
-					<Command ID="WindowDock" Title="Doc_k" />
-					<Command ID="WindowAutoHide" Title="_Auto Hide" />
-					<Command ID="WindowAutoHideAll" Title="A_uto Hide All" />
-					<Command ID="WindowHide" Title="_Hide" />
-					<Command ID="WindowPinTab" Title="_Pin Tab" />
-					<Command ID="WindowNewTabGroupHorizontal" Title="New Hori_zontal Tab Group" />
-					<Command ID="WindowNewTabGroupVertical" Title="New _Vertical Tab Group" />
-					<Command ID="WindowCloseAllDocuments" Title="Close A_ll Documents" />
-					<Command ID="WindowResetWindowLayout" Title="_Reset Window Layout" />
-					<Command ID="WindowWindows" Title="_Windows..." />
-					
-					<!-- Help -->
-					<Command ID="Help" Title="_Help" />
-					<Command ID="HelpViewHelp" Title="View _Help" />
-					<Command ID="HelpCustomerFeedbackOptions" Title="Customer _Feedback Options..." />
-					<Command ID="HelpLicensingAndActivation" Title="_Licensing and Activation..." />
-					<Command ID="HelpSoftwareManager" Title="Software and Update _Manager..." />
-					<Command ID="HelpAboutPlatform" Title="_About {0}" />
-				</Commands>
-			</Language>
-		</Languages>
-	</Application>
-</UniversalEditor>
\ No newline at end of file
+				<Command ID="ViewPerspective" Title="P_erspective" />
+				<Command ID="ViewPerspective1" Title="_1 Perspective 1" />
+				<Command ID="ViewPerspective2" Title="_2 Perspective 2" />
+				<Command ID="ViewPerspective3" Title="_3 Perspective 3" />
+				<Command ID="ViewPerspective4" Title="_4 Perspective 4" />
+				<Command ID="ViewPerspective5" Title="_5 Perspective 5" />
+				<Command ID="ViewPerspective6" Title="_6 Perspective 6" />
+				<Command ID="ViewPerspective7" Title="_7 Perspective 7" />
+				<Command ID="ViewPerspective8" Title="_8 Perspective 8" />
+				<Command ID="ViewPerspective9" Title="_9 Perspective 9" />
+				<Command ID="ViewPerspectiveCustomize" Title="C_ustomize..." />
+				
+				<Command ID="ViewStartPage" Title="Start Pa_ge" />
+				<Command ID="ViewFullScreen" Title="F_ull Screen" />
+				
+				<!-- Project -->
+				<Command ID="Project" Title="_Project" />
+				<Command ID="ProjectAddNew" Title="Add Ne_w Item..." />
+				<Command ID="ProjectAddExisting" Title="Add Existin_g Item..." />
+				<Command ID="ProjectExclude" Title="Exclude from Pro_ject" />
+				<Command ID="ProjectShowAllFiles" Title="Sh_ow All Files" />
+				<Command ID="ProjectProperties" Title="Project _Properties..." />
+				
+				<!-- Bookmarks -->
+				<Command ID="Bookmarks" Title="Book_marks" />
+				<Command ID="BookmarksAdd" Title="Add to Boo_kmarks" />
+				<Command ID="BookmarksAddAll" Title="Add _All to Bookmarks" />
+				<Command ID="BookmarksManage" Title="_Manage Bookmarks..." />
+				
+				<!-- Tools -->
+				<Command ID="Tools" Title="_Tools" />
+				<Command ID="ToolsSessionManager" Title="_Session Manager..." />
+				<Command ID="ToolsExternalTools" Title="_External Tools..." />
+				<Command ID="ToolsExternalToolsCustomize" Title="_Customize..." />
+				<Command ID="ToolsCustomize" Title="_Customize..." />
+				<Command ID="ToolsOptions" Title="_Options..." />
+				
+				<!-- Window -->
+				<Command ID="Window" Title="_Window" />
+				<Command ID="WindowNewWindow" Title="_New Window" />
+				<Command ID="WindowSplit" Title="S_plit" />
+				<Command ID="WindowFloat" Title="_Float" />
+				<Command ID="WindowFloatAll" Title="Float All" />
+				<Command ID="WindowDock" Title="Doc_k" />
+				<Command ID="WindowAutoHide" Title="_Auto Hide" />
+				<Command ID="WindowAutoHideAll" Title="A_uto Hide All" />
+				<Command ID="WindowHide" Title="_Hide" />
+				<Command ID="WindowPinTab" Title="_Pin Tab" />
+				<Command ID="WindowNewTabGroupHorizontal" Title="New Hori_zontal Tab Group" />
+				<Command ID="WindowNewTabGroupVertical" Title="New _Vertical Tab Group" />
+				<Command ID="WindowCloseAllDocuments" Title="Close A_ll Documents" />
+				<Command ID="WindowResetWindowLayout" Title="_Reset Window Layout" />
+				<Command ID="WindowWindows" Title="_Windows..." />
+				
+				<!-- Help -->
+				<Command ID="Help" Title="_Help" />
+				<Command ID="HelpViewHelp" Title="View _Help" />
+				<Command ID="HelpCustomerFeedbackOptions" Title="Customer _Feedback Options..." />
+				<Command ID="HelpLicensingAndActivation" Title="_Licensing and Activation..." />
+				<Command ID="HelpSoftwareManager" Title="Software and Update _Manager..." />
+				<Command ID="HelpAboutPlatform" Title="_About {0}" />
+			</Commands>
+		</Language>
+	</Languages>
+</ApplicationFramework>
\ No newline at end of file
diff --git a/CSharp/Libraries/UniversalEditor.Essential/Common/Reflection.cs b/CSharp/Libraries/UniversalEditor.Essential/Common/Reflection.cs
index 4c6e1702..1213a23b 100644
--- a/CSharp/Libraries/UniversalEditor.Essential/Common/Reflection.cs
+++ b/CSharp/Libraries/UniversalEditor.Essential/Common/Reflection.cs
@@ -217,7 +217,14 @@ namespace UniversalEditor.Common
 						xdf.IncludeTemplates = false;
 						ObjectModel om = mom;
 
-						Document.Load(om, xdf, new FileAccessor(fileName, false, false, false), true);
+						try
+						{
+							Document.Load(om, xdf, new FileAccessor(fileName, false, false, false), true);
+						}
+						catch (InvalidDataFormatException ex)
+						{
+							// ignore it
+						}
 
 						foreach (ProjectType projtype in mom.ProjectTypes)
 						{