diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
index 1f1ab7e3..17f7d35e 100644
--- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
+++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/Editors/RebelSoftware/InstallationScript/InstallationScriptEditor.cs
@@ -7,9 +7,11 @@ using System.Windows.Forms;
 
 using UniversalEditor.UserInterface.WindowsForms;
 
-using UniversalEditor.Plugins.RebelSoftware.ObjectModels.InstallationScript;
+using UniversalEditor.ObjectModels.RebelSoftware.InstallationScript;
 using UniversalEditor.ObjectModels.RebelSoftware.InstallationScript.Dialogs;
 
+using ISDialog = UniversalEditor.ObjectModels.RebelSoftware.InstallationScript.Dialog;
+
 namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 {
 	public partial class InstallationScriptEditor : Editor
@@ -19,6 +21,17 @@ namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 			InitializeComponent();
 		}
 
+		private static UserInterface.EditorReference _er = null;
+		public override UserInterface.EditorReference MakeReference()
+		{
+			if (_er == null)
+			{
+				_er = base.MakeReference();
+				_er.SupportedObjectModels.Add(typeof(InstallationScriptObjectModel));
+			}
+			return _er;
+		}
+
 		protected override void OnObjectModelChanged(EventArgs e)
 		{
 			base.OnObjectModelChanged(e);
@@ -30,7 +43,7 @@ namespace UniversalEditor.Editors.RebelSoftware.InstallationScript
 
 			TreeNode nodeDialogs = new TreeNode("Dialogs");
 
-			foreach (Dialog dialog in script.Dialogs)
+			foreach (ISDialog dialog in script.Dialogs)
 			{
 				TreeNode tn = new TreeNode();
 				if (dialog is WelcomeDialog)
diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj
index 958f0afa..7ff72cc9 100644
--- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj
+++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\Output\Debug\Plugins\</OutputPath>
+    <OutputPath>..\..\..\..\Output\Debug\Plugins\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\Output\Release\Plugins\</OutputPath>
+    <OutputPath>..\..\..\..\Output\Release\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -37,7 +37,9 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Editors\RebelSoftware\InstallationScript\InstallationScriptEditor.cs" />
+    <Compile Include="Editors\RebelSoftware\InstallationScript\InstallationScriptEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="Editors\RebelSoftware\InstallationScript\InstallationScriptEditor.Designer.cs">
       <DependentUpon>InstallationScriptEditor.cs</DependentUpon>
     </Compile>
@@ -53,6 +55,10 @@
       <Project>{2d4737e6-6d95-408a-90db-8dff38147e85}</Project>
       <Name>UniversalEditor.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Libraries\UniversalEditor.UserInterface\UniversalEditor.UserInterface.csproj">
+      <Project>{8622ebc4-8e20-476e-b284-33d472081f5c}</Project>
+      <Name>UniversalEditor.UserInterface</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Plugins\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
       <Project>{30467e5c-05bc-4856-aadc-13906ef4cadd}</Project>
       <Name>UniversalEditor.Essential</Name>
@@ -61,6 +67,10 @@
       <Project>{311885be-3faf-430b-91b2-6ec135d3a8ab}</Project>
       <Name>UniversalEditor.Plugins.RebelSoftware</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Libraries\UniversalEditor.UserInterface.WindowsForms\UniversalEditor.UserInterface.WindowsForms.csproj">
+      <Project>{bcbb72bd-0ecb-4ff2-8d91-e466361fb6f9}</Project>
+      <Name>UniversalEditor.UserInterface.WindowsForms</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/CSharp/Plugins/UniversalEditor.Plugins.Microsoft.Merlin/DataFormats/Multimedia/FileSystem/Microsoft/Merlin/TEXDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft.Merlin/DataFormats/Multimedia/FileSystem/Microsoft/Merlin/TEXDataFormat.cs
index 45bef6e5..a8b676ed 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft.Merlin/DataFormats/Multimedia/FileSystem/Microsoft/Merlin/TEXDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft.Merlin/DataFormats/Multimedia/FileSystem/Microsoft/Merlin/TEXDataFormat.cs
@@ -23,7 +23,7 @@ namespace UniversalEditor.DataFormats.Multimedia.FileSystem.Microsoft.Merlin
 			{
 				_dfr = base.MakeReferenceInternal();
 				_dfr.Capabilities.Add(typeof(FileSystemObjectModel), DataFormatCapabilities.All);
-				_dfr.Filters.Add("Microsoft Merlin Game Engine (Hover!) texture pack", new string[] { "*.tex" });
+				// _dfr.Filters.Add("Microsoft Merlin Game Engine (Hover!) texture pack", new string[] { "*.tex" });
 			}
 			return _dfr;
 		}
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Action.cs b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Action.cs
index ba14a4e2..24e7d294 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Action.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Action.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UniversalEditor.Plugins.RebelSoftware.ObjectModels.InstallationScript
+namespace UniversalEditor.ObjectModels.RebelSoftware.InstallationScript
 {
 	public abstract class Action : ICloneable
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialog.cs b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialog.cs
index 1597a892..6197c854 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialog.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialog.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UniversalEditor.Plugins.RebelSoftware.ObjectModels.InstallationScript
+namespace UniversalEditor.ObjectModels.RebelSoftware.InstallationScript
 {
 	public abstract class Dialog : ICloneable
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialogs/LicenseDialog.cs b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialogs/LicenseDialog.cs
index f3d668ba..e884af37 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialogs/LicenseDialog.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/Dialogs/LicenseDialog.cs
@@ -9,5 +9,12 @@ namespace UniversalEditor.ObjectModels.RebelSoftware.InstallationScript.Dialogs
 	{
 		private string mvarLicenseFileName = String.Empty;
 		public string LicenseFileName { get { return mvarLicenseFileName; } set { mvarLicenseFileName = value; } }
+
+		public override object Clone()
+		{
+			LicenseDialog clone = new LicenseDialog();
+			clone.LicenseFileName = (mvarLicenseFileName.Clone() as string);
+			return clone;
+		}
 	}
 }
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/InstallationScriptObjectModel.cs b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/InstallationScriptObjectModel.cs
index b8d3e234..17dba9eb 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/InstallationScriptObjectModel.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.RebelSoftware/ObjectModels/RebelSoftware/InstallationScript/InstallationScriptObjectModel.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UniversalEditor.Plugins.RebelSoftware.ObjectModels.InstallationScript
+namespace UniversalEditor.ObjectModels.RebelSoftware.InstallationScript
 {
 	public class InstallationScriptObjectModel : ObjectModel
 	{