diff --git a/src/Orchestra.Examples.MahApps/App.xaml.cs b/src/Orchestra.Examples.MahApps/App.xaml.cs
index 93a59f2b9..3c3d82197 100644
--- a/src/Orchestra.Examples.MahApps/App.xaml.cs
+++ b/src/Orchestra.Examples.MahApps/App.xaml.cs
@@ -15,27 +15,20 @@
     /// </summary>
     public partial class App : Application
     {
-        #region Constants
         private static readonly ILog Log = LogManager.GetCurrentClassLogger();
-        #endregion
 
-        #region Fields
         private readonly DateTime _start;
         private readonly Stopwatch _stopwatch;
         private DateTime _end;
-        #endregion
 
-        #region Constructors
         public App()
         {
             _stopwatch = new Stopwatch();
             _stopwatch.Start();
             _start = DateTime.Now;
         }
-        #endregion
 
-        #region Methods
-        protected override void OnStartup(StartupEventArgs e)
+        protected override async void OnStartup(StartupEventArgs e)
         {
 #if DEBUG
             LogManager.AddDebugListener(true);
@@ -51,7 +44,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             var serviceLocator = ServiceLocator.Default;
             var shellService = serviceLocator.ResolveType<IShellService>();
-            shellService.CreateAsync<ShellWindow>();
+            await shellService.CreateAsync<ShellWindow>();
 
             _end = DateTime.Now;
             _stopwatch.Stop();
@@ -59,6 +52,5 @@ protected override void OnStartup(StartupEventArgs e)
             Log.Info("Elapsed startup stopwatch time: {0}", _stopwatch.Elapsed);
             Log.Info("Elapsed startup time: {0}", _end - _start);
         }
-        #endregion
     }
 }
diff --git a/src/Orchestra.Examples.MahApps/Themes/MaterialDesign.xaml b/src/Orchestra.Examples.MahApps/Themes/MaterialDesign.xaml
index 559f61be8..0d55185f9 100644
--- a/src/Orchestra.Examples.MahApps/Themes/MaterialDesign.xaml
+++ b/src/Orchestra.Examples.MahApps/Themes/MaterialDesign.xaml
@@ -12,7 +12,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml"/>
 
-        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/Generic.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Defaults.xaml"/>
 
         <materialDesignMahApps:MahAppsCustomColorTheme BaseTheme="Dark" PrimaryColor="Orange" SecondaryColor="Gray" />