diff --git a/MPF/App.xaml.cs b/MPF/App.xaml.cs
index 2fc162fd..78e9bf85 100644
--- a/MPF/App.xaml.cs
+++ b/MPF/App.xaml.cs
@@ -2,7 +2,6 @@
 using MPF.Core.Data;
 using MPF.Core.Utilities;
 using MPF.UI.Core.ViewModels;
-using MPF.UI.ViewModels;
 using MPF.Windows;
 
 namespace MPF
diff --git a/MPF/ViewModels/MainViewModel.cs b/MPF/ViewModels/MainViewModel.cs
index f7b7b4e6..e14bfe37 100644
--- a/MPF/ViewModels/MainViewModel.cs
+++ b/MPF/ViewModels/MainViewModel.cs
@@ -72,30 +72,30 @@ namespace MPF.UI.ViewModels
         /// <summary>
         /// Initialize the main window after loading
         /// </summary>
-        public void Init()
+        public void Init(MainWindow instance, LogViewModel logger, MPF.Core.Data.Options options)
         {
             // Load the log output
-            App.Instance.LogPanel.IsExpanded = App.Options.OpenLogWindowAtStartup;
+            instance.LogPanel.IsExpanded = options.OpenLogWindowAtStartup;
 
             // Disable buttons until we load fully
-            App.Instance.StartStopButton.IsEnabled = false;
-            App.Instance.MediaScanButton.IsEnabled = false;
-            App.Instance.UpdateVolumeLabel.IsEnabled = false;
-            App.Instance.CopyProtectScanButton.IsEnabled = false;
+            instance.StartStopButton.IsEnabled = false;
+            instance.MediaScanButton.IsEnabled = false;
+            instance.UpdateVolumeLabel.IsEnabled = false;
+            instance.CopyProtectScanButton.IsEnabled = false;
 
             // Add the click handlers to the UI
-            AddEventHandlers(App.Instance);
+            AddEventHandlers(instance);
 
             // Display the debug option in the menu, if necessary
-            if (App.Options.ShowDebugViewMenuItem)
-                App.Instance.DebugViewMenuItem.Visibility = Visibility.Visible;
+            if (options.ShowDebugViewMenuItem)
+                instance.DebugViewMenuItem.Visibility = Visibility.Visible;
 
             // Finish initializing the rest of the values
-            InitializeUIValues(App.Instance, App.Logger, App.Options, removeEventHandlers: false, rescanDrives: true);
+            InitializeUIValues(instance, logger, options, removeEventHandlers: false, rescanDrives: true);
 
             // Check for updates, if necessary
-            if (App.Options.CheckForUpdatesOnStartup)
-                CheckForUpdates(App.Instance, App.Logger, showIfSame: false);
+            if (options.CheckForUpdatesOnStartup)
+                CheckForUpdates(instance, logger, showIfSame: false);
         }
 
         #region Population
diff --git a/MPF/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs
index dbba3f09..c74ab4f6 100644
--- a/MPF/Windows/MainWindow.xaml.cs
+++ b/MPF/Windows/MainWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace MPF.Windows
         protected override void OnContentRendered(EventArgs e)
         {
             base.OnContentRendered(e);
-            MainViewModel.Init();
+            MainViewModel.Init(App.Instance, App.Logger, App.Options);
         }
     }
 }