diff --git a/Applications/UniversalEditor.Bootstrapper/Program.cs b/Applications/UniversalEditor.Bootstrapper/Program.cs
index aead2279..c59ed387 100644
--- a/Applications/UniversalEditor.Bootstrapper/Program.cs
+++ b/Applications/UniversalEditor.Bootstrapper/Program.cs
@@ -28,8 +28,13 @@ using UniversalEditor.UserInterface;
 
 namespace UniversalEditor.Bootstrapper
 {
-	static class Program
+	public class Program : EditorApplication
 	{
+		public Program()
+		{
+			ShortName = "universal-editor";
+		}
+
 		/// <summary>
 		/// The main entry point for the application.
 		/// </summary>
@@ -51,23 +56,7 @@ namespace UniversalEditor.Bootstrapper
 				return;
 			}
 
-			// why do we do this? because, if the class was static, it tries to load the 'Engine' type
-			// from another library immediately... if it can't be found, it crashes. this way, if it
-			// can't be found, we can still catch it since it's loaded on-demand rather than
-			// immediately.
-			(new BootstrapperInstance()).Main();
-		}
-
-		private class BootstrapperInstance
-		{
-			public void Main()
-			{
-				if (!Engine.Execute())
-				{
-					MessageDialog.ShowDialog("No engines are available to launch this application.", "Error", MessageDialogButtons.OK, MessageDialogIcon.Error);
-					return;
-				}
-			}
+			(new Program()).Start();
 		}
 	}
 }
diff --git a/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj b/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
index f2bc04b6..49b5bacc 100644
--- a/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
+++ b/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
@@ -68,6 +68,10 @@
       <Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
       <Name>MBS.Framework.UserInterface</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
+      <Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
+      <Name>MBS.Framework</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="application.xml" />
diff --git a/Applications/UniversalEditor.ConsoleBootstrapper/Program.cs b/Applications/UniversalEditor.ConsoleBootstrapper/Program.cs
index 9f9da3b0..2db8afd1 100644
--- a/Applications/UniversalEditor.ConsoleBootstrapper/Program.cs
+++ b/Applications/UniversalEditor.ConsoleBootstrapper/Program.cs
@@ -5,7 +5,7 @@ using UniversalEditor.UserInterface;
 
 namespace UniversalEditor.ConsoleBootstrapper
 {
-	class Program
+	public class Program : EditorApplication
 	{
 		/// <summary>
 		/// The main entry point for the application.
@@ -13,7 +13,8 @@ namespace UniversalEditor.ConsoleBootstrapper
 		[STAThread]
 		static void Main()
 		{
-			if (!Engine.Execute())
+			int exitCode = (new Program()).Start();
+			if (exitCode != 0)
 			{
 				ConsoleColor oldcolor = Console.ForegroundColor;
 				Console.ForegroundColor = ConsoleColor.Red;
diff --git a/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj b/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
index 095e7d2a..4a55e336 100644
--- a/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
+++ b/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
@@ -63,6 +63,14 @@
       <Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
       <Name>UniversalEditor.Essential</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\MBS.Framework\MBS.Framework\MBS.Framework.csproj">
+      <Project>{00266B21-35C9-4A7F-A6BA-D54D7FDCC25C}</Project>
+      <Name>MBS.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\MBS.Framework.UserInterface\Libraries\MBS.Framework.UserInterface\MBS.Framework.UserInterface.csproj">
+      <Project>{29E1C1BB-3EA5-4062-B62F-85EEC703FE07}</Project>
+      <Name>MBS.Framework.UserInterface</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
index cf78797c..04aea714 100644
--- a/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
+++ b/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
@@ -362,7 +362,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 				{
 					case DocumentPropertiesDialogMode.Open:
 					{
-						if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
+						if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
 						{
 							return;
 						}
@@ -371,7 +371,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 					}
 					case DocumentPropertiesDialogMode.Save:
 					{
-						if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
+						if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
 						{
 							return;
 						}
@@ -420,7 +420,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 			{
 				case DocumentPropertiesDialogMode.Open:
 				{
-					if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref acc, CustomOptionDialogType.Import))
+					if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref acc, CustomOptionDialogType.Import))
 					{
 						return;
 					}
@@ -429,7 +429,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 				}
 				case DocumentPropertiesDialogMode.Save:
 				{
-					if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref acc, CustomOptionDialogType.Export))
+					if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref acc, CustomOptionDialogType.Export))
 					{
 						return;
 					}
@@ -491,7 +491,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 						{
 							case DocumentPropertiesDialogMode.Open:
 							{
-								if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
+								if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
 								{
 									return;
 								}
@@ -499,7 +499,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 							}
 							case DocumentPropertiesDialogMode.Save:
 							{
-								if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
+								if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, CustomOptionDialogType.Export))
 								{
 									return;
 								}
@@ -536,7 +536,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 		private void cmdDataFormatOptions_Click(object sender, EventArgs e)
 		{
 			DataFormat df = DataFormat;
-			if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, Mode == DocumentPropertiesDialogMode.Open ? CustomOptionDialogType.Import : CustomOptionDialogType.Export))
+			if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, Mode == DocumentPropertiesDialogMode.Open ? CustomOptionDialogType.Import : CustomOptionDialogType.Export))
 			{
 				return;
 			}
@@ -547,7 +547,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 		private void cmdAccessorOptions_Click(object sender, EventArgs e)
 		{
 			Accessor acc = Accessor;
-			if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref acc, Mode == DocumentPropertiesDialogMode.Open ? CustomOptionDialogType.Import : CustomOptionDialogType.Export))
+			if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref acc, Mode == DocumentPropertiesDialogMode.Open ? CustomOptionDialogType.Import : CustomOptionDialogType.Export))
 			{
 				return;
 			}
diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
index 5147d696..25921c3e 100644
--- a/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
+++ b/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialogV2.cs
@@ -104,7 +104,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 			}
 
 			Accessor acc = accref.Create ();
-			Engine.CurrentEngine.ApplyCustomOptions(acc, coll);
+			((EditorApplication)Application.Instance).ApplyCustomOptions(acc, coll);
 
 			Accessor = acc;
 
diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs
index 5425c13d..fe7b7fa7 100644
--- a/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs
+++ b/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs
@@ -20,6 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using MBS.Framework;
 using MBS.Framework.UserInterface;
 using MBS.Framework.UserInterface.Controls;
 using MBS.Framework.UserInterface.Controls.ListView;
@@ -44,11 +45,11 @@ namespace UniversalEditor.UserInterface.Dialogs
 		{
 			base.OnCreated(e);
 
-			for (int i = 0; i < Engine.CurrentEngine.BookmarksManager.FileNames.Count; i++)
+			for (int i = 0; i < ((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count; i++)
 			{
-				_FileNames.Add(Engine.CurrentEngine.BookmarksManager.FileNames[i]);
+				_FileNames.Add(((EditorApplication)Application.Instance).BookmarksManager.FileNames[i]);
 
-				string filepath = Engine.CurrentEngine.BookmarksManager.FileNames[i];
+				string filepath = ((EditorApplication)Application.Instance).BookmarksManager.FileNames[i];
 				string filetitle = System.IO.Path.GetFileName(filepath);
 
 				tm.Rows.Add(new TreeModelRow(new TreeModelRowColumn[]
@@ -65,10 +66,10 @@ namespace UniversalEditor.UserInterface.Dialogs
 		[EventHandler(nameof(cmdOK), "Click")]
 		private void cmdOK_Click(object sender, EventArgs e)
 		{
-			Engine.CurrentEngine.BookmarksManager.FileNames.Clear();
+			((EditorApplication)Application.Instance).BookmarksManager.FileNames.Clear();
 			for (int i = 0; i < _FileNames.Count; i++)
 			{
-				Engine.CurrentEngine.BookmarksManager.FileNames.Add(_FileNames[i]);
+				((EditorApplication)Application.Instance).BookmarksManager.FileNames.Add(_FileNames[i]);
 			}
 			Close();
 		}
@@ -108,7 +109,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 		{
 			int index = e.Row.GetExtraData<int>("index");
 
-			Engine.CurrentEngine.LastWindow.OpenFile(Engine.CurrentEngine.BookmarksManager.FileNames[index]);
+			((EditorApplication)Application.Instance).LastWindow.OpenFile(((EditorApplication)Application.Instance).BookmarksManager.FileNames[index]);
 			Close();
 		}
 
diff --git a/Libraries/UniversalEditor.UserInterface/EditorApplication.cs b/Libraries/UniversalEditor.UserInterface/EditorApplication.cs
index 2ced8ac8..756c4c5d 100644
--- a/Libraries/UniversalEditor.UserInterface/EditorApplication.cs
+++ b/Libraries/UniversalEditor.UserInterface/EditorApplication.cs
@@ -1,16 +1,84 @@
 
 using System;
+using System.Collections.Generic;
 using MBS.Framework;
+using MBS.Framework.Settings;
 using MBS.Framework.UserInterface;
+using MBS.Framework.UserInterface.Controls.Docking;
+using MBS.Framework.UserInterface.Controls.ListView;
+using MBS.Framework.UserInterface.Dialogs;
+using UniversalEditor.Accessors;
+using UniversalEditor.ObjectModels.Markup;
+using UniversalEditor.ObjectModels.PropertyList;
+using UniversalEditor.UserInterface.Dialogs;
+using UniversalEditor.UserInterface.Panels;
 
 namespace UniversalEditor.UserInterface
 {
 	public class EditorApplication : UIApplication, IHostApplication
 	{
-		/// <summary>
-		/// Gets or sets the current window of the host application.
-		/// </summary>
-		public IHostApplicationWindow CurrentWindow { get { return UniversalEditor.UserInterface.Engine.CurrentEngine.LastWindow; } set { UniversalEditor.UserInterface.Engine.CurrentEngine.LastWindow = value; } }
+		public EditorApplication()
+		{
+			Title = "Universal Editor";
+
+			CommandLine.Options.Add("command", '\0', null, CommandLineOptionValueType.Multiple);
+
+			ID = new Guid("{b359fe9a-080a-43fc-ae38-00ba7ac1703e}");
+			UniqueName = "net.alcetech.UniversalEditor";
+			ShortName = "universal-editor";
+		}
+
+		public ConfigurationManager ConfigurationManager { get; } = new ConfigurationManager();
+		public RecentFileManager RecentFileManager { get; } = new RecentFileManager();
+		public BookmarksManager BookmarksManager { get; } = new BookmarksManager();
+		public SessionManager SessionManager { get; } = new SessionManager();
+
+		protected override void OnStartup(EventArgs e)
+		{
+			base.OnStartup(e);
+
+			string[] args1 = Environment.GetCommandLineArgs();
+			string[] args = new string[args1.Length - 1];
+			Array.Copy(args1, 1, args, 0, args.Length);
+
+			System.Collections.ObjectModel.Collection<string> selectedFileNames = new System.Collections.ObjectModel.Collection<string>();
+			if (selectedFileNames.Count == 0 || ConfigurationManager.GetValue<bool>(new string[] { "Application", "Startup", "ForceLoadStartupFileNames" }, false))
+			{
+				object[] oStartupFileNames = ConfigurationManager.GetValue<object[]>(new string[] { "Application", "Startup", "FileNames" }, new object[0]);
+				for (int i = 0; i < oStartupFileNames.Length; i++)
+				{
+					string startupFileName = oStartupFileNames[i].ToString();
+					selectedFileNames.Add(startupFileName);
+				}
+			}
+			foreach (string commandLineArgument in args)
+			{
+				selectedFileNames.Add(commandLineArgument);
+			}
+			mvarSelectedFileNames = new System.Collections.ObjectModel.ReadOnlyCollection<string>(selectedFileNames);
+
+			TemporaryFileManager.RegisterTemporaryDirectory();
+
+			BeforeInitialization();
+
+			// Initialize the branding for the selected application
+			InitializeBranding();
+
+			Initialize();
+		}
+		protected override void OnStopped(EventArgs e)
+		{
+			base.OnStopped(e);
+
+
+			SessionManager.Save();
+			BookmarksManager.Save();
+			RecentFileManager.Save();
+			ConfigurationManager.Save();
+
+			TemporaryFileManager.UnregisterTemporaryDirectory();
+		}
+
 		/// <summary>
 		/// Gets or sets the output window of the host application, where other plugins can read from and write to.
 		/// </summary>
@@ -57,5 +125,1121 @@ namespace UniversalEditor.UserInterface
 			}
 			return base.FindContextInternal(contextID);
 		}
+
+
+		public bool ShowCustomOptionDialog(ref DataFormat df, CustomOptionDialogType type)
+		{
+			SettingsProvider coll = null;
+			DataFormatReference dfr = df.MakeReference();
+
+			if (type == CustomOptionDialogType.Export)
+			{
+				coll = dfr.ExportOptions;
+			}
+			else
+			{
+				coll = dfr.ImportOptions;
+			}
+			if (coll == null) return true;
+			if (coll.Count == 0) return true;
+
+			bool retval = ShowCustomOptionDialog(ref coll, dfr.Title + " Options", delegate (object sender, EventArgs e)
+			{
+				ShowAboutDialog(dfr);
+			});
+
+			if (retval)
+			{
+				ApplyCustomOptions(df, coll);
+				return true;
+			}
+			return false;
+		}
+		public bool ShowCustomOptionDialog(ref Accessor df, CustomOptionDialogType type)
+		{
+			if (df == null) return true;
+
+			SettingsProvider coll = null;
+			AccessorReference dfr = df.MakeReference();
+
+			if (type == CustomOptionDialogType.Export)
+			{
+				coll = dfr.ExportOptions;
+			}
+			else
+			{
+				coll = dfr.ImportOptions;
+			}
+			if (coll == null) return true;
+			if (coll.Count == 0) return true;
+
+			bool retval = ShowCustomOptionDialog(ref coll, dfr.Title + " Options");
+
+			if (retval)
+			{
+				ApplyCustomOptions(df, coll);
+				return true;
+			}
+			return false;
+		}
+
+		public void ApplyCustomOptions(object obj, SettingsProvider coll)
+		{
+			if (obj == null) return;
+
+			foreach (SettingsGroup sg in coll.SettingsGroups)
+			{
+				foreach (Setting eo in sg.Settings)
+				{
+					System.Reflection.PropertyInfo pi = obj.GetType().GetProperty(eo.Name);
+					if (pi == null) continue;
+
+					if (eo is RangeSetting)
+					{
+						RangeSetting itm = (eo as RangeSetting);
+						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
+					}
+					else if (eo is BooleanSetting)
+					{
+						BooleanSetting itm = (eo as BooleanSetting);
+						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
+					}
+					else if (eo is ChoiceSetting)
+					{
+						object choice = (eo as ChoiceSetting).GetValue();
+						if (choice != null)
+						{
+							Type[] interfaces = pi.PropertyType.GetInterfaces();
+							bool convertible = false;
+							foreach (Type t in interfaces)
+							{
+								if (t == typeof(IConvertible))
+								{
+									convertible = true;
+									break;
+								}
+							}
+							if (convertible)
+							{
+								pi.SetValue(obj, Convert.ChangeType(choice, pi.PropertyType), null);
+							}
+							else
+							{
+								pi.SetValue(obj, choice, null);
+							}
+						}
+					}
+					else if (eo is TextSetting)
+					{
+						TextSetting itm = (eo as TextSetting);
+						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
+					}
+					else if (eo is FileSetting)
+					{
+						FileSetting itm = (eo as FileSetting);
+						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
+					}
+				}
+			}
+		}
+
+
+
+		// ================ BEGIN: HERE BE DRAGONS
+
+		#region implemented abstract members of Engine
+		protected void BeforeInitialization()
+		{
+			// Application.EnableVisualStyles();
+			// Application.SetCompatibleTextRenderingDefault(false);
+
+			// TODO: figure out why this is being done on BeforeInitialization and whether we could move it to after
+			//       the configuration is initialized, so we can specify the user's favorite theme in a configuration file
+
+			// AwesomeControls.Theming.BuiltinThemes. theme = new AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme(AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme.ColorMode.Dark);
+			// theme.UseAllCapsMenus = false;
+			// theme.SetStatusBarState(AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme.StatusBarState.Initial);
+			// AwesomeControls.Theming.BuiltinThemes.Office2003Theme theme = new AwesomeControls.Theming.BuiltinThemes.Office2003Theme();
+			// AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme theme = new AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme();
+			// AwesomeControls.Theming.BuiltinThemes.SlickTheme theme = new AwesomeControls.Theming.BuiltinThemes.SlickTheme();
+
+			// Office 2000  =   {105843D0-2F26-4CB7-86AB-10A449815C19}
+			// Office 2007	=	{4D86F538-E277-4E6F-9CAC-60F82D49A19D}
+			// VS2012-Dark	=	{25134C94-B1EB-4C38-9B5B-A2E29FC57AE1}
+			// VS2012-Light	=	{54CE64B1-2DE3-4147-B499-03F0934AFD37}
+			// VS2012-Blue	=	{898A65FC-8D08-46F1-BB94-2BF666AC996E}
+
+			// AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{54CE64B1-2DE3-4147-B499-03F0934AFD37}"));
+			// AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{105843D0-2F26-4CB7-86AB-10A449815C19}"));
+			// if (theme != null) AwesomeControls.Theming.Theme.CurrentTheme = theme;
+
+			// AwesomeControls.Theming.Theme.CurrentTheme.Properties["UseAllCapsMenus"] = false;
+
+			ConfigurationFileNameFilter = "*.uexml";
+
+			BeforeShutdown += Application_BeforeShutdown;
+			AfterConfigurationLoaded += Application_AfterConfigurationLoaded;
+			Startup += Application_Startup;
+			Activated += Application_Activated;
+
+			Initialize();
+		}
+
+		void Application_AfterConfigurationLoaded(object sender, EventArgs e)
+		{
+			#region Global Configuration
+			{
+				UpdateSplashScreenStatus("Loading global configuration");
+
+				MarkupTagElement tagConfiguration = (((UIApplication)Application.Instance).RawMarkup.FindElement("UniversalEditor", "Configuration") as MarkupTagElement);
+				if (tagConfiguration != null)
+				{
+					foreach (MarkupElement el in tagConfiguration.Elements)
+					{
+						MarkupTagElement tag = (el as MarkupTagElement);
+						if (tag == null) continue;
+						LoadConfiguration(tag);
+					}
+				}
+			}
+			#endregion
+			#region Object Model Configuration
+			{
+				UpdateSplashScreenStatus("Loading object model configuration");
+
+				MarkupTagElement tagObjectModels = (((UIApplication)Application.Instance).RawMarkup.FindElement("UniversalEditor", "ObjectModels") as MarkupTagElement);
+				if (tagObjectModels != null)
+				{
+					MarkupTagElement tagDefault = (tagObjectModels.Elements["Default"] as MarkupTagElement);
+					if (tagDefault != null)
+					{
+						ObjectModelReference[] omrs = UniversalEditor.Common.Reflection.GetAvailableObjectModels();
+						MarkupAttribute attVisible = tagDefault.Attributes["Visible"];
+						foreach (ObjectModelReference omr in omrs)
+						{
+							if (attVisible != null) omr.Visible = (attVisible.Value == "true");
+						}
+					}
+
+					foreach (MarkupElement el in tagObjectModels.Elements)
+					{
+						MarkupTagElement tag = (el as MarkupTagElement);
+						if (tag == null) continue;
+						if (tag.FullName == "ObjectModel")
+						{
+							MarkupAttribute attTypeName = tag.Attributes["TypeName"];
+							MarkupAttribute attID = tag.Attributes["ID"];
+							MarkupAttribute attVisible = tag.Attributes["Visible"];
+
+							if (attTypeName != null)
+							{
+								ObjectModelReference omr = UniversalEditor.Common.Reflection.GetAvailableObjectModelByTypeName(attTypeName.Value);
+								if (attVisible != null) omr.Visible = (attVisible.Value == "true");
+							}
+							else
+							{
+								ObjectModelReference omr = UniversalEditor.Common.Reflection.GetAvailableObjectModelByID(new Guid(attID.Value));
+								if (attVisible != null) omr.Visible = (attVisible.Value == "true");
+							}
+						}
+					}
+				}
+			}
+			#endregion
+
+			UpdateSplashScreenStatus("Loading object models...");
+			UniversalEditor.Common.Reflection.GetAvailableObjectModels();
+
+			UpdateSplashScreenStatus("Loading data formats...");
+			UniversalEditor.Common.Reflection.GetAvailableDataFormats();
+
+			// Initialize Recent File Manager
+			RecentFileManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "RecentItems.xml";
+			RecentFileManager.Load();
+			RefreshRecentFilesList();
+
+			// Initialize Bookmarks Manager
+			BookmarksManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "Bookmarks.xml";
+			BookmarksManager.Load();
+
+			// Initialize Session Manager
+			SessionManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "Sessions.xml";
+			SessionManager.Load();
+
+			// load editors into memory so we don't wait 10-15 seconds before opening a file
+			Common.Reflection.GetAvailableEditors();
+
+			AfterInitialization();
+		}
+
+
+		private void AddRecentMenuItem(string FileName)
+		{
+			Command mnuFileRecentFiles = ((UIApplication)Application.Instance).Commands["FileRecentFiles"];
+
+			Command mnuFileRecentFile = new Command();
+			mnuFileRecentFile.ID = "FileRecentFile_" + FileName;
+			mnuFileRecentFile.Title = System.IO.Path.GetFileName(FileName);
+			// mnuFileRecentFile.ToolTipText = FileName;
+			((UIApplication)Application.Instance).Commands.Add(mnuFileRecentFile);
+
+			CommandReferenceCommandItem tsmi = new CommandReferenceCommandItem("FileRecentFile_" + FileName);
+			mnuFileRecentFiles.Items.Add(tsmi);
+		}
+		private void RefreshRecentFilesList()
+		{
+			Command mnuFileRecentFiles = ((UIApplication)Application.Instance).Commands["FileRecentFiles"];
+			if (mnuFileRecentFiles != null)
+			{
+				mnuFileRecentFiles.Items.Clear();
+				foreach (string fileName in RecentFileManager.FileNames)
+				{
+					AddRecentMenuItem(fileName);
+				}
+				mnuFileRecentFiles.Visible = (mnuFileRecentFiles.Items.Count > 0);
+			}
+
+			Command mnuFileRecentProjects = ((UIApplication)Application.Instance).Commands["FileRecentProjects"];
+			if (mnuFileRecentProjects != null)
+			{
+				mnuFileRecentProjects.Visible = (mnuFileRecentProjects.Items.Count > 0);
+			}
+			// mnuFileSep3.Visible = ((mnuFileRecentFiles.DropDownItems.Count > 0) || (mnuFileRecentProjects.DropDownItems.Count > 0));
+		}
+
+		void Application_BeforeShutdown(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			for (int i = 0; i < ((UIApplication)Application.Instance).Windows.Count; i++)
+			{
+				MainWindow mw = (((UIApplication)Application.Instance).Windows[i] as MainWindow);
+				if (mw == null) continue;
+
+				if (!mw.Close())
+				{
+					e.Cancel = true;
+					break;
+				}
+			}
+		}
+
+
+		void Application_Startup(object sender, EventArgs e)
+		{
+		}
+
+		void Application_Activated(object sender, ApplicationActivatedEventArgs e)
+		{
+			if (LastWindow != null)
+			{
+				LastWindow.OpenFile(e.CommandLine.FileNames.ToArray());
+			}
+			else
+			{
+				OpenWindow(e.CommandLine.FileNames.ToArray());
+			}
+
+			List<string> commandsToExecute = (((UIApplication)Application.Instance).CommandLine.Options.GetValueOrDefault<List<string>>("command", null));
+			if (commandsToExecute != null)
+			{
+				for (int i = 0; i < commandsToExecute.Count; i++)
+				{
+					((UIApplication)Application.Instance).ExecuteCommand(commandsToExecute[i]);
+				}
+			}
+		}
+
+		protected void MainLoop()
+		{
+			switch (System.Environment.OSVersion.Platform)
+			{
+				case PlatformID.MacOSX:
+				case PlatformID.Unix:
+				{
+					// Glue.ApplicationInformation.ApplicationDataPath = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] { "universal-editor", "plugins" });
+					break;
+				}
+				case PlatformID.Win32NT:
+				case PlatformID.Win32S:
+				case PlatformID.Win32Windows:
+				case PlatformID.WinCE:
+				case PlatformID.Xbox:
+				{
+					// Glue.ApplicationInformation.ApplicationDataPath = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] { "Universal Editor", "Plugins" });
+					break;
+				}
+			}
+
+			// Glue.ApplicationEventEventArgs e = new Glue.ApplicationEventEventArgs(Glue.Common.Constants.EventNames.ApplicationStart);
+			// Glue.Common.Methods.SendApplicationEvent(e);
+			// if (e.CancelApplication) return;
+
+			/*
+			PieMenuManager.Title = "Universal Editor pre-alpha build";
+
+			PieMenuItemGroup row1 = new PieMenuItemGroup();
+			row1.Title = "Tools";
+			row1.Items.Add("atlMFCTraceTool", "ATL/MFC Trace Tool");
+			row1.Items.Add("textEditor", "Text Editor");
+			PieMenuManager.Groups.Add(row1);
+			*/
+
+#if !DEBUG
+			// Application.ThreadException += Application_ThreadException;
+#endif
+			Application.Instance.Start();
+
+			// Glue.Common.Methods.SendApplicationEvent(new Glue.ApplicationEventEventArgs(Glue.Common.Constants.EventNames.ApplicationStop));
+		}
+
+		public void ShowAboutDialog(DataFormatReference dfr)
+		{
+			if (dfr == null)
+			{
+				string dlgfilename = ExpandRelativePath("~/Dialogs/AboutDialog.glade");
+				if (dlgfilename != null)
+				{
+					Dialogs.AboutDialog dlg = new Dialogs.AboutDialog();
+					dlg.ShowDialog();
+				}
+				else
+				{
+					MBS.Framework.UserInterface.Dialogs.AboutDialog dlg = new MBS.Framework.UserInterface.Dialogs.AboutDialog();
+					dlg.ProgramName = Title;
+					dlg.Version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
+					dlg.Copyright = String.Format("(c) 1997-{0} {1}", DateTime.Now.Year, "Michael Becker");
+					dlg.Comments = "A modular, extensible document editor";
+					dlg.LicenseType = LicenseType.GPL30;
+					dlg.ShowDialog();
+				}
+			}
+			else
+			{
+				DataFormatAboutDialog dlg = new DataFormatAboutDialog();
+				dlg.DataFormatReference = dfr;
+				dlg.ShowDialog();
+			}
+		}
+		public bool ShowCustomOptionDialog(ref SettingsProvider customOptions, string title = null, EventHandler aboutButtonClicked = null)
+		{
+			SettingsDialog dlg = new SettingsDialog();
+			dlg.Text = title ?? "Options";
+			dlg.SettingsProfiles.Clear();
+
+			dlg.SettingsProviders.Clear();
+			dlg.SettingsProviders.Add(customOptions);
+
+			if (dlg.ShowDialog() == DialogResult.OK)
+			{
+				return true;
+			}
+			return false;
+		}
+		#endregion
+
+		private void Bookmarks_Bookmark_Click(object sender, EventArgs e)
+		{
+			Command cmd = (Command)sender;
+			int i = Int32.Parse(cmd.ID.Substring("Bookmarks_Bookmark".Length));
+			LastWindow.OpenFile(BookmarksManager.FileNames[i]);
+		}
+
+		private void AfterInitialization()
+		{
+			if (BookmarksManager.FileNames.Count > 0)
+			{
+				Command mnuBookmarks = Application.Instance.Commands["Bookmarks"];
+				if (mnuBookmarks != null)
+				{
+					mnuBookmarks.Items.Add(new SeparatorCommandItem());
+					for (int i = 0; i < BookmarksManager.FileNames.Count; i++)
+					{
+						Application.Instance.Commands.Add(new Command(String.Format("Bookmarks_Bookmark{0}", i.ToString()), System.IO.Path.GetFileName(((EditorApplication)Application.Instance).BookmarksManager.FileNames[i]).Replace("_", "__")));
+						mnuBookmarks.Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", i.ToString())));
+
+						Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", i.ToString()), Bookmarks_Bookmark_Click);
+					}
+				}
+			}
+
+			// Initialize all the commands that are common to UniversalEditor
+			#region File
+			Application.Instance.AttachCommandEventHandler("FileNewDocument", delegate (object sender, EventArgs e)
+			{
+				LastWindow.NewFile();
+			});
+			Application.Instance.AttachCommandEventHandler("FileNewProject", delegate (object sender, EventArgs e)
+			{
+				LastWindow.NewProject();
+			});
+			Application.Instance.AttachCommandEventHandler("FileOpenDocument", delegate (object sender, EventArgs e)
+			{
+				LastWindow.OpenFile();
+			});
+			Application.Instance.AttachCommandEventHandler("FileOpenProject", delegate (object sender, EventArgs e)
+			{
+				LastWindow.OpenProject();
+			});
+			Application.Instance.AttachCommandEventHandler("FileSaveDocument", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SaveFile();
+			});
+			Application.Instance.AttachCommandEventHandler("FileSaveDocumentAs", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SaveFileAs();
+			});
+			Application.Instance.AttachCommandEventHandler("FileSaveProject", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SaveProject();
+			});
+			Application.Instance.AttachCommandEventHandler("FileSaveProjectAs", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SaveProjectAs();
+			});
+			Application.Instance.AttachCommandEventHandler("FileSaveAll", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SaveAll();
+			});
+			Application.Instance.AttachCommandEventHandler("FileCloseDocument", delegate (object sender, EventArgs e)
+			{
+				LastWindow.CloseFile();
+			});
+			Application.Instance.AttachCommandEventHandler("FileCloseProject", delegate (object sender, EventArgs e)
+			{
+				LastWindow.CloseProject();
+			});
+			Application.Instance.AttachCommandEventHandler("FilePrint", delegate (object sender, EventArgs e)
+			{
+				LastWindow.PrintDocument();
+			});
+			Application.Instance.AttachCommandEventHandler("FileProperties", delegate (object sender, EventArgs e)
+			{
+				LastWindow.ShowDocumentPropertiesDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("FileRestart", delegate (object sender, EventArgs e)
+			{
+				Restart();
+			});
+			Application.Instance.AttachCommandEventHandler("FileExit", delegate (object sender, EventArgs e)
+			{
+				Stop();
+			});
+			#endregion
+			#region Edit
+			Application.Instance.AttachCommandEventHandler("EditCut", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor == null) return;
+				editor.Cut();
+			});
+			Application.Instance.AttachCommandEventHandler("EditCopy", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor == null) return;
+				editor.Copy();
+			});
+			Application.Instance.AttachCommandEventHandler("EditPaste", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor == null) return;
+				editor.Paste();
+			});
+			Application.Instance.AttachCommandEventHandler("EditDelete", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor != null)
+				{
+					editor.Delete();
+				}
+				else
+				{
+					Control ctl = LastWindow.ActiveControl;
+					if (ctl is ListViewControl && ctl.Parent is SolutionExplorerPanel)
+					{
+						(ctl.Parent as SolutionExplorerPanel).Delete();
+					}
+				}
+			});
+			Application.Instance.AttachCommandEventHandler("EditBatchFindReplace", delegate (object sender, EventArgs e)
+			{
+				if (LastWindow == null) return;
+
+				Editor ed = LastWindow.GetCurrentEditor();
+				if (ed == null) return;
+
+				BatchFindReplaceWindow dlg = new BatchFindReplaceWindow();
+				dlg.Editor = ed;
+				dlg.Show();
+			});
+			Application.Instance.AttachCommandEventHandler("EditUndo", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor == null) return;
+				editor.Undo();
+			});
+			Application.Instance.AttachCommandEventHandler("EditRedo", delegate (object sender, EventArgs e)
+			{
+				Editor editor = LastWindow.GetCurrentEditor();
+				if (editor == null) return;
+				editor.Redo();
+			});
+			#endregion
+			#region View
+			Application.Instance.AttachCommandEventHandler("ViewFullScreen", delegate (object sender, EventArgs e)
+			{
+				Command cmd = (e as CommandEventArgs).Command;
+				LastWindow.FullScreen = !LastWindow.FullScreen;
+				cmd.Checked = LastWindow.FullScreen;
+			});
+			#region Perspective
+			Application.Instance.AttachCommandEventHandler("ViewPerspective1", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(1);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective2", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(2);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective3", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(3);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective4", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(4);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective5", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(5);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective6", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(6);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective7", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(7);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective8", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(8);
+			});
+			Application.Instance.AttachCommandEventHandler("ViewPerspective9", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(9);
+			});
+			#endregion
+
+			Application.Instance.AttachCommandEventHandler("ViewStartPage", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.ShowStartPage();
+			});
+			Application.Instance.AttachCommandEventHandler("ViewStatusBar", delegate (object sender, EventArgs e)
+			{
+				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible = !((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible;
+				Application.Instance.Commands["ViewStatusBar"].Checked = ((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible;
+			});
+
+			#endregion
+			#region Bookmarks
+			Application.Instance.AttachCommandEventHandler("BookmarksAdd", delegate (object sender, EventArgs e)
+			{
+				Editor ed = LastWindow.GetCurrentEditor();
+				if (ed == null) return;
+
+				Accessor acc = ed.ObjectModel?.Accessor ?? (ed.Parent as Pages.EditorPage)?.Document?.Accessor;
+
+				// we cannot yet bookmark a file that does not yet exist. (this would be akin to creating a shortcut to a template I guess...?)
+				if (acc == null) return;
+
+				// FIXME: BookmarksAdd copypasta
+				string filename = acc.GetFileName();
+				BookmarksManager.FileNames.Add(filename);
+
+				Command cmdBookmarks = Application.Instance.Commands["Bookmarks"];
+				if (cmdBookmarks.Items.Count == 4)
+				{
+					cmdBookmarks.Items.Add(new SeparatorCommandItem());
+				}
+
+				((UIApplication)Application.Instance).Commands.Add(new Command(String.Format("{0}", (((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count - 1).ToString()), System.IO.Path.GetFileName(((EditorApplication)Application.Instance).BookmarksManager.FileNames[(BookmarksManager.FileNames.Count - 1)])));
+				((UIApplication)Application.Instance).Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", (BookmarksManager.FileNames.Count - 1).ToString())));
+
+				Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
+				ShowBookmarksManagerDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("BookmarksAddAll", delegate (object sender, EventArgs e)
+			{
+				Page[] pages = LastWindow.GetPages();
+				for (int i = 0; i < pages.Length; i++)
+				{
+					if (pages[i] is Pages.EditorPage)
+					{
+						Pages.EditorPage ep = (pages[i] as Pages.EditorPage);
+						Editor ed = (ep.Controls[0] as Editor);
+
+						// FIXME: BookmarksAdd copypasta
+						string filename = ed.ObjectModel.Accessor.GetFileName();
+						BookmarksManager.FileNames.Add(filename);
+
+						Command cmdBookmarks = ((UIApplication)Application.Instance).Commands["Bookmarks"];
+						if (cmdBookmarks.Items.Count == 4)
+						{
+							cmdBookmarks.Items.Add(new SeparatorCommandItem());
+						}
+
+						Application.Instance.Commands.Add(new Command(String.Format("Bookmarks_Bookmark{0}", (((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count - 1)), System.IO.Path.GetFileName(((EditorApplication)Application.Instance).BookmarksManager.FileNames[(BookmarksManager.FileNames.Count - 1)])));
+						Application.Instance.Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", ((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count - 1)));
+
+						Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (((EditorApplication)Application.Instance).BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
+					}
+				}
+
+				ShowBookmarksManagerDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("BookmarksManage", delegate (object sender, EventArgs e)
+			{
+				ShowBookmarksManagerDialog();
+			});
+			#endregion
+			#region Tools
+			// ToolsOptions should actually be under the Edit menu as "Preferences" on Linux systems
+			Application.Instance.AttachCommandEventHandler("ToolsOptions", delegate (object sender, EventArgs e)
+			{
+				LastWindow.ShowOptionsDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("ToolsCustomize", delegate (object sender, EventArgs e)
+			{
+				((UIApplication)Application.Instance).ShowSettingsDialog(new string[] { "Application", "Command Bars" });
+			});
+			#endregion
+			#region Window
+			Application.Instance.AttachCommandEventHandler("WindowNewWindow", delegate (object sender, EventArgs e)
+			{
+				OpenWindow();
+			});
+			Application.Instance.AttachCommandEventHandler("WindowWindows", delegate (object sender, EventArgs e)
+			{
+				LastWindow.SetWindowListVisible(true, true);
+			});
+			#endregion
+			#region Help
+			Application.Instance.AttachCommandEventHandler("HelpViewHelp", delegate (object sender, EventArgs e)
+			{
+				((UIApplication)Application.Instance).ShowHelp();
+			});
+			Application.Instance.AttachCommandEventHandler("HelpCustomerFeedbackOptions", delegate (object sender, EventArgs e)
+			{
+				// MessageDialog.ShowDialog("This product has already been activated.", "Licensing and Activation", MessageDialogButtons.OK, MessageDialogIcon.Information);
+				TaskDialog td = new TaskDialog();
+				td.ButtonStyle = TaskDialogButtonStyle.Commands;
+
+				td.Prompt = "Please open a trouble ticket on GitHub if you need support.";
+				td.Text = "Customer Experience Improvement Program";
+				td.Content = String.Format("You are using the GNU GPLv3 licensed version of {0}. This program comes with ABSOLUTELY NO WARRANTY.\r\n\r\nSupport contracts may be available for purchase; please contact your software distributor.", Application.Instance.Title);
+				td.Footer = "<a href=\"GPLLicense\">View the license terms</a>";
+				td.EnableHyperlinks = true;
+				td.HyperlinkClicked += Td_HyperlinkClicked;
+
+				td.Icon = TaskDialogIcon.SecurityOK;
+				td.Parent = (Window)LastWindow;
+				td.ShowDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("HelpLicensingAndActivation", delegate (object sender, EventArgs e)
+			{
+				// MessageDialog.ShowDialog("This product has already been activated.", "Licensing and Activation", MessageDialogButtons.OK, MessageDialogIcon.Information);
+				TaskDialog td = new TaskDialog();
+				td.ButtonStyle = TaskDialogButtonStyle.Commands;
+
+				td.Prompt = "This product has already been activated.";
+				td.Text = "Licensing and Activation";
+				td.Content = String.Format("You are using the GNU GPLv3 licensed version of {0}. No activation is necessary.", Application.Instance.Title);
+				td.Footer = "<a href=\"GPLLicense\">View the license terms</a>";
+				td.EnableHyperlinks = true;
+				td.HyperlinkClicked += Td_HyperlinkClicked;
+
+				td.Icon = TaskDialogIcon.SecurityOK;
+				td.Parent = (Window)LastWindow;
+				td.ShowDialog();
+			});
+			Application.Instance.AttachCommandEventHandler("HelpSoftwareManager", delegate (object sender, EventArgs e)
+			{
+				// FIXME: launch the software manager to add or remove plugins for Universal Editor
+				MessageDialog.ShowDialog("FIXME: launch the software manager to add or remove plugins for Universal Editor", "Not Implemented", MessageDialogButtons.OK, MessageDialogIcon.Error);
+			});
+			Application.Instance.AttachCommandEventHandler("HelpAboutPlatform", delegate (object sender, EventArgs e)
+			{
+				ShowAboutDialog();
+			});
+			#endregion
+
+
+			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_Close", delegate (object sender, EventArgs e)
+			{
+				CommandEventArgs ce = (e as CommandEventArgs);
+				if (ce != null)
+				{
+					DockingWindow dw = ce.GetNamedParameter<DockingWindow>("Item");
+					LastWindow?.CloseFile(dw);
+				}
+			});
+			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_CloseAll", delegate (object sender, EventArgs e)
+			{
+				LastWindow?.CloseWindow();
+			});
+			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_CloseAllButThis", delegate (object sender, EventArgs e)
+			{
+				MessageDialog.ShowDialog("Not implemented ... yet", "Error", MessageDialogButtons.OK, MessageDialogIcon.Error);
+			});
+
+
+			#region Dynamic Commands
+			#region View
+			#region Panels
+			for (int i = ((UIApplication)Application.Instance).CommandBars.Count - 1; i >= 0; i--)
+			{
+				Command cmdViewToolbarsToolbar = new Command();
+				cmdViewToolbarsToolbar.ID = "ViewToolbars" + i.ToString();
+				cmdViewToolbarsToolbar.Title = ((UIApplication)Application.Instance).CommandBars[i].Title;
+				cmdViewToolbarsToolbar.Executed += cmdViewToolbarsToolbar_Executed;
+				Application.Instance.Commands.Add(cmdViewToolbarsToolbar);
+				Application.Instance.Commands["ViewToolbars"].Items.Insert(0, new CommandReferenceCommandItem(cmdViewToolbarsToolbar.ID));
+			}
+			#endregion
+			#region Panels
+			if (Application.Instance.Commands["ViewPanels"] != null)
+			{
+				Command cmdViewPanels1 = new Command();
+				cmdViewPanels1.ID = "ViewPanels1";
+				Application.Instance.Commands.Add(cmdViewPanels1);
+				((UIApplication)Application.Instance).Commands["ViewPanels"].Items.Add(new CommandReferenceCommandItem("ViewPanels1"));
+			}
+			#endregion
+			#endregion
+			#endregion
+
+			#region Language Strings
+			#region Help
+			Command helpAboutPlatform = Application.Instance.Commands["HelpAboutPlatform"];
+			if (helpAboutPlatform != null)
+			{
+				helpAboutPlatform.Title = String.Format(helpAboutPlatform.Title, ((UIApplication)Application.Instance).DefaultLanguage.GetStringTableEntry("Application.Title", "Universal Editor"));
+			}
+
+			Command helpLanguage = Application.Instance.Commands["HelpLanguage"];
+			if (helpLanguage != null)
+			{
+				foreach (Language lang in ((UIApplication)Application.Instance).Languages)
+				{
+					Command cmdLanguage = new Command();
+					cmdLanguage.ID = String.Format("HelpLanguage_{0}", lang.ID);
+					cmdLanguage.Title = lang.Title;
+					cmdLanguage.Executed += delegate (object sender, EventArgs e)
+					{
+						(Application.Instance as IHostApplication).Messages.Add(HostApplicationMessageSeverity.Notice, "Clicked language " + lang.ID);
+					};
+					Application.Instance.Commands.Add(cmdLanguage);
+
+					helpLanguage.Items.Add(new CommandReferenceCommandItem(cmdLanguage.ID));
+				}
+			}
+			#endregion
+			#endregion
+		}
+
+		void Td_HyperlinkClicked(object sender, TaskDialogHyperlinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("https://www.gnu.org/licenses/gpl-3.0.en.html");
+		}
+
+
+		void cmdViewToolbarsToolbar_Executed(object sender, EventArgs e)
+		{
+			Command cmd = (e as CommandEventArgs).Command;
+
+		}
+
+		private void ShowBookmarksManagerDialog()
+		{
+			ManageBookmarksDialog dlg = new ManageBookmarksDialog();
+			if (dlg.ShowDialog() == DialogResult.OK)
+			{
+				// saving the BookmarksManager state is handled by the ManageBookmarksDialog
+			}
+		}
+
+		public IHostApplicationWindowCollection Windows { get; } = new IHostApplicationWindowCollection();
+
+		public void CloseAllWindows()
+		{
+			List<IHostApplicationWindow> windowsToClose = new List<IHostApplicationWindow>();
+			foreach (IHostApplicationWindow window in Windows)
+			{
+				windowsToClose.Add(window);
+			}
+			foreach (IHostApplicationWindow window in windowsToClose)
+			{
+				window.CloseWindow();
+			}
+		}
+
+		private System.Collections.ObjectModel.ReadOnlyCollection<string> mvarSelectedFileNames = null;
+		public System.Collections.ObjectModel.ReadOnlyCollection<string> SelectedFileNames { get { return mvarSelectedFileNames; } }
+
+		public IHostApplicationWindow LastWindow { get; set; }
+
+		public void OpenFile(params string[] fileNames)
+		{
+			Document[] documents = new Document[fileNames.Length];
+			for (int i = 0; i < fileNames.Length; i++)
+			{
+				documents[i] = new Document(null, null, new FileAccessor(fileNames[i]));
+			}
+			OpenFile(documents);
+		}
+		public void OpenFile(params Document[] documents)
+		{
+			if (LastWindow == null)
+			{
+				OpenWindow(documents);
+				return;
+			}
+			LastWindow.OpenFile(documents);
+		}
+
+		public void ShowAboutDialog()
+		{
+			this.ShowAboutDialog(null);
+		}
+
+		/// <summary>
+		/// Opens a new window, with no documents loaded.
+		/// </summary>
+		public void OpenWindow()
+		{
+			MainWindow mw = new MainWindow();
+			mw.Show();
+		}
+		/// <summary>
+		/// Opens a new window, optionally loading the specified documents.
+		/// </summary>
+		/// <param name="fileNames">The file name(s) of the document(s) to load.</param>
+		public void OpenWindow(params string[] fileNames)
+		{
+			MainWindow mw = new MainWindow();
+			mw.Show();
+
+			mw.OpenFile(fileNames);
+		}
+		/// <summary>
+		/// Opens a new window, optionally loading the specified documents.
+		/// </summary>
+		/// <param name="documents">The document model(s) of the document(s) to load.</param>
+		public void OpenWindow(params Document[] documents)
+		{
+			MainWindow mw = new MainWindow();
+			mw.Show();
+
+			mw.OpenFile(documents);
+		}
+
+		// UniversalDataStorage.Editor.WindowsForms.Program
+		public string ExpandRelativePath(string relativePath)
+		{
+			if (relativePath.StartsWith("~/"))
+			{
+				string[] potentialFileNames = ((UIApplication)Application.Instance).EnumerateDataPaths();
+				for (int i = potentialFileNames.Length - 1; i >= 0; i--)
+				{
+					potentialFileNames[i] = potentialFileNames[i] + '/' + relativePath.Substring(2);
+					Console.WriteLine("Looking for " + potentialFileNames[i]);
+
+					if (System.IO.File.Exists(potentialFileNames[i]))
+					{
+						return potentialFileNames[i];
+					}
+				}
+			}
+			if (System.IO.File.Exists(relativePath))
+			{
+				return relativePath;
+			}
+			return null;
+		}
+
+		private void LoadConfiguration(MarkupTagElement tag, Group group = null)
+		{
+			if (tag.FullName == "Group")
+			{
+				Group group1 = new Group();
+				group1.Name = tag.Attributes["ID"].Value;
+				foreach (MarkupElement el in tag.Elements)
+				{
+					MarkupTagElement tg = (el as MarkupTagElement);
+					if (tg == null) continue;
+					LoadConfiguration(tg, group1);
+				}
+
+				if (group == null)
+				{
+					ConfigurationManager.AddGroup(group1, ConfigurationManagerPropertyScope.Global);
+				}
+				else
+				{
+					group.Items.Add(group1);
+				}
+			}
+			else if (tag.FullName == "Property")
+			{
+				Property property = new Property();
+				property.Name = tag.Attributes["ID"].Value;
+				MarkupAttribute att = tag.Attributes["Value"];
+				if (att != null)
+				{
+					property.Value = att.Value;
+				}
+
+				if (group == null)
+				{
+					ConfigurationManager.AddProperty(property, ConfigurationManagerPropertyScope.Global);
+				}
+				else
+				{
+					group.Items.Add(property);
+				}
+			}
+		}
+
+		protected virtual void InitializeBranding()
+		{
+			// FIXME: Possible race condition bug, if there is a MessageDialog popped while another thread is fucking around,
+			// it
+			NotificationPopup nip = new NotificationPopup();
+			nip.Actions.Add(new ActionCommandItem("id1", "Ignore", delegate (object sender, EventArgs e)
+			{
+			}));
+			nip.Actions.Add(new ActionCommandItem("id2", "Show Message Dialog", delegate (object sender, EventArgs e)
+			{
+				MessageDialog.ShowDialog("This message dialog being displayed will crash the program. Wait for it...\r\n\r\n Closing the message dialog before the end will avoid this issue.");
+			}));
+			nip.Content = "please fix this race condition as soon as possible. if there is a MessageDialog present while another thread is running calling Application.DoEvents may crash the program";
+			nip.Summary = "race warning : click button to demonstrate";
+			nip.Show();
+
+			// I don't know why this ever was WindowsFormsEngine-specific...
+
+			// First, attempt to load the branding from Branding.uxt
+			/*
+			string BrandingFileName = Application.BasePath + System.IO.Path.DirectorySeparatorChar.ToString() + "Branding.uxt";
+			if (System.IO.File.Exists(BrandingFileName))
+			{
+				FileSystemObjectModel fsom = new FileSystemObjectModel();
+				FileAccessor fa = new FileAccessor(BrandingFileName);
+				Document.Load(fsom, new UXTDataFormat(), fa, false);
+
+				UniversalEditor.ObjectModels.FileSystem.File fileSplashScreenImage = fsom.Files["SplashScreen.png"];
+				if (fileSplashScreenImage != null)
+				{
+					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileSplashScreenImage.GetData());
+					// oh, yeah, maybe because of this?
+					// LocalConfiguration.SplashScreen.Image = System.Drawing.Image.FromStream(ms);
+
+					// when I did this back in ... who knows when, Universal Widget Toolkit didn't
+					// exist, let alone have a MBS.Framework.UserInterface.Drawing.Image class...
+				}
+
+				UniversalEditor.ObjectModels.FileSystem.File fileSplashScreenSound = fsom.Files["SplashScreen.wav"];
+				if (fileSplashScreenSound != null)
+				{
+					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileSplashScreenSound.GetData());
+					// LocalConfiguration.SplashScreen.Sound = ms;
+				}
+
+				UniversalEditor.ObjectModels.FileSystem.File fileMainIcon = fsom.Files["MainIcon.ico"];
+				if (fileMainIcon != null)
+				{
+					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileMainIcon.GetData());
+					// LocalConfiguration.MainIcon = new System.Drawing.Icon(ms);
+				}
+
+				UniversalEditor.ObjectModels.FileSystem.File fileConfiguration = fsom.Files["Configuration.upl"];
+				if (fileConfiguration != null)
+				{
+					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileConfiguration.GetData());
+
+					UniversalEditor.ObjectModels.PropertyList.PropertyListObjectModel plomBranding = new ObjectModels.PropertyList.PropertyListObjectModel();
+					Document.Load(plomBranding, new UniversalPropertyListDataFormat(), new StreamAccessor(ms), true);
+
+					LocalConfiguration.ApplicationName = plomBranding.GetValue<string>(new string[] { "Application", "Title" }, String.Empty);
+
+					LocalConfiguration.ColorScheme.DarkColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "DarkColor" }, "#2A0068"));
+					LocalConfiguration.ColorScheme.LightColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "LightColor" }, "#C0C0FF"));
+				}
+
+				fa.Close();
+			}
+
+			// Now, determine if we should override any branding details with local copies
+			if (System.IO.Directory.Exists(Application.BasePath + System.IO.Path.DirectorySeparatorChar.ToString() + "Branding"))
+			{
+				string SplashScreenImageFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
+				{
+					Application.BasePath,
+					"Branding",
+					"SplashScreen.png"
+				});
+				if (System.IO.File.Exists(SplashScreenImageFileName)) LocalConfiguration.SplashScreen.ImageFileName = SplashScreenImageFileName;
+
+				string SplashScreenSoundFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
+				{
+					Application.BasePath,
+					"Branding",
+					"SplashScreen.wav"
+				});
+				if (System.IO.File.Exists(SplashScreenSoundFileName)) LocalConfiguration.SplashScreen.SoundFileName = SplashScreenSoundFileName;
+
+				string MainIconFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
+				{
+					Application.BasePath,
+					"Branding",
+					"MainIcon.ico"
+				});
+				// if (System.IO.File.Exists(MainIconFileName)) LocalConfiguration.MainIcon = System.Drawing.Icon.ExtractAssociatedIcon(MainIconFileName);
+
+				string ConfigurationFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
+				{
+					Application.BasePath,
+					"Branding",
+					"Configuration.upl"
+				});
+
+				if (System.IO.File.Exists(ConfigurationFileName))
+				{
+					UniversalEditor.ObjectModels.PropertyList.PropertyListObjectModel plomBranding = new ObjectModels.PropertyList.PropertyListObjectModel();
+					Document.Load(plomBranding, new UniversalPropertyListDataFormat(), new FileAccessor(ConfigurationFileName), true);
+
+					LocalConfiguration.ApplicationName = plomBranding.GetValue<string>(new string[] { "Application", "Title" }, "Universal Editor");
+					LocalConfiguration.ApplicationShortName = plomBranding.GetValue<string>(new string[] { "Application", "ShortTitle" }, "universal-editor");
+					LocalConfiguration.CompanyName = plomBranding.GetValue<string>(new string[] { "Application", "CompanyName" }, "Mike Becker's Software");
+
+					LocalConfiguration.ColorScheme.DarkColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "DarkColor" }, "#2A0068"));
+					LocalConfiguration.ColorScheme.LightColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "LightColor" }, "#C0C0FF"));
+				}
+			}
+			*/
+		}
+
+		private Perspective.PerspectiveCollection mvarPerspectives = new Perspective.PerspectiveCollection();
+		public Perspective.PerspectiveCollection Perspectives { get { return mvarPerspectives; } }
+
+		protected internal virtual void UpdateSplashScreenStatus(string message)
+		{
+			((UIApplication)Application.Instance).UpdateSplashScreenStatus(message);
+			Console.WriteLine(message);
+		}
+		protected internal virtual void UpdateSplashScreenStatus(string message, int progressValue = 0, int progressMinimum = 0, int progressMaximum = 100)
+		{
+			((UIApplication)Application.Instance).UpdateSplashScreenStatus(message, progressValue, progressMinimum, progressMaximum);
+			Console.WriteLine(message);
+		}
 	}
 }
diff --git a/Libraries/UniversalEditor.UserInterface/Engine.cs b/Libraries/UniversalEditor.UserInterface/Engine.cs
deleted file mode 100644
index beeb5220..00000000
--- a/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ /dev/null
@@ -1,1251 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-using UniversalEditor.Accessors;
-using UniversalEditor.ObjectModels.FileSystem;
-using UniversalEditor.ObjectModels.PropertyList;
-
-using UniversalEditor.DataFormats.Markup.XML;
-using UniversalEditor.ObjectModels.Markup;
-using UniversalEditor.DataFormats.PropertyList.UniversalPropertyList;
-
-using MBS.Framework.UserInterface.Dialogs;
-using MBS.Framework.UserInterface.Drawing;
-using UniversalEditor.UserInterface.Dialogs;
-using MBS.Framework.UserInterface;
-using MBS.Framework.UserInterface.Input.Keyboard;
-using MBS.Framework.Drawing;
-using UniversalEditor.UserInterface.Panels;
-using MBS.Framework.UserInterface.Controls;
-using MBS.Framework.UserInterface.Controls.Docking;
-using MBS.Framework.UserInterface.Controls.ListView;
-using MBS.Framework;
-using MBS.Framework.Settings;
-
-namespace UniversalEditor.UserInterface
-{
-	// TODO: Finish implementing ObjectModel Converters... will need to have something
-	// like GetAvailableConvertersFrom(Type objectModel) to get a list of available
-	// converters that can convert from the specified object model.
-
-	public class Engine
-	{
-		public static Engine CurrentEngine { get; } = new Engine();
-
-		#region implemented abstract members of Engine
-		protected void BeforeInitialization ()
-		{
-			Application app = (UIApplication)Application.Instance;
-			app.CommandLine.Options.Add("command", '\0', null, CommandLineOptionValueType.Multiple);
-
-			app.ID = new Guid("{b359fe9a-080a-43fc-ae38-00ba7ac1703e}");
-			app.UniqueName = "net.alcetech.UniversalEditor";
-			app.ShortName = "universal-editor";
-
-			// Application.EnableVisualStyles();
-			// Application.SetCompatibleTextRenderingDefault(false);
-
-			// TODO: figure out why this is being done on BeforeInitialization and whether we could move it to after
-			//       the configuration is initialized, so we can specify the user's favorite theme in a configuration file
-
-			// AwesomeControls.Theming.BuiltinThemes. theme = new AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme(AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme.ColorMode.Dark);
-			// theme.UseAllCapsMenus = false;
-			// theme.SetStatusBarState(AwesomeControls.Theming.BuiltinThemes.VisualStudio2012Theme.StatusBarState.Initial);
-			// AwesomeControls.Theming.BuiltinThemes.Office2003Theme theme = new AwesomeControls.Theming.BuiltinThemes.Office2003Theme();
-			// AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme theme = new AwesomeControls.Theming.BuiltinThemes.OfficeXPTheme();
-			// AwesomeControls.Theming.BuiltinThemes.SlickTheme theme = new AwesomeControls.Theming.BuiltinThemes.SlickTheme();
-
-			// Office 2000  =   {105843D0-2F26-4CB7-86AB-10A449815C19}
-			// Office 2007	=	{4D86F538-E277-4E6F-9CAC-60F82D49A19D}
-			// VS2012-Dark	=	{25134C94-B1EB-4C38-9B5B-A2E29FC57AE1}
-			// VS2012-Light	=	{54CE64B1-2DE3-4147-B499-03F0934AFD37}
-			// VS2012-Blue	=	{898A65FC-8D08-46F1-BB94-2BF666AC996E}
-
-			// AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{54CE64B1-2DE3-4147-B499-03F0934AFD37}"));
-			// AwesomeControls.Theming.Theme theme = AwesomeControls.Theming.Theme.GetByID(new Guid("{105843D0-2F26-4CB7-86AB-10A449815C19}"));
-			// if (theme != null) AwesomeControls.Theming.Theme.CurrentTheme = theme;
-
-			// AwesomeControls.Theming.Theme.CurrentTheme.Properties["UseAllCapsMenus"] = false;
-
-			((UIApplication)Application.Instance).ConfigurationFileNameFilter = "*.uexml";
-
-			((UIApplication)Application.Instance).BeforeShutdown += Application_BeforeShutdown;
-			((UIApplication)Application.Instance).AfterConfigurationLoaded += Application_AfterConfigurationLoaded;
-			((UIApplication)Application.Instance).Startup += Application_Startup;
-			((UIApplication)Application.Instance).Activated += Application_Activated;
-
-			app.Initialize();
-		}
-
-		void Application_AfterConfigurationLoaded(object sender, EventArgs e)
-		{
-			#region Global Configuration
-			{
-				UpdateSplashScreenStatus("Loading global configuration");
-
-				MarkupTagElement tagConfiguration = (((UIApplication)Application.Instance).RawMarkup.FindElement("UniversalEditor", "Configuration") as MarkupTagElement);
-				if (tagConfiguration != null)
-				{
-					foreach (MarkupElement el in tagConfiguration.Elements)
-					{
-						MarkupTagElement tag = (el as MarkupTagElement);
-						if (tag == null) continue;
-						LoadConfiguration(tag);
-					}
-				}
-			}
-			#endregion
-			#region Object Model Configuration
-			{
-				UpdateSplashScreenStatus("Loading object model configuration");
-
-				MarkupTagElement tagObjectModels = (((UIApplication)Application.Instance).RawMarkup.FindElement("UniversalEditor", "ObjectModels") as MarkupTagElement);
-				if (tagObjectModels != null)
-				{
-					MarkupTagElement tagDefault = (tagObjectModels.Elements["Default"] as MarkupTagElement);
-					if (tagDefault != null)
-					{
-						ObjectModelReference[] omrs = UniversalEditor.Common.Reflection.GetAvailableObjectModels();
-						MarkupAttribute attVisible = tagDefault.Attributes["Visible"];
-						foreach (ObjectModelReference omr in omrs)
-						{
-							if (attVisible != null) omr.Visible = (attVisible.Value == "true");
-						}
-					}
-
-					foreach (MarkupElement el in tagObjectModels.Elements)
-					{
-						MarkupTagElement tag = (el as MarkupTagElement);
-						if (tag == null) continue;
-						if (tag.FullName == "ObjectModel")
-						{
-							MarkupAttribute attTypeName = tag.Attributes["TypeName"];
-							MarkupAttribute attID = tag.Attributes["ID"];
-							MarkupAttribute attVisible = tag.Attributes["Visible"];
-
-							if (attTypeName != null)
-							{
-								ObjectModelReference omr = UniversalEditor.Common.Reflection.GetAvailableObjectModelByTypeName(attTypeName.Value);
-								if (attVisible != null) omr.Visible = (attVisible.Value == "true");
-							}
-							else
-							{
-								ObjectModelReference omr = UniversalEditor.Common.Reflection.GetAvailableObjectModelByID(new Guid(attID.Value));
-								if (attVisible != null) omr.Visible = (attVisible.Value == "true");
-							}
-						}
-					}
-				}
-			}
-			#endregion
-
-			UpdateSplashScreenStatus("Loading object models...");
-			UniversalEditor.Common.Reflection.GetAvailableObjectModels();
-
-			UpdateSplashScreenStatus("Loading data formats...");
-			UniversalEditor.Common.Reflection.GetAvailableDataFormats();
-
-			// Initialize Recent File Manager
-			Engine.CurrentEngine.RecentFileManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "RecentItems.xml";
-			Engine.CurrentEngine.RecentFileManager.Load();
-			RefreshRecentFilesList();
-
-			// Initialize Bookmarks Manager
-			Engine.CurrentEngine.BookmarksManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "Bookmarks.xml";
-			Engine.CurrentEngine.BookmarksManager.Load();
-
-			// Initialize Session Manager
-			Engine.CurrentEngine.SessionManager.DataFileName = ((UIApplication)Application.Instance).DataPath + System.IO.Path.DirectorySeparatorChar.ToString() + "Sessions.xml";
-			Engine.CurrentEngine.SessionManager.Load();
-
-			// load editors into memory so we don't wait 10-15 seconds before opening a file
-			Common.Reflection.GetAvailableEditors();
-
-			AfterInitialization();
-		}
-
-
-		private void AddRecentMenuItem(string FileName)
-		{
-			Command mnuFileRecentFiles = ((UIApplication)Application.Instance).Commands["FileRecentFiles"];
-
-			Command mnuFileRecentFile = new Command();
-			mnuFileRecentFile.ID = "FileRecentFile_" + FileName;
-			mnuFileRecentFile.Title = System.IO.Path.GetFileName(FileName);
-			// mnuFileRecentFile.ToolTipText = FileName;
-			((UIApplication)Application.Instance).Commands.Add(mnuFileRecentFile);
-
-			CommandReferenceCommandItem tsmi = new CommandReferenceCommandItem("FileRecentFile_" + FileName);
-			mnuFileRecentFiles.Items.Add(tsmi);
-		}
-		private void RefreshRecentFilesList()
-		{
-			Command mnuFileRecentFiles = ((UIApplication)Application.Instance).Commands["FileRecentFiles"];
-			mnuFileRecentFiles.Items.Clear();
-			foreach (string fileName in Engine.CurrentEngine.RecentFileManager.FileNames)
-			{
-				AddRecentMenuItem(fileName);
-			}
-
-			Command mnuFileRecentProjects = ((UIApplication)Application.Instance).Commands["FileRecentProjects"];
-
-			mnuFileRecentFiles.Visible = (mnuFileRecentFiles.Items.Count > 0);
-			mnuFileRecentProjects.Visible = (mnuFileRecentProjects.Items.Count > 0);
-			// mnuFileSep3.Visible = ((mnuFileRecentFiles.DropDownItems.Count > 0) || (mnuFileRecentProjects.DropDownItems.Count > 0));
-		}
-
-		void Application_BeforeShutdown(object sender, System.ComponentModel.CancelEventArgs e)
-		{
-			for (int i = 0; i < ((UIApplication)Application.Instance).Windows.Count; i++)
-			{
-				MainWindow mw = (((UIApplication)Application.Instance).Windows[i] as MainWindow);
-				if (mw == null) continue;
-
-				if (!mw.Close())
-				{
-					e.Cancel = true;
-					break;
-				}
-			}
-		}
-
-
-		void Application_Startup(object sender, EventArgs e)
-		{
-		}
-
-		void Application_Activated(object sender, ApplicationActivatedEventArgs e)
-		{
-			if (LastWindow != null)
-			{
-				LastWindow.OpenFile(e.CommandLine.FileNames.ToArray());
-			}
-			else
-			{
-				OpenWindow(e.CommandLine.FileNames.ToArray());
-			}
-
-			List<string> commandsToExecute = (((UIApplication)Application.Instance).CommandLine.Options.GetValueOrDefault<List<string>>("command", null));
-			if (commandsToExecute != null)
-			{
-				for (int i = 0; i < commandsToExecute.Count; i++)
-				{
-					((UIApplication)Application.Instance).ExecuteCommand(commandsToExecute[i]);
-				}
-			}
-		}
-
-		protected void MainLoop ()
-		{
-			switch (System.Environment.OSVersion.Platform)
-			{
-				case PlatformID.MacOSX:
-				case PlatformID.Unix:
-				{
-					// Glue.ApplicationInformation.ApplicationDataPath = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] { "universal-editor", "plugins" });
-					break;
-				}
-				case PlatformID.Win32NT:
-				case PlatformID.Win32S:
-				case PlatformID.Win32Windows:
-				case PlatformID.WinCE:
-				case PlatformID.Xbox:
-				{
-					// Glue.ApplicationInformation.ApplicationDataPath = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[] { "Universal Editor", "Plugins" });
-					break;
-				}
-			}
-
-			// Glue.ApplicationEventEventArgs e = new Glue.ApplicationEventEventArgs(Glue.Common.Constants.EventNames.ApplicationStart);
-			// Glue.Common.Methods.SendApplicationEvent(e);
-			// if (e.CancelApplication) return;
-
-			/*
-			PieMenuManager.Title = "Universal Editor pre-alpha build";
-
-			PieMenuItemGroup row1 = new PieMenuItemGroup();
-			row1.Title = "Tools";
-			row1.Items.Add("atlMFCTraceTool", "ATL/MFC Trace Tool");
-			row1.Items.Add("textEditor", "Text Editor");
-			PieMenuManager.Groups.Add(row1);
-			*/
-
-#if !DEBUG
-			// Application.ThreadException += Application_ThreadException;
-#endif
-			Application.Instance.Start();
-
-			// Glue.Common.Methods.SendApplicationEvent(new Glue.ApplicationEventEventArgs(Glue.Common.Constants.EventNames.ApplicationStop));
-		}
-
-		public void ShowAboutDialog (DataFormatReference dfr)
-		{
-			if (dfr == null)
-			{
-				string dlgfilename = ExpandRelativePath("~/Dialogs/AboutDialog.glade");
-				if (dlgfilename != null)
-				{
-					UniversalEditor.UserInterface.Dialogs.AboutDialog dlg = new UniversalEditor.UserInterface.Dialogs.AboutDialog ();
-					dlg.ShowDialog ();
-				}
-				else
-				{
-					MBS.Framework.UserInterface.Dialogs.AboutDialog dlg = new MBS.Framework.UserInterface.Dialogs.AboutDialog ();
-					dlg.ProgramName = "Universal Editor";
-					dlg.Version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
-					dlg.Copyright = "(c) 1997-2019 Michael Becker";
-					dlg.Comments = "A modular, extensible document editor";
-					dlg.LicenseType = MBS.Framework.UserInterface.LicenseType.GPL30;
-					dlg.ShowDialog();
-				}
-			}
-			else
-			{
-				DataFormatAboutDialog dlg = new DataFormatAboutDialog();
-				dlg.DataFormatReference = dfr;
-				dlg.ShowDialog();
-			}
-		}
-		public bool ShowCustomOptionDialog(ref SettingsProvider customOptions, string title = null, EventHandler aboutButtonClicked = null)
-		{
-			SettingsDialog dlg = new SettingsDialog();
-			dlg.Text = title ?? "Options";
-			dlg.SettingsProfiles.Clear();
-
-			dlg.SettingsProviders.Clear();
-			dlg.SettingsProviders.Add(customOptions);
-
-			if (dlg.ShowDialog() == DialogResult.OK)
-			{
-				return true;
-			}
-			return false;
-		}
-		#endregion
-
-		private void Bookmarks_Bookmark_Click(object sender, EventArgs e)
-		{
-			Command cmd = (Command)sender;
-			int i = Int32.Parse(cmd.ID.Substring("Bookmarks_Bookmark".Length));
-			LastWindow.OpenFile(BookmarksManager.FileNames[i]);
-		}
-
-		private void AfterInitialization()
-		{
-			if (Engine.CurrentEngine.BookmarksManager.FileNames.Count > 0)
-			{
-				Application.Instance.Commands["Bookmarks"].Items.Add(new SeparatorCommandItem());
-				for (int i = 0; i < Engine.CurrentEngine.BookmarksManager.FileNames.Count; i++)
-				{
-					Application.Instance.Commands.Add(new Command(String.Format("Bookmarks_Bookmark{0}", i.ToString()), System.IO.Path.GetFileName(Engine.CurrentEngine.BookmarksManager.FileNames[i]).Replace("_", "__")));
-					Application.Instance.Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", i.ToString())));
-
-					Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", i.ToString()), Bookmarks_Bookmark_Click);
-				}
-			}
-
-			// Initialize all the commands that are common to UniversalEditor
-			#region File
-			Application.Instance.AttachCommandEventHandler("FileNewDocument", delegate(object sender, EventArgs e)
-			{
-				LastWindow.NewFile();
-			});
-			Application.Instance.AttachCommandEventHandler("FileNewProject", delegate(object sender, EventArgs e)
-			{
-				LastWindow.NewProject();
-			});
-			Application.Instance.AttachCommandEventHandler("FileOpenDocument", delegate(object sender, EventArgs e)
-			{
-				LastWindow.OpenFile();
-			});
-			Application.Instance.AttachCommandEventHandler("FileOpenProject", delegate(object sender, EventArgs e)
-			{
-				LastWindow.OpenProject();
-			});
-			Application.Instance.AttachCommandEventHandler("FileSaveDocument", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SaveFile();
-			});
-			Application.Instance.AttachCommandEventHandler("FileSaveDocumentAs", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SaveFileAs();
-			});
-			Application.Instance.AttachCommandEventHandler("FileSaveProject", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SaveProject();
-			});
-			Application.Instance.AttachCommandEventHandler("FileSaveProjectAs", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SaveProjectAs();
-			});
-			Application.Instance.AttachCommandEventHandler("FileSaveAll", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SaveAll();
-			});
-			Application.Instance.AttachCommandEventHandler("FileCloseDocument", delegate(object sender, EventArgs e)
-			{
-				LastWindow.CloseFile();
-			});
-			Application.Instance.AttachCommandEventHandler("FileCloseProject", delegate(object sender, EventArgs e)
-			{
-				LastWindow.CloseProject();
-			});
-			Application.Instance.AttachCommandEventHandler("FilePrint", delegate(object sender, EventArgs e)
-			{
-				LastWindow.PrintDocument();
-			});
-			Application.Instance.AttachCommandEventHandler("FileProperties", delegate (object sender, EventArgs e)
-			{
-				LastWindow.ShowDocumentPropertiesDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("FileRestart", delegate(object sender, EventArgs e)
-			{
-				RestartApplication();
-			});
-			Application.Instance.AttachCommandEventHandler("FileExit", delegate(object sender, EventArgs e)
-			{
-				StopApplication();
-			});
-			#endregion
-			#region Edit
-			Application.Instance.AttachCommandEventHandler("EditCut", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor == null) return;
-				editor.Cut();
-			});
-			Application.Instance.AttachCommandEventHandler("EditCopy", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor == null) return;
-				editor.Copy();
-			});
-			Application.Instance.AttachCommandEventHandler("EditPaste", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor == null) return;
-				editor.Paste();
-			});
-			Application.Instance.AttachCommandEventHandler("EditDelete", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor != null)
-				{
-					editor.Delete();
-				}
-				else
-				{
-					Control ctl = LastWindow.ActiveControl;
-					if (ctl is ListViewControl && ctl.Parent is SolutionExplorerPanel)
-					{
-						(ctl.Parent as SolutionExplorerPanel).Delete();
-					}
-				}
-			});
-			Application.Instance.AttachCommandEventHandler("EditBatchFindReplace", delegate (object sender, EventArgs e)
-			{
-				if (LastWindow == null) return;
-
-				Editor ed = LastWindow.GetCurrentEditor();
-				if (ed == null) return;
-
-				BatchFindReplaceWindow dlg = new BatchFindReplaceWindow();
-				dlg.Editor = ed;
-				dlg.Show();
-			});
-			Application.Instance.AttachCommandEventHandler("EditUndo", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor == null) return;
-				editor.Undo();
-			});
-			Application.Instance.AttachCommandEventHandler("EditRedo", delegate(object sender, EventArgs e)
-			{
-				Editor editor = LastWindow.GetCurrentEditor();
-				if (editor == null) return;
-				editor.Redo();
-			});
-			#endregion
-			#region View
-			Application.Instance.AttachCommandEventHandler("ViewFullScreen", delegate(object sender, EventArgs e)
-			{
-				Command cmd = (e as CommandEventArgs).Command;
-				LastWindow.FullScreen = !LastWindow.FullScreen;
-				cmd.Checked = LastWindow.FullScreen;
-			});
-			#region Perspective
-			Application.Instance.AttachCommandEventHandler("ViewPerspective1", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(1);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective2", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(2);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective3", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(3);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective4", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(4);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective5", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(5);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective6", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(6);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective7", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(7);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective8", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(8);
-			});
-			Application.Instance.AttachCommandEventHandler("ViewPerspective9", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.SwitchPerspective(9);
-			});
-			#endregion
-
-			Application.Instance.AttachCommandEventHandler("ViewStartPage", delegate(object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow)?.ShowStartPage();
-			});
-			Application.Instance.AttachCommandEventHandler("ViewStatusBar", delegate (object sender, EventArgs e)
-			{
-				((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible = !((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible;
-				Application.Instance.Commands["ViewStatusBar"].Checked = ((Application.Instance as UIApplication).CurrentWindow as IHostApplicationWindow).StatusBar.Visible;
-			});
-
-			#endregion
-			#region Bookmarks
-			Application.Instance.AttachCommandEventHandler("BookmarksAdd", delegate (object sender, EventArgs e)
-			{
-				Editor ed = LastWindow.GetCurrentEditor();
-				if (ed == null) return;
-
-				Accessor acc = ed.ObjectModel?.Accessor ?? (ed.Parent as Pages.EditorPage)?.Document?.Accessor;
-
-				// we cannot yet bookmark a file that does not yet exist. (this would be akin to creating a shortcut to a template I guess...?)
-				if (acc == null) return;
-
-				// FIXME: BookmarksAdd copypasta
-				string filename = acc.GetFileName();
-				BookmarksManager.FileNames.Add(filename);
-
-				Command cmdBookmarks = Application.Instance.Commands["Bookmarks"];
-				if (cmdBookmarks.Items.Count == 4)
-				{
-					cmdBookmarks.Items.Add(new SeparatorCommandItem());
-				}
-
-				((UIApplication)Application.Instance).Commands.Add(new Command(String.Format("{0}", (Engine.CurrentEngine.BookmarksManager.FileNames.Count - 1).ToString()), System.IO.Path.GetFileName(Engine.CurrentEngine.BookmarksManager.FileNames[(BookmarksManager.FileNames.Count - 1)])));
-				((UIApplication)Application.Instance).Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", (BookmarksManager.FileNames.Count - 1).ToString())));
-
-				Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (Engine.CurrentEngine.BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
-				ShowBookmarksManagerDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("BookmarksAddAll", delegate (object sender, EventArgs e)
-			{
-				Page[] pages = CurrentEngine.LastWindow.GetPages();
-				for (int i = 0; i < pages.Length; i++)
-				{
-					if (pages[i] is Pages.EditorPage)
-					{
-						Pages.EditorPage ep = (pages[i] as Pages.EditorPage);
-						Editor ed = (ep.Controls[0] as Editor);
-
-						// FIXME: BookmarksAdd copypasta
-						string filename = ed.ObjectModel.Accessor.GetFileName();
-						Engine.CurrentEngine.BookmarksManager.FileNames.Add(filename);
-
-						Command cmdBookmarks = ((UIApplication)Application.Instance).Commands["Bookmarks"];
-						if (cmdBookmarks.Items.Count == 4)
-						{
-							cmdBookmarks.Items.Add(new SeparatorCommandItem());
-						}
-
-						Application.Instance.Commands.Add(new Command(String.Format("Bookmarks_Bookmark{0}", (Engine.CurrentEngine.BookmarksManager.FileNames.Count - 1)), System.IO.Path.GetFileName(Engine.CurrentEngine.BookmarksManager.FileNames[(BookmarksManager.FileNames.Count - 1)])));
-						Application.Instance.Commands["Bookmarks"].Items.Add(new CommandReferenceCommandItem(String.Format("Bookmarks_Bookmark{0}", Engine.CurrentEngine.BookmarksManager.FileNames.Count - 1)));
-
-						Application.Instance.AttachCommandEventHandler(String.Format("Bookmarks_Bookmark{0}", (Engine.CurrentEngine.BookmarksManager.FileNames.Count - 1).ToString()), Bookmarks_Bookmark_Click);
-					}
-				}
-
-				ShowBookmarksManagerDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("BookmarksManage", delegate (object sender, EventArgs e)
-			{
-				ShowBookmarksManagerDialog();
-			});
-			#endregion
-			#region Tools
-			// ToolsOptions should actually be under the Edit menu as "Preferences" on Linux systems
-			Application.Instance.AttachCommandEventHandler("ToolsOptions", delegate(object sender, EventArgs e)
-			{
-				LastWindow.ShowOptionsDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("ToolsCustomize", delegate (object sender, EventArgs e)
-			{
-				((UIApplication)Application.Instance).ShowSettingsDialog(new string[] { "Application", "Command Bars" });
-			});
-			#endregion
-			#region Window
-			Application.Instance.AttachCommandEventHandler("WindowNewWindow", delegate(object sender, EventArgs e)
-			{
-				OpenWindow();
-			});
-			Application.Instance.AttachCommandEventHandler("WindowWindows", delegate(object sender, EventArgs e)
-			{
-				LastWindow.SetWindowListVisible(true, true);
-			});
-			#endregion
-			#region Help
-			Application.Instance.AttachCommandEventHandler("HelpViewHelp", delegate (object sender, EventArgs e)
-			{
-				((UIApplication)Application.Instance).ShowHelp();
-			});
-			Application.Instance.AttachCommandEventHandler("HelpCustomerFeedbackOptions", delegate (object sender, EventArgs e)
-			{
-				// MessageDialog.ShowDialog("This product has already been activated.", "Licensing and Activation", MessageDialogButtons.OK, MessageDialogIcon.Information);
-				TaskDialog td = new TaskDialog();
-				td.ButtonStyle = TaskDialogButtonStyle.Commands;
-
-				td.Prompt = "Please open a trouble ticket on GitHub if you need support.";
-				td.Text = "Customer Experience Improvement Program";
-				td.Content = String.Format("You are using the GNU GPLv3 licensed version of {0}. This program comes with ABSOLUTELY NO WARRANTY.\r\n\r\nSupport contracts may be available for purchase; please contact your software distributor.", Application.Instance.Title);
-				td.Footer = "<a href=\"GPLLicense\">View the license terms</a>";
-				td.EnableHyperlinks = true;
-				td.HyperlinkClicked += Td_HyperlinkClicked;
-
-				td.Icon = TaskDialogIcon.SecurityOK;
-				td.Parent = (Window)CurrentEngine.LastWindow;
-				td.ShowDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("HelpLicensingAndActivation", delegate (object sender, EventArgs e)
-			{
-				// MessageDialog.ShowDialog("This product has already been activated.", "Licensing and Activation", MessageDialogButtons.OK, MessageDialogIcon.Information);
-				TaskDialog td = new TaskDialog();
-				td.ButtonStyle = TaskDialogButtonStyle.Commands;
-
-				td.Prompt = "This product has already been activated.";
-				td.Text = "Licensing and Activation";
-				td.Content = String.Format("You are using the GNU GPLv3 licensed version of {0}. No activation is necessary.", Application.Instance.Title);
-				td.Footer = "<a href=\"GPLLicense\">View the license terms</a>";
-				td.EnableHyperlinks = true;
-				td.HyperlinkClicked += Td_HyperlinkClicked;
-
-				td.Icon = TaskDialogIcon.SecurityOK;
-				td.Parent = (Window)CurrentEngine.LastWindow;
-				td.ShowDialog();
-			});
-			Application.Instance.AttachCommandEventHandler("HelpSoftwareManager", delegate(object sender, EventArgs e)
-			{
-				// FIXME: launch the software manager to add or remove plugins for Universal Editor
-				MessageDialog.ShowDialog("FIXME: launch the software manager to add or remove plugins for Universal Editor", "Not Implemented", MessageDialogButtons.OK, MessageDialogIcon.Error);
-			});
-			Application.Instance.AttachCommandEventHandler("HelpAboutPlatform", delegate(object sender, EventArgs e)
-			{
-				ShowAboutDialog();
-			});
-			#endregion
-
-
-			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_Close", delegate (object sender, EventArgs e)
-			{
-				CommandEventArgs ce = (e as CommandEventArgs);
-				if (ce != null)
-				{
-					DockingWindow dw = ce.GetNamedParameter<DockingWindow>("Item");
-					LastWindow?.CloseFile(dw);
-				}
-			});
-			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_CloseAll", delegate (object sender, EventArgs e)
-			{
-				LastWindow?.CloseWindow();
-			});
-			Application.Instance.AttachCommandEventHandler("DockingContainerContextMenu_CloseAllButThis", delegate (object sender, EventArgs e)
-			{
-				MessageDialog.ShowDialog("Not implemented ... yet", "Error", MessageDialogButtons.OK, MessageDialogIcon.Error);
-			});
-
-
-			#region Dynamic Commands
-			#region View
-			#region Panels
-			for (int i = ((UIApplication)Application.Instance).CommandBars.Count - 1; i >= 0; i--)
-			{
-				Command cmdViewToolbarsToolbar = new Command();
-				cmdViewToolbarsToolbar.ID = "ViewToolbars" + i.ToString();
-				cmdViewToolbarsToolbar.Title = ((UIApplication)Application.Instance).CommandBars[i].Title;
-				cmdViewToolbarsToolbar.Executed += cmdViewToolbarsToolbar_Executed;
-				Application.Instance.Commands.Add(cmdViewToolbarsToolbar);
-				Application.Instance.Commands["ViewToolbars"].Items.Insert(0, new CommandReferenceCommandItem(cmdViewToolbarsToolbar.ID));
-			}
-			#endregion
-			#region Panels
-			if (Application.Instance.Commands["ViewPanels"] != null)
-			{
-				Command cmdViewPanels1 = new Command();
-				cmdViewPanels1.ID = "ViewPanels1";
-				Application.Instance.Commands.Add(cmdViewPanels1);
-				((UIApplication)Application.Instance).Commands["ViewPanels"].Items.Add(new CommandReferenceCommandItem("ViewPanels1"));
-			}
-			#endregion
-			#endregion
-			#endregion
-
-			#region Language Strings
-			#region Help
-			Command helpAboutPlatform = Application.Instance.Commands["HelpAboutPlatform"];
-			if (helpAboutPlatform != null)
-			{
-				helpAboutPlatform.Title = String.Format(helpAboutPlatform.Title, ((UIApplication)Application.Instance).DefaultLanguage.GetStringTableEntry("Application.Title", "Universal Editor"));
-			}
-
-			Command helpLanguage = Application.Instance.Commands["HelpLanguage"];
-			if (helpLanguage != null)
-			{
-				foreach (Language lang in ((UIApplication)Application.Instance).Languages)
-				{
-					Command cmdLanguage = new Command();
-					cmdLanguage.ID = String.Format("HelpLanguage_{0}", lang.ID);
-					cmdLanguage.Title = lang.Title;
-					cmdLanguage.Executed += delegate (object sender, EventArgs e)
-					{
-						(Application.Instance as IHostApplication).Messages.Add(HostApplicationMessageSeverity.Notice, "Clicked language " + lang.ID);
-					};
-					Application.Instance.Commands.Add(cmdLanguage);
-
-					helpLanguage.Items.Add(new CommandReferenceCommandItem(cmdLanguage.ID));
-				}
-			}
-			#endregion
-			#endregion
-		}
-
-		void Td_HyperlinkClicked(object sender, TaskDialogHyperlinkClickedEventArgs e)
-		{
-			System.Diagnostics.Process.Start("https://www.gnu.org/licenses/gpl-3.0.en.html");
-		}
-
-
-		void cmdViewToolbarsToolbar_Executed(object sender, EventArgs e)
-		{
-			Command cmd = (e as CommandEventArgs).Command;
-
-		}
-
-		private void ShowBookmarksManagerDialog()
-		{
-			ManageBookmarksDialog dlg = new ManageBookmarksDialog();
-			if (dlg.ShowDialog() == DialogResult.OK)
-			{
-				// saving the BookmarksManager state is handled by the ManageBookmarksDialog
-			}
-		}
-
-		public IHostApplicationWindowCollection Windows { get; } = new IHostApplicationWindowCollection();
-
-		public void CloseAllWindows()
-		{
-			List<IHostApplicationWindow> windowsToClose = new List<IHostApplicationWindow>();
-			foreach (IHostApplicationWindow window in Windows)
-			{
-				windowsToClose.Add(window);
-			}
-			foreach (IHostApplicationWindow window in windowsToClose)
-			{
-				window.CloseWindow();
-			}
-		}
-
-		public static bool Execute()
-		{
-#if !DEBUG
-			try
-			{
-#endif
-				CurrentEngine.StartApplication();
-#if !DEBUG
-			}
-			catch (Exception ex)
-			{
-				mvarCurrentEngine.ShowCrashDialog(ex);
-			}
-#endif
-			return true;
-		}
-
-		private System.Collections.ObjectModel.ReadOnlyCollection<string> mvarSelectedFileNames = null;
-		public System.Collections.ObjectModel.ReadOnlyCollection<string> SelectedFileNames { get { return mvarSelectedFileNames; } }
-
-		private IHostApplicationWindow mvarLastWindow = null;
-		public IHostApplicationWindow LastWindow { get { return mvarLastWindow; } set { mvarLastWindow = value; } }
-
-		public void OpenFile(params string[] fileNames)
-		{
-			Document[] documents = new Document[fileNames.Length];
-			for (int i = 0; i < fileNames.Length; i++)
-			{
-				documents[i] = new Document(null, null, new FileAccessor(fileNames[i]));
-			}
-			OpenFile(documents);
-		}
-		public void OpenFile(params Document[] documents)
-		{
-			if (LastWindow == null)
-			{
-				OpenWindow(documents);
-				return;
-			}
-			LastWindow.OpenFile(documents);
-		}
-
-		public void ShowAboutDialog()
-		{
-			this.ShowAboutDialog(null);
-		}
-
-		/// <summary>
-		/// Opens a new window, with no documents loaded.
-		/// </summary>
-		public void OpenWindow()
-		{
-			MainWindow mw = new MainWindow();
-			mw.Show();
-		}
-		/// <summary>
-		/// Opens a new window, optionally loading the specified documents.
-		/// </summary>
-		/// <param name="fileNames">The file name(s) of the document(s) to load.</param>
-		public void OpenWindow(params string[] fileNames)
-		{
-			MainWindow mw = new MainWindow();
-			mw.Show();
-
-			mw.OpenFile(fileNames);
-		}
-		/// <summary>
-		/// Opens a new window, optionally loading the specified documents.
-		/// </summary>
-		/// <param name="documents">The document model(s) of the document(s) to load.</param>
-		public void OpenWindow(params Document[] documents)
-		{
-			MainWindow mw = new MainWindow();
-			mw.Show();
-
-			mw.OpenFile(documents);
-		}
-
-		// UniversalDataStorage.Editor.WindowsForms.Program
-		public string ExpandRelativePath(string relativePath)
-		{
-			if (relativePath.StartsWith("~/"))
-			{
-				string[] potentialFileNames = ((UIApplication)Application.Instance).EnumerateDataPaths();
-				for (int i = potentialFileNames.Length - 1; i >= 0; i--)
-				{
-					potentialFileNames[i] = potentialFileNames[i] + '/' + relativePath.Substring(2);
-					Console.WriteLine("Looking for " + potentialFileNames[i]);
-
-					if (System.IO.File.Exists(potentialFileNames[i]))
-					{
-						return potentialFileNames[i];
-					}
-				}
-			}
-			if (System.IO.File.Exists(relativePath))
-			{
-				return relativePath;
-			}
-			return null;
-		}
-
-		private void LoadConfiguration(MarkupTagElement tag, Group group = null)
-		{
-			if (tag.FullName == "Group")
-			{
-				Group group1 = new Group();
-				group1.Name = tag.Attributes["ID"].Value;
-				foreach (MarkupElement el in tag.Elements)
-				{
-					MarkupTagElement tg = (el as MarkupTagElement);
-					if (tg == null) continue;
-					LoadConfiguration(tg, group1);
-				}
-
-				if (group == null)
-				{
-					mvarConfigurationManager.AddGroup(group1, ConfigurationManagerPropertyScope.Global);
-				}
-				else
-				{
-					group.Items.Add(group1);
-				}
-			}
-			else if (tag.FullName == "Property")
-			{
-				Property property = new Property();
-				property.Name = tag.Attributes["ID"].Value;
-				MarkupAttribute att = tag.Attributes["Value"];
-				if (att != null)
-				{
-					property.Value = att.Value;
-				}
-
-				if (group == null)
-				{
-					mvarConfigurationManager.AddProperty(property, ConfigurationManagerPropertyScope.Global);
-				}
-				else
-				{
-					group.Items.Add(property);
-				}
-			}
-		}
-
-		protected virtual void InitializeBranding()
-		{
-			// FIXME: Possible race condition bug, if there is a MessageDialog popped while another thread is fucking around,
-			// it
-			NotificationPopup nip = new NotificationPopup();
-			nip.Actions.Add(new ActionCommandItem("id1", "Ignore", delegate(object sender, EventArgs e)
-			{
-			}));
-			nip.Actions.Add(new ActionCommandItem("id2", "Show Message Dialog", delegate (object sender, EventArgs e)
-			{
-				MessageDialog.ShowDialog("This message dialog being displayed will crash the program. Wait for it...\r\n\r\n Closing the message dialog before the end will avoid this issue.");
-			}));
-			nip.Content = "please fix this race condition as soon as possible. if there is a MessageDialog present while another thread is running calling Application.DoEvents may crash the program";
-			nip.Summary = "race warning : click button to demonstrate";
-			nip.Show();
-
-			// I don't know why this ever was WindowsFormsEngine-specific...
-
-			// First, attempt to load the branding from Branding.uxt
-			/*
-			string BrandingFileName = Application.BasePath + System.IO.Path.DirectorySeparatorChar.ToString() + "Branding.uxt";
-			if (System.IO.File.Exists(BrandingFileName))
-			{
-				FileSystemObjectModel fsom = new FileSystemObjectModel();
-				FileAccessor fa = new FileAccessor(BrandingFileName);
-				Document.Load(fsom, new UXTDataFormat(), fa, false);
-
-				UniversalEditor.ObjectModels.FileSystem.File fileSplashScreenImage = fsom.Files["SplashScreen.png"];
-				if (fileSplashScreenImage != null)
-				{
-					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileSplashScreenImage.GetData());
-					// oh, yeah, maybe because of this?
-					// LocalConfiguration.SplashScreen.Image = System.Drawing.Image.FromStream(ms);
-
-					// when I did this back in ... who knows when, Universal Widget Toolkit didn't
-					// exist, let alone have a MBS.Framework.UserInterface.Drawing.Image class...
-				}
-
-				UniversalEditor.ObjectModels.FileSystem.File fileSplashScreenSound = fsom.Files["SplashScreen.wav"];
-				if (fileSplashScreenSound != null)
-				{
-					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileSplashScreenSound.GetData());
-					// LocalConfiguration.SplashScreen.Sound = ms;
-				}
-
-				UniversalEditor.ObjectModels.FileSystem.File fileMainIcon = fsom.Files["MainIcon.ico"];
-				if (fileMainIcon != null)
-				{
-					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileMainIcon.GetData());
-					// LocalConfiguration.MainIcon = new System.Drawing.Icon(ms);
-				}
-
-				UniversalEditor.ObjectModels.FileSystem.File fileConfiguration = fsom.Files["Configuration.upl"];
-				if (fileConfiguration != null)
-				{
-					System.IO.MemoryStream ms = new System.IO.MemoryStream(fileConfiguration.GetData());
-
-					UniversalEditor.ObjectModels.PropertyList.PropertyListObjectModel plomBranding = new ObjectModels.PropertyList.PropertyListObjectModel();
-					Document.Load(plomBranding, new UniversalPropertyListDataFormat(), new StreamAccessor(ms), true);
-
-					LocalConfiguration.ApplicationName = plomBranding.GetValue<string>(new string[] { "Application", "Title" }, String.Empty);
-
-					LocalConfiguration.ColorScheme.DarkColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "DarkColor" }, "#2A0068"));
-					LocalConfiguration.ColorScheme.LightColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "LightColor" }, "#C0C0FF"));
-				}
-
-				fa.Close();
-			}
-
-			// Now, determine if we should override any branding details with local copies
-			if (System.IO.Directory.Exists(Application.BasePath + System.IO.Path.DirectorySeparatorChar.ToString() + "Branding"))
-			{
-				string SplashScreenImageFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
-				{
-					Application.BasePath,
-					"Branding",
-					"SplashScreen.png"
-				});
-				if (System.IO.File.Exists(SplashScreenImageFileName)) LocalConfiguration.SplashScreen.ImageFileName = SplashScreenImageFileName;
-
-				string SplashScreenSoundFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
-				{
-					Application.BasePath,
-					"Branding",
-					"SplashScreen.wav"
-				});
-				if (System.IO.File.Exists(SplashScreenSoundFileName)) LocalConfiguration.SplashScreen.SoundFileName = SplashScreenSoundFileName;
-
-				string MainIconFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
-				{
-					Application.BasePath,
-					"Branding",
-					"MainIcon.ico"
-				});
-				// if (System.IO.File.Exists(MainIconFileName)) LocalConfiguration.MainIcon = System.Drawing.Icon.ExtractAssociatedIcon(MainIconFileName);
-
-				string ConfigurationFileName = String.Join(System.IO.Path.DirectorySeparatorChar.ToString(), new string[]
-				{
-					Application.BasePath,
-					"Branding",
-					"Configuration.upl"
-				});
-
-				if (System.IO.File.Exists(ConfigurationFileName))
-				{
-					UniversalEditor.ObjectModels.PropertyList.PropertyListObjectModel plomBranding = new ObjectModels.PropertyList.PropertyListObjectModel();
-					Document.Load(plomBranding, new UniversalPropertyListDataFormat(), new FileAccessor(ConfigurationFileName), true);
-
-					LocalConfiguration.ApplicationName = plomBranding.GetValue<string>(new string[] { "Application", "Title" }, "Universal Editor");
-					LocalConfiguration.ApplicationShortName = plomBranding.GetValue<string>(new string[] { "Application", "ShortTitle" }, "universal-editor");
-					LocalConfiguration.CompanyName = plomBranding.GetValue<string>(new string[] { "Application", "CompanyName" }, "Mike Becker's Software");
-
-					LocalConfiguration.ColorScheme.DarkColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "DarkColor" }, "#2A0068"));
-					LocalConfiguration.ColorScheme.LightColor = Color.FromString(plomBranding.GetValue<string>(new string[] { "ColorScheme", "LightColor" }, "#C0C0FF"));
-				}
-			}
-			*/
-		}
-
-		private ConfigurationManager mvarConfigurationManager = new ConfigurationManager();
-		public ConfigurationManager ConfigurationManager { get { return mvarConfigurationManager; } }
-
-		private RecentFileManager mvarRecentFileManager = new RecentFileManager();
-		public RecentFileManager RecentFileManager { get { return mvarRecentFileManager; } }
-
-		private BookmarksManager mvarBookmarksManager = new BookmarksManager();
-		public BookmarksManager BookmarksManager { get { return mvarBookmarksManager; } }
-
-		private SessionManager mvarSessionManager = new SessionManager();
-		public SessionManager SessionManager { get { return mvarSessionManager; } set { mvarSessionManager = value; } }
-
-		private Perspective.PerspectiveCollection mvarPerspectives = new Perspective.PerspectiveCollection();
-		public Perspective.PerspectiveCollection Perspectives { get { return mvarPerspectives; } }
-
-		protected internal virtual void UpdateSplashScreenStatus(string message)
-		{
-			((UIApplication)Application.Instance).UpdateSplashScreenStatus(message);
-			Console.WriteLine(message);
-		}
-		protected internal virtual void UpdateSplashScreenStatus(string message, int progressValue = 0, int progressMinimum = 0, int progressMaximum = 100)
-		{
-			((UIApplication)Application.Instance).UpdateSplashScreenStatus(message, progressValue, progressMinimum, progressMaximum);
-			Console.WriteLine(message);
-		}
-
-		private void Initialize()
-		{
-		}
-		protected virtual void InitializeInternal()
-		{
-		}
-
-		private bool mvarRunning = false;
-		public bool Running { get { return mvarRunning; } }
-
-		public void StartApplication()
-		{
-			Application.Instance = new EditorApplication();
-			Application.Instance.Title = "Universal Editor";
-
-			mvarRunning = true;
-
-			string[] args1 = Environment.GetCommandLineArgs();
-			string[] args = new string[args1.Length - 1];
-			Array.Copy(args1, 1, args, 0, args.Length);
-
-			System.Collections.ObjectModel.Collection<string> selectedFileNames = new System.Collections.ObjectModel.Collection<string>();
-			if (selectedFileNames.Count == 0 || ConfigurationManager.GetValue<bool>(new string[] { "Application", "Startup", "ForceLoadStartupFileNames" }, false))
-			{
-				object[] oStartupFileNames = ConfigurationManager.GetValue<object[]>(new string[] { "Application", "Startup", "FileNames" }, new object[0]);
-				for (int i = 0; i < oStartupFileNames.Length; i++)
-				{
-					string startupFileName = oStartupFileNames[i].ToString();
-					selectedFileNames.Add(startupFileName);
-				}
-			}
-			foreach (string commandLineArgument in args)
-			{
-				selectedFileNames.Add(commandLineArgument);
-			}
-			mvarSelectedFileNames = new System.Collections.ObjectModel.ReadOnlyCollection<string>(selectedFileNames);
-
-			TemporaryFileManager.RegisterTemporaryDirectory();
-
-			BeforeInitialization();
-
-			// Initialize the branding for the selected application
-			InitializeBranding();
-
-			Initialize();
-
-			MainLoop();
-
-			SessionManager.Save();
-			BookmarksManager.Save();
-			RecentFileManager.Save();
-			ConfigurationManager.Save();
-
-			TemporaryFileManager.UnregisterTemporaryDirectory();
-		}
-		public void RestartApplication()
-		{
-			RestartApplicationInternal();
-		}
-		public void StopApplication()
-		{
-			if (!BeforeStopApplication()) return;
-			Application.Instance.Stop();
-		}
-		protected virtual void RestartApplicationInternal()
-		{
-			// StopApplication();
-			// StartApplication();
-		}
-		protected virtual bool BeforeStopApplication()
-		{
-			return true;
-		}
-
-		public bool ShowCustomOptionDialog(ref DataFormat df, CustomOptionDialogType type)
-		{
-			SettingsProvider coll = null;
-			DataFormatReference dfr = df.MakeReference();
-
-			if (type == CustomOptionDialogType.Export)
-			{
-				coll = dfr.ExportOptions;
-			}
-			else
-			{
-				coll = dfr.ImportOptions;
-			}
-			if (coll == null) return true;
-			if (coll.Count == 0) return true;
-
-			bool retval = ShowCustomOptionDialog(ref coll, dfr.Title + " Options", delegate(object sender, EventArgs e)
-			{
-				ShowAboutDialog(dfr);
-			});
-
-			if (retval)
-			{
-				ApplyCustomOptions(df, coll);
-				return true;
-			}
-			return false;
-		}
-		public bool ShowCustomOptionDialog(ref Accessor df, CustomOptionDialogType type)
-		{
-			if (df == null) return true;
-
-			SettingsProvider coll = null;
-			AccessorReference dfr = df.MakeReference();
-
-			if (type == CustomOptionDialogType.Export)
-			{
-				coll = dfr.ExportOptions;
-			}
-			else
-			{
-				coll = dfr.ImportOptions;
-			}
-			if (coll == null) return true;
-			if (coll.Count == 0) return true;
-
-			bool retval = ShowCustomOptionDialog(ref coll, dfr.Title + " Options");
-
-			if (retval)
-			{
-				ApplyCustomOptions(df, coll);
-				return true;
-			}
-			return false;
-		}
-
-		public void ApplyCustomOptions(object obj, SettingsProvider coll)
-		{
-			if (obj == null) return;
-
-			foreach (SettingsGroup sg in coll.SettingsGroups)
-			{
-				foreach (Setting eo in sg.Settings)
-				{
-					PropertyInfo pi = obj.GetType().GetProperty(eo.Name);
-					if (pi == null) continue;
-
-					if (eo is RangeSetting)
-					{
-						RangeSetting itm = (eo as RangeSetting);
-						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
-					}
-					else if (eo is BooleanSetting)
-					{
-						BooleanSetting itm = (eo as BooleanSetting);
-						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
-					}
-					else if (eo is ChoiceSetting)
-					{
-						object choice = (eo as ChoiceSetting).GetValue();
-						if (choice != null)
-						{
-							Type[] interfaces = pi.PropertyType.GetInterfaces();
-							bool convertible = false;
-							foreach (Type t in interfaces)
-							{
-								if (t == typeof(IConvertible))
-								{
-									convertible = true;
-									break;
-								}
-							}
-							if (convertible)
-							{
-								pi.SetValue(obj, Convert.ChangeType(choice, pi.PropertyType), null);
-							}
-							else
-							{
-								pi.SetValue(obj, choice, null);
-							}
-						}
-					}
-					else if (eo is TextSetting)
-					{
-						TextSetting itm = (eo as TextSetting);
-						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
-					}
-					else if (eo is FileSetting)
-					{
-						FileSetting itm = (eo as FileSetting);
-						pi.SetValue(obj, Convert.ChangeType(itm.GetValue(), pi.PropertyType), null);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/Libraries/UniversalEditor.UserInterface/MainWindow.cs b/Libraries/UniversalEditor.UserInterface/MainWindow.cs
index 86191b9a..bf1ecc72 100644
--- a/Libraries/UniversalEditor.UserInterface/MainWindow.cs
+++ b/Libraries/UniversalEditor.UserInterface/MainWindow.cs
@@ -717,7 +717,7 @@ namespace UniversalEditor.UserInterface
 
 										if (_break)
 										{
-											if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
+											if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref df, CustomOptionDialogType.Import))
 												break;
 										}
 									}
@@ -998,8 +998,8 @@ namespace UniversalEditor.UserInterface
 
 		protected override void OnClosed(EventArgs e)
 		{
-			Engine.CurrentEngine.Windows.Remove(this);
-			if (Engine.CurrentEngine.Windows.Count <= 0)
+			((EditorApplication)Application.Instance).Windows.Remove(this);
+			if (((EditorApplication)Application.Instance).Windows.Count <= 0)
 			{
 				Application.Instance.Stop();
 			}
@@ -1012,8 +1012,8 @@ namespace UniversalEditor.UserInterface
 				new DragDropTarget(DragDropTargetTypes.FileList, DragDropTargetFlags.SameApplication | DragDropTargetFlags.OtherApplication, 0x1)
 			}, DragDropEffect.Copy, MouseButtons.Primary | MouseButtons.Secondary, KeyboardModifierKey.None);
 
-			Engine.CurrentEngine.Windows.Add(this);
-			Engine.CurrentEngine.LastWindow = this;
+			((EditorApplication)Application.Instance).Windows.Add(this);
+			((EditorApplication)Application.Instance).LastWindow = this;
 
 			UpdateMenuItems();
 		}
@@ -1021,7 +1021,7 @@ namespace UniversalEditor.UserInterface
 		protected override void OnGotFocus(EventArgs e)
 		{
 			base.OnGotFocus(e);
-			Engine.CurrentEngine.LastWindow = this;
+			((EditorApplication)Application.Instance).LastWindow = this;
 		}
 
 		#region IHostApplicationWindow implementation
@@ -1122,9 +1122,9 @@ namespace UniversalEditor.UserInterface
 					{
 						// FIXME: support Accessors other than FileAccessor
 						string fileName = (doc.Accessor as FileAccessor).FileName;
-						if (!Engine.CurrentEngine.RecentFileManager.FileNames.Contains(fileName))
+						if (!((EditorApplication)Application.Instance).RecentFileManager.FileNames.Contains(fileName))
 						{
-							Engine.CurrentEngine.RecentFileManager.FileNames.Add(fileName);
+							((EditorApplication)Application.Instance).RecentFileManager.FileNames.Add(fileName);
 						}
 					}
 				}
diff --git a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
index ab80ebb1..ae0a159b 100644
--- a/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
+++ b/Libraries/UniversalEditor.UserInterface/Pages/EditorPage.cs
@@ -471,7 +471,7 @@ namespace UniversalEditor.UserInterface.Pages
 							ObjectModel objm = objms[0].Create();
 							DataFormat fmt = fmts[0].Create();
 
-							if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref fmt, CustomOptionDialogType.Import)) return;
+							if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref fmt, CustomOptionDialogType.Import)) return;
 
 							Document document = new UniversalEditor.Document(objm, fmt, mvarDocument.Accessor);
 							document.InputAccessor.Open();
@@ -497,7 +497,7 @@ namespace UniversalEditor.UserInterface.Pages
 				ObjectModel objm = mvarDocument.ObjectModel;
 				DataFormat fmt = mvarDocument.DataFormat;
 
-				if (!Engine.CurrentEngine.ShowCustomOptionDialog(ref fmt, CustomOptionDialogType.Import)) return;
+				if (!((EditorApplication)Application.Instance).ShowCustomOptionDialog(ref fmt, CustomOptionDialogType.Import)) return;
 
 				Document document = new UniversalEditor.Document(objm, fmt, mvarDocument.Accessor);
 				document.InputAccessor.Open();
diff --git a/Libraries/UniversalEditor.UserInterface/Pages/StartPage.cs b/Libraries/UniversalEditor.UserInterface/Pages/StartPage.cs
index 3a425fd7..1893c45b 100644
--- a/Libraries/UniversalEditor.UserInterface/Pages/StartPage.cs
+++ b/Libraries/UniversalEditor.UserInterface/Pages/StartPage.cs
@@ -66,7 +66,7 @@ namespace UniversalEditor.UserInterface.Panels
 				ctHeaderText.Visible = true;
 			}
 
-			foreach (string fileName in Engine.CurrentEngine.RecentFileManager.FileNames)
+			foreach (string fileName in ((EditorApplication)Application.Instance).RecentFileManager.FileNames)
 			{
 				TreeModelRow row = new TreeModelRow(new TreeModelRowColumn[]
 				{
diff --git a/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs b/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
index 8e4f8c9f..34deb298 100644
--- a/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
+++ b/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs
@@ -307,11 +307,11 @@ namespace UniversalEditor.UserInterface.Panels
 			{
 				if (file.SourceFileAccessor != null)
 				{
-					Engine.CurrentEngine.LastWindow.OpenFile(new Document(file.SourceFileAccessor));
+					((EditorApplication)Application.Instance).LastWindow.OpenFile(new Document(file.SourceFileAccessor));
 				}
 				else
 				{
-					Engine.CurrentEngine.LastWindow.OpenFile(file.SourceFileName);
+					((EditorApplication)Application.Instance).LastWindow.OpenFile(file.SourceFileName);
 				}
 			}
 			else if (folder != null)
@@ -389,13 +389,13 @@ namespace UniversalEditor.UserInterface.Panels
 
 		private void mnuContextSolutionAddNewProject_Click(object sender, EventArgs e)
 		{
-			MainWindow mw = (Engine.CurrentEngine.LastWindow as MainWindow);
+			MainWindow mw = (((EditorApplication)Application.Instance).LastWindow as MainWindow);
 			if (mw == null) return;
 			mw.NewProject(true);
 		}
 		private void mnuContextSolutionAddExistingProject_Click(object sender, EventArgs e)
 		{
-			MainWindow mw = (Engine.CurrentEngine.LastWindow as MainWindow);
+			MainWindow mw = (((EditorApplication)Application.Instance).LastWindow as MainWindow);
 			if (mw == null) return;
 
 			ProjectObjectModel proj = mw.ShowOpenProjectDialog();
diff --git a/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj b/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
index 5d9134fa..7d75b401 100644
--- a/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
+++ b/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
@@ -60,7 +60,6 @@
     <Compile Include="ConfigurationManager.cs" />
     <Compile Include="CustomOptionDialogType.cs" />
     <Compile Include="EditorReference.cs" />
-    <Compile Include="Engine.cs" />
     <Compile Include="Editor.cs" />
     <Compile Include="ObjectModelChangingEvent.cs" />
     <Compile Include="Perspective.cs" />