diff --git a/App/ModernWpfPlayground.csproj b/App/ModernWpfPlayground.csproj
index feed22f..6a1a116 100644
--- a/App/ModernWpfPlayground.csproj
+++ b/App/ModernWpfPlayground.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="FastMember" Version="1.5.0" />
-    <PackageReference Include="ModernWpfUI" Version="0.9.0-preview.200425.2" />
-    <PackageReference Include="Prism.DryIoc" Version="7.2.0.1422" />
-    <PackageReference Include="Prism.Wpf" Version="7.2.0.1422" />
-    <PackageReference Include="YamlDotNet" Version="8.1.0" />
+    <PackageReference Include="ModernWpfUI" Version="0.9.0-preview.200505.0" />
+    <PackageReference Include="Prism.DryIoc" Version="8.0.0.1740-pre" />
+    <PackageReference Include="Prism.Wpf" Version="8.0.0.1740-pre" />
+    <PackageReference Include="YamlDotNet" Version="8.1.1" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/App/MvvmStuff/TaskExtensions.cs b/App/MvvmStuff/TaskExtensions.cs
deleted file mode 100644
index e315c7d..0000000
--- a/App/MvvmStuff/TaskExtensions.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// ReSharper disable CheckNamespace
-namespace System.Threading.Tasks
-{
-    /// <summary>
-    /// Extension methods for the Task object.
-    /// </summary>
-    public static class TaskExtensions
-    {
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        public static void Await(this Task task)
-        {
-            task.Await(null, null, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="configureAwait">Configures an awaiter used to await this task</param>
-        public static void Await(this Task task, bool configureAwait)
-        {
-            task.Await(null, null, configureAwait);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        public static void Await(this Task task, Action completedCallback)
-        {
-            task.Await(completedCallback, null, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        public static void Await(this Task task, Action completedCallback, Action<Exception> errorCallback)
-        {
-            task.Await(completedCallback, errorCallback, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        public static void Await(this Task task, Action<Exception> errorCallback)
-        {
-            task.Await(null, errorCallback, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        /// <param name="configureAwait">Configures an awaiter used to await this task</param>
-        public async static void Await(this Task task, Action? completedCallback, Action<Exception>? errorCallback, bool configureAwait)
-        {
-            try
-            {
-                await task.ConfigureAwait(configureAwait);
-                completedCallback?.Invoke();
-            }
-            catch (Exception ex)
-            {
-                errorCallback?.Invoke(ex);
-            }
-        }       
-    }
-}
diff --git a/App/MvvmStuff/TaskExtensions{T}.cs b/App/MvvmStuff/TaskExtensions{T}.cs
deleted file mode 100644
index 5d3364f..0000000
--- a/App/MvvmStuff/TaskExtensions{T}.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// ReSharper disable CheckNamespace
-namespace System.Threading.Tasks
-{
-    /// <summary>
-    /// Extension methods for the Task object.
-    /// </summary>
-    public static class TaskExtensionsT
-    {
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        public static void Await<T>(this Task<T> task)
-        {
-            task.Await(null, null, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="configureAwait">Configures an awaiter used to await this task</param>
-        public static void Await<T>(this Task<T> task, bool configureAwait)
-        {
-            task.Await(null, null, configureAwait);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        public static void Await<T>(this Task<T> task, Action<T> completedCallback)
-        {
-            task.Await(completedCallback, null, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        public static void Await<T>(this Task<T> task, Action<T> completedCallback, Action<Exception> errorCallback)
-        {
-            task.Await(completedCallback, errorCallback, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        public static void Await<T>(this Task<T> task, Action<Exception> errorCallback)
-        {
-            task.Await(null, errorCallback, false);
-        }
-
-        /// <summary>
-        /// Awaits a task without blocking the main thread.
-        /// </summary>
-        /// <remarks>Primarily used to replace async void scenarios such as ctor's and ICommands.</remarks>
-        /// <typeparam name="T">The result type</typeparam>
-        /// <param name="task">The task to be awaited</param>
-        /// <param name="completedCallback">The action to perform when the task is complete.</param>
-        /// <param name="errorCallback">The action to perform when an error occurs executing the task.</param>
-        /// <param name="configureAwait">Configures an awaiter used to await this task</param>
-        public async static void Await<T>(this Task<T> task, Action<T>? completedCallback, Action<Exception>? errorCallback, bool configureAwait)
-        {
-            try
-            {
-                var result = await task.ConfigureAwait(configureAwait);
-                completedCallback?.Invoke(result);
-            }
-            catch (Exception ex)
-            {
-                errorCallback?.Invoke(ex);
-            }
-        }
-    }
-}