diff --git a/Yugen.Mosaic.Uwp/App.xaml b/Yugen.Mosaic.Uwp/App.xaml
index ec16e0b..11c9251 100644
--- a/Yugen.Mosaic.Uwp/App.xaml
+++ b/Yugen.Mosaic.Uwp/App.xaml
@@ -1,9 +1,8 @@
 <Application x:Class="Yugen.Mosaic.Uwp.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:Yugen.Mosaic.Uwp"
-             xmlns:converters="using:Yugen.Toolkit.Uwp.Converters"
-             xmlns:validation="using:Yugen.Toolkit.Standard.Validation">
+             xmlns:validation="using:Yugen.Toolkit.Standard.Validation"
+             xmlns:converters="using:Yugen.Toolkit.Uwp.Converters">
 
     <Application.Resources>
 
@@ -284,9 +283,7 @@
                         <Setter Property="Foreground"
                                 Value="{ThemeResource AppForegroundBrush}" />
                     </Style>
-                    
                 </ResourceDictionary>
-
             </ResourceDictionary.MergedDictionaries>
 
             <ResourceDictionary.ThemeDictionaries>
@@ -318,7 +315,6 @@
                     <Color x:Key="TitleBarButtonForeground">#242424</Color>
                     <Color x:Key="TitleBarButtonHoverBackground">White</Color>
                     <Color x:Key="TitleBarButtonHoverForeground">#242424</Color>
-
                 </ResourceDictionary>
 
                 <ResourceDictionary x:Key="Dark">
@@ -348,9 +344,7 @@
                     <Color x:Key="TitleBarButtonForeground">#dcdcdc</Color>
                     <Color x:Key="TitleBarButtonHoverBackground">#262626</Color>
                     <Color x:Key="TitleBarButtonHoverForeground">#dcdcdc</Color>
-
                 </ResourceDictionary>
-
             </ResourceDictionary.ThemeDictionaries>
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -360,9 +354,6 @@
                     <validation:RegexValidationRule  RegexPattern="^[1-9]\d*$" />
                 </validation:ValidationRules.Rules>
             </validation:ValidationRules>
-
         </ResourceDictionary>
-
     </Application.Resources>
-
-</Application>
+</Application>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml b/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
index 92cc31e..6934713 100644
--- a/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
+++ b/Yugen.Mosaic.Uwp/Controls/SettingsDialog.xaml
@@ -1,12 +1,12 @@
 <dialogs:YugenDialog  x:Class="Yugen.Mosaic.Uwp.Controls.SettingsDialog"
                       x:Uid="Settings"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                       xmlns:xaml="using:Windows.UI.Xaml"
-                      xmlns:converters="using:Yugen.Toolkit.Uwp.Converters"
                       xmlns:dialogs="using:Yugen.Toolkit.Uwp.Controls.Dialogs"
+                      xmlns:converters="using:Yugen.Toolkit.Uwp.Converters"
                       mc:Ignorable="d"
                       Background="{ThemeResource AppDeepBackgroundBrush}"
                       RequestedTheme="{x:Bind ViewModel.ElementTheme, Mode=OneWay}">
@@ -86,5 +86,4 @@
                          Margin="0,-4,0,0"
                          Style="{ThemeResource YugenHyperlinkButtonStyle}" />
     </StackPanel>
-
 </dialogs:YugenDialog>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml b/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml
index 0254249..d90086b 100644
--- a/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml
+++ b/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml
@@ -1,9 +1,8 @@
 <dialogs:YugenDialog x:Class="Yugen.Mosaic.Uwp.Controls.WhatsNewDialog"
                      x:Uid="WhatsNew"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:local="using:Yugen.Mosaic.Uwp.Controls"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:dialogs="using:Yugen.Toolkit.Uwp.Controls.Dialogs"
                      mc:Ignorable="d"
@@ -13,9 +12,9 @@
 
         <TextBlock Text="{x:Bind ViewModel.Body}"
                    TextWrapping="WrapWholeWords" />
-        
+
         <!--Footer-->
-        <Image Margin="0,16,0,0" 
+        <Image Margin="0,16,0,0"
                Source="ms-appx:///Assets/Images/UWPCommunityGif.gif"
                Stretch="Uniform"
                Width="60" />
@@ -34,7 +33,5 @@
                          FontStyle="Italic"
                          HorizontalAlignment="Center"
                          Style="{ThemeResource YugenHyperlinkButtonStyle}" />
-
     </StackPanel>
-
-</dialogs:YugenDialog>
+</dialogs:YugenDialog>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml.cs b/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml.cs
index 038fbec..994aecb 100644
--- a/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml.cs
+++ b/Yugen.Mosaic.Uwp/Controls/WhatsNewDialog.xaml.cs
@@ -17,4 +17,4 @@ public WhatsNewDialog()
 
         private WhatsNewViewModel ViewModel => (WhatsNewViewModel)DataContext;
     }
-}
+}
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Helpers/OnboardingHelper.cs b/Yugen.Mosaic.Uwp/Helpers/OnboardingHelper.cs
index 77598bc..c7fad8c 100644
--- a/Yugen.Mosaic.Uwp/Helpers/OnboardingHelper.cs
+++ b/Yugen.Mosaic.Uwp/Helpers/OnboardingHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using Windows.UI.Xaml;
+using Windows.UI.Xaml;
 using Yugen.Mosaic.Uwp.Enums;
 using Yugen.Mosaic.Uwp.Models;
 using Yugen.Toolkit.Uwp.Helpers;
diff --git a/Yugen.Mosaic.Uwp/Models/OnboardingElement.cs b/Yugen.Mosaic.Uwp/Models/OnboardingElement.cs
index c42248a..0fc3ee9 100644
--- a/Yugen.Mosaic.Uwp/Models/OnboardingElement.cs
+++ b/Yugen.Mosaic.Uwp/Models/OnboardingElement.cs
@@ -15,8 +15,11 @@ public OnboardingElement(FrameworkElement target, OnboardingStage stage)
         }
 
         public OnboardingStage Stage { get; set; }
+
         public string Subtitle { get; set; }
+
         public FrameworkElement Target { get; set; }
+
         public string Title { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Models/Tile.cs b/Yugen.Mosaic.Uwp/Models/Tile.cs
index 651b042..1ac3899 100644
--- a/Yugen.Mosaic.Uwp/Models/Tile.cs
+++ b/Yugen.Mosaic.Uwp/Models/Tile.cs
@@ -28,7 +28,7 @@ public void Process(Size tileSize, IRandomAccessStream RandomAccessStream)
         {
             using (var stream = RandomAccessStream.AsStreamForRead())
             {
-                ResizedImage = Image.Load<Rgba32>(stream);                     
+                ResizedImage = Image.Load<Rgba32>(stream);
             }
             ResizedImage.Mutate(x => x.Resize(tileSize));
 
diff --git a/Yugen.Mosaic.Uwp/Models/TileFound.cs b/Yugen.Mosaic.Uwp/Models/TileFound.cs
index 64f3d70..457e5cd 100644
--- a/Yugen.Mosaic.Uwp/Models/TileFound.cs
+++ b/Yugen.Mosaic.Uwp/Models/TileFound.cs
@@ -9,6 +9,7 @@ public TileFound(Tile tile, int difference)
         }
 
         public Tile Tile { get; set; }
+
         public int Difference { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Properties/AssemblyInfo.cs b/Yugen.Mosaic.Uwp/Properties/AssemblyInfo.cs
index d53b0dd..910cf9e 100644
--- a/Yugen.Mosaic.Uwp/Properties/AssemblyInfo.cs
+++ b/Yugen.Mosaic.Uwp/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Yugen.Mosaic.Uwp")]
@@ -16,11 +16,11 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
diff --git a/Yugen.Mosaic.Uwp/Properties/Default.rd.xml b/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
index e43f18f..7454086 100644
--- a/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
+++ b/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
@@ -6,7 +6,7 @@
     Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
 
     To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
+    <Type Name="App1.MyClass" Dynamic="Required All" />
 
     To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
@@ -21,9 +21,8 @@
       An Assembly element with Name="*Application*" applies to all assemblies in
       the application package. The asterisks are not wildcards.
     -->
-    <Assembly Name="*Application*" Dynamic="Required All" />    
-    
-    <!-- Add your application specific runtime directives here. -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
 
+    <!-- Add your application specific runtime directives here. -->
   </Application>
 </Directives>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Services/MosaicService.cs b/Yugen.Mosaic.Uwp/Services/MosaicService.cs
index be4660b..527ff8d 100644
--- a/Yugen.Mosaic.Uwp/Services/MosaicService.cs
+++ b/Yugen.Mosaic.Uwp/Services/MosaicService.cs
@@ -22,19 +22,19 @@ namespace Yugen.Mosaic.Uwp.Services
     public class MosaicService : IMosaicService
     {
         private readonly IProgressService _progressService;
-
-        private readonly List<Tile> _tileImageList = new List<Tile>();
         private readonly ISearchAndReplaceAsciiArtService _searchAndReplaceAsciiArtService;
+        private readonly ISearchAndReplaceServiceFactory _searchAndReplaceServiceFactory;
+        private readonly List<Tile> _tileImageList = new List<Tile>();
+
         private Rgba32[,] _avgsMaster;
         private int _tX;
         private int _tY;
         private Image<Rgba32> _masterImage;
         private Size _tileSize;
         private ISearchAndReplaceService _searchAndReplaceService;
-        private readonly ISearchAndReplaceServiceFactory _searchAndReplaceServiceFactory;
 
         public MosaicService(
-            IProgressService progressService, 
+            IProgressService progressService,
             ISearchAndReplaceAsciiArtService searchAndReplaceAsciiArtService,
             ISearchAndReplaceServiceFactory searchAndReplaceServiceFactory)
         {
diff --git a/Yugen.Mosaic.Uwp/Services/SearchAndReplaceServiceFactory.cs b/Yugen.Mosaic.Uwp/Services/SearchAndReplaceServiceFactory.cs
index 75c9a07..572a5dc 100644
--- a/Yugen.Mosaic.Uwp/Services/SearchAndReplaceServiceFactory.cs
+++ b/Yugen.Mosaic.Uwp/Services/SearchAndReplaceServiceFactory.cs
@@ -29,12 +29,16 @@ public ISearchAndReplaceService Create(MosaicTypeEnum type)
             {
                 case MosaicTypeEnum.AdjustHue:
                     return _adjusthue();
+
                 case MosaicTypeEnum.Classic:
                     return _classic();
+
                 case MosaicTypeEnum.PlainColor:
                     return _plainColor();
+
                 case MosaicTypeEnum.Random:
                     return _random();
+
                 default:
                     throw new InvalidOperationException();
             }
diff --git a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
index 951ea2e..4cc5fd6 100644
--- a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
+++ b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
@@ -301,6 +301,8 @@ private async Task AddMasterImageCommandBehavior()
             {
                 StartProgressRing(true);
 
+                ResetSizes();
+
                 using (var inputStream = await masterFile.OpenReadAsync())
                 {
                     var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
@@ -309,10 +311,11 @@ await dispatcherQueue.EnqueueAsync(async () =>
                     {
                         var bmp = new BitmapImage
                         {
-                            DecodePixelHeight = 400
+                            DecodePixelHeight = 400,
+                            DecodePixelType = DecodePixelType.Logical
                         };
-                        await bmp.SetSourceAsync(inputStream);
                         MasterBpmSource = bmp;
+                        await bmp.SetSourceAsync(inputStream);
                     });
                 }
 
@@ -395,18 +398,25 @@ await Task.Run(() =>
                 {
                     try
                     {
-                        using (StorageItemThumbnail thumbnail = await file.GetThumbnailAsync(
-                               ThumbnailMode.SingleItem, 120, ThumbnailOptions.None))
+                        StorageItemThumbnail thumbnail = await file.GetThumbnailAsync(
+                               ThumbnailMode.SingleItem, 120, ThumbnailOptions.None);
+                        
+                        if(thumbnail.Type == ThumbnailType.Icon)
                         {
-                            await dispatcherQueue.EnqueueAsync(async () =>
-                            {
-                                BitmapImage bitmapImage = new BitmapImage();
-                                await bitmapImage.SetSourceAsync(thumbnail);
-
-                                TileBmpCollection.Add(new TileBmp(file.DisplayName, bitmapImage));
-                            });
+                            thumbnail.Dispose();
+                            thumbnail = await file.GetThumbnailAsync(
+                                ThumbnailMode.SingleItem, 120, ThumbnailOptions.None);
                         }
 
+                        await dispatcherQueue.EnqueueAsync(async () =>
+                        {
+                            BitmapImage bitmapImage = new BitmapImage();
+                            TileBmpCollection.Add(new TileBmp(file.DisplayName, bitmapImage));
+                            await bitmapImage.SetSourceAsync(thumbnail);
+                        });
+
+                        thumbnail.Dispose();
+
                         _mosaicService.AddTileImage(file.DisplayName, file);
                     }
                     catch (Exception exception)
@@ -498,8 +508,8 @@ private async Task SaveCommandBehavior()
             }
 
             StopProgressRing();
-        }        
-        
+        }
+
         private async Task SaveAsTextCommandBehavior()
         {
             StartProgressRing(false);
@@ -531,11 +541,21 @@ private void ResetCommandBehavior()
             MasterBpmSource = new BitmapImage();
             TileBmpCollection = new ObservableCollection<TileBmp>();
 
+            ResetSizes();
+
             GC.Collect();
 
             UpdateIsAddMasterUIVisible();
         }
 
+        private void ResetSizes()
+        {
+            OutputHeight = 1000;
+            OutputWidth = 1000;
+            TileHeight = 25;
+            TileWidth = 25;
+        }
+
         private void HelpCommandBehavior()
         {
             OnboardingHelper.Reset();
diff --git a/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
index 121fc2c..8064328 100644
--- a/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
+++ b/Yugen.Mosaic.Uwp/ViewModels/SettingsViewModel.cs
@@ -17,13 +17,15 @@ public SettingsViewModel(IThemeSelectorService themeSelectorService)
         {
             _themeSelectorService = themeSelectorService;
 
-            _elementTheme = _themeSelectorService.Theme; 
-            
+            _elementTheme = _themeSelectorService.Theme;
+
             SwitchThemeCommand = new AsyncRelayCommand<ElementTheme>(SwitchThemeCommandBehavior);
         }
 
         public string AppVersion => SystemHelper.AppVersion;
+
         public string Publisher => SystemHelper.Publisher;
+
         public string RateAndReviewUri => SystemHelper.RateAndReviewUri;
 
         public ElementTheme ElementTheme
diff --git a/Yugen.Mosaic.Uwp/Views/MainPage.xaml b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
index 8c281ba..e8d7fff 100644
--- a/Yugen.Mosaic.Uwp/Views/MainPage.xaml
+++ b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
@@ -1,16 +1,16 @@
 <Page x:Class="Yugen.Mosaic.Uwp.Views.MainPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:toolkitControls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-      xmlns:models="using:Yugen.Mosaic.Uwp.Models"
-      xmlns:validation="using:Yugen.Toolkit.Uwp.Controls.Validation"
-      xmlns:controls="using:Yugen.Toolkit.Uwp.Controls.UI"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
       xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:models="using:Yugen.Mosaic.Uwp.Models"
+      xmlns:controls="using:Yugen.Toolkit.Uwp.Controls.UI"
+      xmlns:validation="using:Yugen.Toolkit.Uwp.Controls.Validation"
       mc:Ignorable="d"
       Background="{ThemeResource AppWorkBackgroundBrush}"
       Loaded="OnPageLoaded">
@@ -41,9 +41,7 @@
                     <TextBlock x:Uid="MainTitleTextBlock"
                                VerticalAlignment="Center"
                                Style="{StaticResource YugenBaseTextBlockStyle}" />
-
                 </StackPanel>
-
             </Grid>
 
             <Grid Grid.Row="1"
@@ -99,13 +97,9 @@
                                                TextWrapping="WrapWholeWords"
                                                TextAlignment="Center" />
                                 </StackPanel>
-
                             </Grid>
-
                         </Grid>
-
                     </Border>
-
                 </StackPanel>
 
                 <StackPanel Grid.Row="1"
@@ -136,7 +130,6 @@
                             <TextBlock x:Uid="MainAddTilesFolderTextBlock" />
                         </StackPanel>
                     </Button>
-
                 </StackPanel>
 
                 <toolkitControls:AdaptiveGridView Grid.Row="2"
@@ -150,10 +143,10 @@
                         <DataTemplate x:DataType="models:TileBmp">
                             <Border CornerRadius="4">
                                 <Grid>
-                                    <Image Height="80" 
+                                    <Image Height="80"
                                            Stretch="UniformToFill"
                                            Source="{x:Bind Image}"
-                                           VerticalAlignment="Top"/>
+                                           VerticalAlignment="Top" />
                                     <Border Background="{ThemeResource AppTransparentBackgroundBrush}"
                                             VerticalAlignment="Bottom">
                                         <TextBlock MaxLines="1"
@@ -167,9 +160,7 @@
                             </Border>
                         </DataTemplate>
                     </toolkitControls:AdaptiveGridView.ItemTemplate>
-
                 </toolkitControls:AdaptiveGridView>
-
             </Grid>
 
             <Viewbox Grid.Row="1"
@@ -185,8 +176,8 @@
                             Height="{x:Bind ViewModel.OutputHeight, Mode=OneWay}"
                             Width="{x:Bind ViewModel.OutputWidth, Mode=OneWay}">
 
-                            <Image Source="{x:Bind ViewModel.OutputBmpSource, Mode=OneWay}"
-                                   Stretch="Uniform" />
+                        <Image Source="{x:Bind ViewModel.OutputBmpSource, Mode=OneWay}"
+                               Stretch="Uniform" />
                     </Border>
 
                     <controls:AlignmentGrid Opacity="0.3"
@@ -197,7 +188,6 @@
                                             ContainerHeight="{x:Bind ViewModel.OutputHeight, Mode=OneWay}"
                                             Visibility="{x:Bind ViewModel.IsAlignmentGridVisibile, Mode=OneWay}" />
                 </Grid>
-
             </Viewbox>
 
             <Grid Background="{ThemeResource AppBackgroundBrush}"
@@ -252,7 +242,6 @@
                                                           MandatoryValidationMessage=""
                                                           IsMandatory="True"
                                                           IsRealTimeValidationEnabled="True" />
-
                         </Grid>
 
                         <Rectangle Height=".5"
@@ -308,7 +297,6 @@
                                                           MandatoryValidationMessage=""
                                                           IsMandatory="True"
                                                           IsRealTimeValidationEnabled="True" />
-
                         </Grid>
 
                         <Rectangle Height=".5"
@@ -363,7 +351,6 @@
                                     <TextBlock x:Uid="MainResetTextBlock" />
                                 </StackPanel>
                             </Button>
-
                         </Grid>
 
                         <Grid Margin="4,0,0,0">
@@ -379,7 +366,6 @@
                                     <TextBlock x:Uid="MainSaveAsTextTextBlock" />
                                 </StackPanel>
                             </Button>
-
                         </Grid>
 
                         <muxc:ProgressRing Background="DarkGoldenrod"
@@ -392,10 +378,8 @@
                                            Margin="2"
                                            Value="{x:Bind ViewModel.Progress, Mode=OneWay}"
                                            Visibility="{x:Bind ViewModel.IsLoading, Mode=OneWay}" />
-                                           <!--Style="{StaticResource YugenProgressRingStyle}"-->
-
+                        <!--Style="{StaticResource YugenProgressRingStyle}"-->
                     </StackPanel>
-
                 </validation:ValidatingForm>
 
                 <Button Grid.Row="1"
@@ -410,7 +394,7 @@
                         <TextBlock x:Uid="MainWhatsNewTextBlock" />
                     </StackPanel>
                 </Button>
-                
+
                 <Button Grid.Row="2"
                         Command="{x:Bind ViewModel.HelpCommand}"
                         Height="36"
@@ -436,9 +420,7 @@
                         <TextBlock x:Uid="MainSettingsTextBlock" />
                     </StackPanel>
                 </Button>
-
             </Grid>
-
         </Grid>
 
         <muxc:TeachingTip x:Uid="MainTeachingTip"
@@ -458,7 +440,5 @@
                 </core:EventTriggerBehavior>
             </interactivity:Interaction.Behaviors>-->
         </muxc:TeachingTip>
-
     </Grid>
-
-</Page>
+</Page>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
index b6c3866..7ab1b65 100644
--- a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
+++ b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
@@ -244,10 +244,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>4.2.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>4.2.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
@@ -262,7 +262,7 @@
       <Version>7.0.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.5.0</Version>
+      <Version>2.6.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.1</Version>
@@ -280,13 +280,13 @@
       <Version>1.6.7</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Standard">
-      <Version>1.0.42</Version>
+      <Version>1.0.44</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Uwp">
-      <Version>1.0.42</Version>
+      <Version>1.0.44</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Uwp.Controls">
-      <Version>1.0.42</Version>
+      <Version>1.0.44</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Extensions.Logging">
       <Version>3.0.1</Version>
@@ -295,7 +295,7 @@
       <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File">
-      <Version>4.1.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.IO.FileSystem">
       <Version>4.3.0</Version>