3 files changed, 10 insertions, 33 deletions
diff --git a/MediaBrowser.UI/App.xaml.cs b/MediaBrowser.UI/App.xaml.cs
index 7d627e0a9..bae133ab7 100644
--- a/MediaBrowser.UI/App.xaml.cs
+++ b/MediaBrowser.UI/App.xaml.cs
@@ -244,7 +244,7 @@ namespace MediaBrowser.UI
         /// <returns>IKernel.</returns>
         protected override IKernel InstantiateKernel()
         {
-            return new UIKernel();
+            return new UIKernel(new PismoIsoManager());
         }
 
         /// <summary>
@@ -259,16 +259,6 @@ namespace MediaBrowser.UI
         }
 
         /// <summary>
-        /// Instantiates the iso manager.
-        /// </summary>
-        /// <param name="kernel">The kernel.</param>
-        /// <returns>IIsoManager.</returns>
-        protected override IIsoManager InstantiateIsoManager(IKernel kernel)
-        {
-            return new IsoManager(kernel);
-        }
-
-        /// <summary>
         /// Shows the application window.
         /// </summary>
         private void ShowApplicationWindow()
@@ -368,7 +358,7 @@ namespace MediaBrowser.UI
             {
                 var now = DateTime.UtcNow;
 
-                await Kernel.Init(InstantiateIsoManager(Kernel));
+                await Kernel.Init();
 
                 Logger.Info("Kernel.Init completed in {0} seconds.", (DateTime.UtcNow - now).TotalSeconds);
 
diff --git a/MediaBrowser.UI/Controller/UIKernel.cs b/MediaBrowser.UI/Controller/UIKernel.cs
index be313e153..2c06e7b93 100644
--- a/MediaBrowser.UI/Controller/UIKernel.cs
+++ b/MediaBrowser.UI/Controller/UIKernel.cs
@@ -1,7 +1,5 @@
-using System.Net;
-using System.Net.Cache;
-using System.Net.Http;
-using MediaBrowser.ApiInteraction;
+using MediaBrowser.ApiInteraction;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Logging;
 using MediaBrowser.Model.Connectivity;
@@ -14,6 +12,9 @@ using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Cache;
+using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 
@@ -45,8 +46,8 @@ namespace MediaBrowser.UI.Controller
         /// <summary>
         /// Initializes a new instance of the <see cref="UIKernel" /> class.
         /// </summary>
-        public UIKernel()
-            : base()
+        public UIKernel(IIsoManager isoManager)
+            : base(isoManager)
         {
             Instance = this;
         }
@@ -148,20 +149,6 @@ namespace MediaBrowser.UI.Controller
         }
 
         /// <summary>
-        /// Gets the composable part assemblies.
-        /// </summary>
-        /// <returns>IEnumerable{Assembly}.</returns>
-        protected override IEnumerable<Assembly> GetComposablePartAssemblies()
-        {
-            var runningDirectory = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
-
-            return base.GetComposablePartAssemblies().Concat(new[] { 
-            
-                Assembly.Load(File.ReadAllBytes(Path.Combine(runningDirectory, "MediaBrowser.Plugins.DefaultTheme.dll")))
-            });
-        }
-
-        /// <summary>
         /// Called when [composable parts loaded].
         /// </summary>
         /// <returns>Task.</returns>
diff --git a/MediaBrowser.UI/MediaBrowser.UI.csproj b/MediaBrowser.UI/MediaBrowser.UI.csproj
index d2db097aa..8d6432ebb 100644
--- a/MediaBrowser.UI/MediaBrowser.UI.csproj
+++ b/MediaBrowser.UI/MediaBrowser.UI.csproj
@@ -397,7 +397,7 @@
     <Content Include="libvlccore.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="MediaBrowser.Plugins.DefaultTheme.dll">
+    <Content Include="CorePlugins\MediaBrowser.Plugins.DefaultTheme.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="plugins\3dnow\libmemcpy3dn_plugin.dll">