diff --git a/App/MainWindowViewModel.cs b/App/MainWindowViewModel.cs
index 269aea5..6131b3f 100644
--- a/App/MainWindowViewModel.cs
+++ b/App/MainWindowViewModel.cs
@@ -57,19 +57,19 @@ namespace ModernWpfPlayground
 
         public Visibility VisibilityEnumTest
         {
-            get => GetProperty<Visibility>();
+            get => GetProperty(Visibility.Visible);
             set => SetProperty(value);
         }
 
         public double SliderTest
         {
-            get => GetProperty<double>(100);
+            get => GetProperty(100D);
             set => SetProperty(value);
         }
 
         public double ValidationTest
         {
-            get => GetProperty<double>();
+            get => GetProperty(0D);
             set => SetProperty(value);
         }
 
diff --git a/App/ModernWpfPlayground.csproj b/App/ModernWpfPlayground.csproj
index 9bd6a89..aea1af3 100644
--- a/App/ModernWpfPlayground.csproj
+++ b/App/ModernWpfPlayground.csproj
@@ -9,12 +9,12 @@
 
   <ItemGroup>
     <PackageReference Include="FastMember" Version="1.5.0" />
-    <PackageReference Include="ModernWpfUI" Version="0.9.0" />
-    <PackageReference Include="Prism.DryIoc" Version="8.0.0.1740-pre" />
-    <PackageReference Include="Prism.Wpf" Version="8.0.0.1740-pre" />
+    <PackageReference Include="ModernWpfUI" Version="0.9.2-preview.200803.0" />
+    <PackageReference Include="Prism.DryIoc" Version="8.0.0.1850-pre" />
+    <PackageReference Include="Prism.Wpf" Version="8.0.0.1850-pre" />
     <PackageReference Include="YamlDotNet" Version="8.1.2" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
-    <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.3.0" />
+    <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/App/MvvmStuff/BaseViewModel.cs b/App/MvvmStuff/BaseViewModel.cs
index 309bc92..db3993a 100644
--- a/App/MvvmStuff/BaseViewModel.cs
+++ b/App/MvvmStuff/BaseViewModel.cs
@@ -16,6 +16,7 @@ namespace ModernWpfPlayground.MvvmStuff
 
         private readonly Dictionary<string, object?> _values = new Dictionary<string, object?>();
         protected readonly ObjectAccessor ObjectAccessor;
+        private readonly Dictionary<string, object?> _defaultValues = new Dictionary<string, object?>();
 
         protected IReadOnlyDictionary<string, object?> Values => _values;
 
@@ -34,21 +35,21 @@ namespace ModernWpfPlayground.MvvmStuff
         protected T GetProperty<T>(T defaultValue = default, [CallerMemberName] string? propertyName = null)
         {
             if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
-            return Values.TryGetValue(propertyName, out var obj) ? (T)obj! : defaultValue;
+            if (Values.TryGetValue(propertyName, out var obj))
+            {
+                return (T) obj!;
+            }
+
+            _defaultValues[propertyName] =defaultValue;
+            return defaultValue;
         }
 
-        protected void ResetViewModel(Func<string, bool>? predicate = null)
+        protected void ResetViewModel()
         {
-            IEnumerable<string> keys = _values.Keys.ToArray();
-            if (predicate != null) keys = keys.Where(predicate);
-            foreach (var key in keys)
+            foreach (var (key, value) in _values.ToArray())
             {
-                var currentValue = ObjectAccessor[key];
-                _values.Remove(key);
-                var newValue = ObjectAccessor[key];
-                if (Equals(currentValue, newValue)) continue;
-                _values.Add(key, currentValue);
-                ObjectAccessor[key] = newValue;
+                if (_defaultValues.TryGetValue(key, out var defaultValue) && Equals(value, defaultValue)) continue;
+                ObjectAccessor[key] = defaultValue;
             }
         }
 
@@ -56,14 +57,11 @@ namespace ModernWpfPlayground.MvvmStuff
 
         protected void LoadViewModel()
         {
-            var keysFromFile = new SortedSet<string>();
+            ResetViewModel();
             foreach (var (key, value) in GetViewModelItems())
             {
-                keysFromFile.Add(key);
                 ObjectAccessor[key] = value;
             }
-
-            ResetViewModel(x => !keysFromFile.Contains(x));
         }
     }
 }
\ No newline at end of file
diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj
index ca94cbd..1a5ff40 100644
--- a/Controls/Controls.csproj
+++ b/Controls/Controls.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ModernWpfUI" Version="0.9.0" />
+    <PackageReference Include="ModernWpfUI" Version="0.9.2-preview.200803.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>