diff --git a/CSharp/V5/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj b/CSharp/V5/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
index eebbe8cc..b11a5028 100644
--- a/CSharp/V5/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
+++ b/CSharp/V5/Applications/UniversalEditor.Bootstrapper/UniversalEditor.Bootstrapper.csproj
@@ -79,7 +79,7 @@
       <Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
       <Name>UniversalEditor.UserInterface</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
+    <ProjectReference Include="..\..\Libraries\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
       <Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
       <Name>UniversalEditor.Essential</Name>
     </ProjectReference>
diff --git a/CSharp/V5/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj b/CSharp/V5/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
index 1c2732d7..f8383e61 100644
--- a/CSharp/V5/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
+++ b/CSharp/V5/Applications/UniversalEditor.ConsoleBootstrapper/UniversalEditor.ConsoleBootstrapper.csproj
@@ -57,7 +57,7 @@
       <Project>{8622EBC4-8E20-476E-B284-33D472081F5C}</Project>
       <Name>UniversalEditor.UserInterface</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
+    <ProjectReference Include="..\..\Libraries\UniversalEditor.Essential\UniversalEditor.Essential.csproj">
       <Project>{30467E5C-05BC-4856-AADC-13906EF4CADD}</Project>
       <Name>UniversalEditor.Essential</Name>
     </ProjectReference>
diff --git a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/UniversalEditor.Engines.WindowsForms.csproj b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/UniversalEditor.Engines.WindowsForms.csproj
index d7511b16..f323319c 100644
--- a/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/UniversalEditor.Engines.WindowsForms.csproj
+++ b/CSharp/V5/Engines/WindowsForms/Engines/UniversalEditor.Engines.WindowsForms/UniversalEditor.Engines.WindowsForms.csproj
@@ -38,6 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
@@ -69,7 +70,6 @@
     <Compile Include="Dialogs\DocumentPropertiesDialog.Designer.cs">
       <DependentUpon>DocumentPropertiesDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="LocalConfiguration.cs" />
     <Compile Include="Controls\ErrorList.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -131,6 +131,9 @@
       <DependentUpon>UnsavedDocumentsDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="IconMethods.cs" />
+    <Compile Include="LocalConfiguration.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="MainWindow.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj b/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj
index 405c7ae9..6ca21318 100644
--- a/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj
+++ b/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/UniversalEditor.UserInterface.WindowsForms.csproj
@@ -35,6 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
diff --git a/CSharp/V5/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/CSharp/V5/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
index 8f72da22..fbd74b58 100644
--- a/CSharp/V5/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
+++ b/CSharp/V5/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
@@ -35,6 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
diff --git a/CSharp/V5/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/V5/Libraries/UniversalEditor.UserInterface/Engine.cs
index 800e2fc2..b78cf9c2 100644
--- a/CSharp/V5/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/CSharp/V5/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -521,10 +521,11 @@ namespace UniversalEditor.UserInterface
 			}
 		}
 
+		// FIXME: this is the single XML configuration file loader that should be executed at the beginning of engine launch
 		protected virtual void InitializeXMLConfiguration()
 		{
 			#region Load the XML files
-			string[] xmlfiles = System.IO.Directory.GetFiles(mvarBasePath, "*.uexml", System.IO.SearchOption.AllDirectories);
+			string[] xmlfiles = System.IO.Directory.GetFiles(mvarBasePath, System.Configuration.ConfigurationManager.AppSettings["UniversalEditor.Configuration.ConfigurationFileNameFilter"], System.IO.SearchOption.AllDirectories);
 
 			UpdateSplashScreenStatus("Loading XML configuration files", 0, 0, xmlfiles.Length);
 
@@ -790,8 +791,8 @@ namespace UniversalEditor.UserInterface
 			}
 			#endregion
 
-			UpdateSplashScreenStatus("Finalizing configuration");
-			ConfigurationManager.Load();
+			// UpdateSplashScreenStatus("Finalizing configuration");
+			// ConfigurationManager.Load();
 			#endregion
 		}
 
diff --git a/CSharp/V5/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj b/CSharp/V5/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
index c855acdd..ae19623b 100644
--- a/CSharp/V5/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
+++ b/CSharp/V5/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
@@ -50,6 +50,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Remoting" />
   </ItemGroup>