diff --git a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-100.png b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-100.png
index 4d68465..abed7a6 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-125.png b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-125.png
index 31526e1..e7936e8 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-150.png b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-150.png
index 4c1d5ed..9fcf73e 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-200.png b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-200.png
index 9613235..d06ae31 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-400.png b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-400.png
index e086afd..73e277b 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/LargeTile.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-100.png b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-100.png
index 41f146a..5ca8c30 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-125.png b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-125.png
index aa771e6..7a08bb5 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-150.png b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-150.png
index 7c952ba..f3935f8 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-200.png b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-200.png
index 6afe2f0..2048876 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-400.png b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-400.png
index f29a0ab..e1100df 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/SmallTile.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-100.png b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-100.png
index 822bcf2..102e5a0 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-125.png b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-125.png
index 42c40b8..8d19c97 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-150.png b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-150.png
index 084de1d..41cbb12 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-200.png b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-200.png
index f7f6cb7..8add97d 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-400.png b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-400.png
index ce3b932..ae7a0f4 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/SplashScreen.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-100.png b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-100.png
index 26ed27e..db0be20 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-125.png b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-125.png
index 3b9bfb7..fb847d0 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-150.png b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-150.png
index 9f4488d..9d1561b 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-200.png b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-200.png
index 9bd1377..14f2926 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-400.png b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-400.png
index 0058481..d36e443 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/Square150x150Logo.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
index bd1742a..74bab09 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
index 58a8b83..38d4905 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
index e10270e..7dfdb23 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
index df40442..332466f 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
index f742ebc..1ac12b8 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
index bd1742a..74bab09 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
index e10270e..7dfdb23 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
index df40442..332466f 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
index f742ebc..1ac12b8 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-100.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-100.png
index ecdeb4b..33aa6c5 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-125.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-125.png
index 26476ba..fdd5e5a 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-150.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-150.png
index 3e1ecea..e77d904 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-200.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-200.png
index b9d39d7..717f1a1 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-400.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-400.png
index 9b5ce17..56f27bf 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-16.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-16.png
index 0e9e9fd..74bab09 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-16.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-16.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24.png
index ff8ffda..38d4905 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index 9a30c75..0b9184c 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-256.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-256.png
index edfe0ac..7dfdb23 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-256.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-256.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-32.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-32.png
index 3e65c69..332466f 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-32.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-32.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-48.png b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-48.png
index 14e6726..1ac12b8 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-48.png and b/Yugen.Mosaic.Uwp/Assets/Square44x44Logo.targetsize-48.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/04.png b/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/04.png
new file mode 100644
index 0000000..74e1f56
Binary files /dev/null and b/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/04.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/14.png b/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/14.png
new file mode 100644
index 0000000..77f324a
Binary files /dev/null and b/Yugen.Mosaic.Uwp/Assets/Store/Screenshots/14.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-100.png b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-100.png
index 0b2282c..ff1dca7 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-125.png b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-125.png
index dcb8837..665c413 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-150.png b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-150.png
index 201f373..4c3cf2e 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-200.png b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-200.png
index 82dd5fc..a4a6452 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-400.png b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-400.png
index 1d32b75..71e244b 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/StoreLogo.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-100.png b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-100.png
index 4f9b3d7..048d3b9 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-100.png and b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-100.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-125.png b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-125.png
index 9612fcf..d2b4a78 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-125.png and b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-125.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-150.png b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-150.png
index 09675c6..117ff78 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-150.png and b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-150.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-200.png b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-200.png
index 6c1c6a0..3449d2c 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-200.png and b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-400.png b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-400.png
index e4470da..1d263dd 100644
Binary files a/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-400.png and b/Yugen.Mosaic.Uwp/Assets/Wide310x150Logo.scale-400.png differ
diff --git a/Yugen.Mosaic.Uwp/Properties/Default.rd.xml b/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
index 7454086..a6fb4c8 100644
--- a/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
+++ b/Yugen.Mosaic.Uwp/Properties/Default.rd.xml
@@ -16,13 +16,25 @@
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
+	<Application>
+		<!--
       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" />
+		<Assembly Name="*Application*" Dynamic="Required All" />
 
-    <!-- Add your application specific runtime directives here. -->
-  </Application>
+		<!-- Add your application specific runtime directives here. -->
+		<!--<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip.Closed" Dynamic="Required Public"/>-->
+		<!--<Type Name="Microsoft.UI.Xaml.Controls.ItemInvoked" Browse="Required Public"/>-->
+
+		<Type Name="Windows.Foundation.TypedEventHandler{Microsoft.UI.Xaml.Controls.TeachingTip,Microsoft.UI.Xaml.Controls.TeachingTipClosedEventArgs}" MarshalObject="Public" />
+		<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip">
+			<Event Name="Closed" Dynamic="Required"/>
+		</Type>
+		
+		<Type Name="Windows.Foundation.TypedEventHandler{Microsoft.UI.Xaml.Controls.TeachingTip,Microsoft.UI.Xaml.Controls.TeachingTipClosingEventArgs}" MarshalObject="Public" />
+		<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip">
+			<Event Name="Closing" Dynamic="Required"/>
+		</Type>
+	</Application>
 </Directives>
\ No newline at end of file
diff --git a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
index 4cc5fd6..b171af1 100644
--- a/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
+++ b/Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs
@@ -77,8 +77,8 @@ public MainViewModel(IMosaicService mosaicService, IProgressService progressServ
             WhatsNewCommand = new AsyncRelayCommand(WhatsNewCommandBehavior);
             SettingsCommand = new AsyncRelayCommand(SettingsCommandBehavior);
             TeachingTipActionButtonCommand = new RelayCommand(TeachingTipActionButtonCommandBehavior);
-            //TeachingTipClosingCommand = new RelayCommand(TeachingTipClosingCommandBehavior);
-            //TeachingTipClosedCommand = new RelayCommand(TeachingTipClosedCommandBehavior);
+            TeachingTipClosingCommand = new RelayCommand(TeachingTipClosingCommandBehavior);
+            TeachingTipClosedCommand = new RelayCommand(TeachingTipClosedCommandBehavior);
         }
 
         public bool IsAddMasterUIVisible
@@ -238,9 +238,9 @@ public int Progress
 
         public ICommand TeachingTipActionButtonCommand { get; }
 
-        //public ICommand TeachingTipClosingCommand { get; }
+        public ICommand TeachingTipClosingCommand { get; }
 
-        //public ICommand TeachingTipClosedCommand { get; }
+        public ICommand TeachingTipClosedCommand { get; }
 
         private Size OutputSize => new Size(_outputWidth, _outputHeight);
 
@@ -277,7 +277,7 @@ public void TeachingTipActionButtonCommandBehavior()
             IsTeachingTipOpen = false;
         }
 
-        public void TeachingTip_Closing(TeachingTip sender, TeachingTipClosingEventArgs args)
+        public void TeachingTipClosingCommandBehavior()
         {
             TeachingTipTitle = "";
             TeachingTipSubTitle = "";
@@ -285,7 +285,7 @@ public void TeachingTip_Closing(TeachingTip sender, TeachingTipClosingEventArgs
             IsTeachingTipOpen = false;
         }
 
-        public void TeachingTip_Closed(TeachingTip sender, TeachingTipClosedEventArgs args) => ShowTeachingTip();
+        public void TeachingTipClosedCommandBehavior() => ShowTeachingTip();
 
         private async Task AddMasterImageCommandBehavior()
         {
diff --git a/Yugen.Mosaic.Uwp/Views/MainPage.xaml b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
index e8d7fff..0d825ff 100644
--- a/Yugen.Mosaic.Uwp/Views/MainPage.xaml
+++ b/Yugen.Mosaic.Uwp/Views/MainPage.xaml
@@ -424,21 +424,19 @@
         </Grid>
 
         <muxc:TeachingTip x:Uid="MainTeachingTip"
-                          Closing="{x:Bind ViewModel.TeachingTip_Closing}"
-                          Closed="{x:Bind ViewModel.TeachingTip_Closed}"
                           IsOpen="{x:Bind ViewModel.IsTeachingTipOpen, Mode=OneWay}"
                           Target="{x:Bind ViewModel.TeachingTipTarget, Mode=OneWay}"
                           Title="{x:Bind ViewModel.TeachingTipTitle, Mode=OneWay}"
                           Subtitle="{x:Bind ViewModel.TeachingTipSubTitle, Mode=OneWay}"
                           ActionButtonCommand="{x:Bind ViewModel.TeachingTipActionButtonCommand}">
-            <!--<interactivity:Interaction.Behaviors>
+            <interactivity:Interaction.Behaviors>
                 <core:EventTriggerBehavior EventName="Closed">
                     <core:InvokeCommandAction Command="{x:Bind ViewModel.TeachingTipClosedCommand}" />
                 </core:EventTriggerBehavior>
                 <core:EventTriggerBehavior EventName="Closing">
                     <core:InvokeCommandAction Command="{x:Bind ViewModel.TeachingTipClosingCommand}" />
                 </core:EventTriggerBehavior>
-            </interactivity:Interaction.Behaviors>-->
+            </interactivity:Interaction.Behaviors>
         </muxc:TeachingTip>
     </Grid>
 </Page>
\ No newline at end of file