diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs
index 04bac75..0ff5629 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs
@@ -1,6 +1,6 @@
 using Microsoft.Windows.Sdk;
 
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     internal class ExecutionMode
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
index a3851ec..f82595e 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
@@ -1,5 +1,4 @@
 using Microsoft.Windows.Sdk;
-using NotificationFlyout.Shared.UI.Extensions;
 using System;
 using System.Drawing;
 using System.IO;
@@ -7,7 +6,7 @@ using System.Threading.Tasks;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Imaging;
 
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     public static class ImageSourceExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs
index f832700..fbf1349 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     public static class OperatingSystemExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs
index 9ac6b3e..5ff8097 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     public enum OperatingSystemVersion : int
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs
index b05240e..d885436 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Windows.Sdk;
 using Windows.Foundation;
 
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     internal static class RECTExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs
index d3fc097..f2682a1 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Win32;
 
-namespace NotificationFlyout.Shared.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
 {
     public static class RegistryKeyExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs
index d06b187..d18c1d8 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs
@@ -1,6 +1,6 @@
 using Microsoft.Windows.Sdk;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal class CursorHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs
index 169e419..decb976 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public partial class NotificationIconHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs
index 23c2a46..d5028ee 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public partial class NotificationIconHelper : IDisposable, IWndProcHandler
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs
index e101c6c..70a0a5b 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class NotificationIconInvokedEventArgs : EventArgs
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs
index 590fcd9..79610d8 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public enum PointerButton
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs
index 92d006f..eeab0cf 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs
@@ -3,7 +3,7 @@ using System;
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class Screen
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs
index 26f2c35..4881792 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public static class SystemInformationHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs
index 240d893..7df9bd8 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class SystemPersonalisationChangedEventArgs : EventArgs
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
index 6cef582..06aebf1 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
@@ -1,9 +1,9 @@
 using Microsoft.Win32;
-using NotificationFlyout.Shared.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions;
 using System;
 using Windows.UI.ViewManagement;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class SystemPersonalisationHelper : IWndProcHandler
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
index 1b24272..74d8715 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public enum SystemTheme
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs
index 7d048a5..3efada1 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public partial class TaskbarHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs
index b4fa57d..773ef27 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs
@@ -1,8 +1,8 @@
-using NotificationFlyout.Shared.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions;
 using System;
 using System.Runtime.InteropServices;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public partial class TaskbarHelper : IWndProcHandler
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs
index 47ae1d6..2c6ecb7 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public enum TaskbarPosition
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs
index 5957190..2a9b76f 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs
@@ -1,6 +1,6 @@
 using Windows.Foundation;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public struct TaskbarState
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs
index e83d13d..ad0a4ae 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs
@@ -1,7 +1,7 @@
 using Microsoft.Windows.Sdk;
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class WindowHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs
index 3943831..a46656f 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal partial class WndProcHelper
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs
index 06be779..6e70179 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal partial class WndProcHelper : IDisposable
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs
index fad0a74..dfd57c1 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal class WndProcHelperMessageEventArgs : EventArgs
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs
index ee754b3..9596286 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal enum WndProcMessages
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/INotificationFlyoutApplication.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/INotificationFlyoutApplication.cs
index ff99fec..ae63d49 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/INotificationFlyoutApplication.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/INotificationFlyoutApplication.cs
@@ -1,6 +1,6 @@
 using Windows.UI.Xaml;
 
-namespace NotificationFlyout.Uwp.UI
+namespace TheXamlGuy.NotificationFlyout.Shared.UI
 {
     public interface INotificationFlyoutApplication
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Properties/AssemblyInfo.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Properties/AssemblyInfo.cs
index 2841bf6..346cb34 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Properties/AssemblyInfo.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI")]
-[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI.Extensions")]
-[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI")]
+[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions")]
+[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs
index 11f569e..0f1f189 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public interface IWndProcHandler
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs
index 958ac40..efdaa8a 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal interface IWndProcHandlerCollection : IList<WndProcHandlerReference>
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs
index a4621c4..50068c1 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public interface IWndProcHandlerSubscriber
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs
index 57db27e..620e765 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal class WndProcHandlerCollection : List<WndProcHandlerReference>, IWndProcHandlerCollection
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs
index ebb84a0..7e1c811 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     internal class WndProcHandlerReference
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs
index 8fa1fa7..d4bdb35 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class WndProcHandlerSubscriber : IWndProcHandlerSubscriber
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs
index c843a64..158aaa7 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace NotificationFlyout.Shared.UI.Helpers
+namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers
 {
     public class WndProcListener
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
index 7ce47a7..22adad4 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
@@ -1,10 +1,11 @@
 using System;
+using TheXamlGuy.NotificationFlyout.Shared.UI;
 using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 
-namespace NotificationFlyout.Uwp.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
 {
     [ContentProperty(Name = "Content")]
     public class NotificationFlyout : DependencyObject
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutClosingEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutClosingEventArgs.cs
index 668b6af..24f8a18 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutClosingEventArgs.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutClosingEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NotificationFlyout.Uwp.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
 {
     public sealed class NotificationFlyoutClosingEventArgs : EventArgs
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenu.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenu.cs
index c154235..64316c8 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenu.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenu.cs
@@ -4,7 +4,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
-namespace NotificationFlyout.Uwp.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
 {
     [ContentProperty(Name = "MenuItems")]
     public class NotificationFlyoutContextMenu : DependencyObject
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs
new file mode 100644
index 0000000..31d19c1
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs
@@ -0,0 +1,100 @@
+using System.Collections.Specialized;
+using System.Linq;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
+{
+    internal class NotificationFlyoutContextMenuFlyoutHost : Control
+    {
+        private NotificationFlyout _flyout;
+        private MenuFlyout _menuFlyout;
+        private Grid _root;
+
+        public NotificationFlyoutContextMenuFlyoutHost() => DefaultStyleKey = typeof(NotificationFlyoutContextMenuFlyoutHost);
+
+        public void HideFlyout()
+        {
+            if (_menuFlyout == null) return;
+            _menuFlyout.Hide();
+        }
+
+        public void ShowFlyout()
+        {
+            if (_root == null) return;
+            if (_menuFlyout == null) return;
+
+            _menuFlyout.ShowAt(_root, new FlyoutShowOptions
+            { 
+                Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft,
+                ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway
+            });
+        }
+
+        internal void SetOwningFlyout(NotificationFlyout flyout)
+        {
+            if (_flyout != null)
+            {
+                (_flyout.ContextMenu.MenuItems as INotifyCollectionChanged).CollectionChanged -= OnContextMenuItemsChanged;
+            }
+
+            _flyout = flyout;
+            
+            var contextMenu = _flyout.ContextMenu;
+            if (contextMenu == null) return;
+
+            (contextMenu.MenuItems as INotifyCollectionChanged).CollectionChanged += OnContextMenuItemsChanged;
+
+            PrepareMenuItems();
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            _root = GetTemplateChild("Root") as Grid;
+            _menuFlyout = GetTemplateChild("Flyout") as MenuFlyout;
+
+            PrepareMenuItems();
+        }
+
+        private void OnContextMenuItemsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            if (_flyout == null) return;
+
+            var contextMenu = _flyout.ContextMenu;
+            if (contextMenu == null) return;
+
+            var addedItems = args.NewItems.Cast<MenuFlyoutItemBase>().ToList();
+            var removedItems = args.NewItems.Cast<MenuFlyoutItemBase>().ToList();
+
+            if (removedItems != null)
+            {
+                foreach (var item in removedItems)
+                {
+                    _menuFlyout.Items.Remove(item);
+                }
+            }
+
+            foreach (var item in addedItems)
+            {
+                _menuFlyout.Items.Add(item);
+            }
+        }
+
+        private void PrepareMenuItems()
+        {
+            if (_menuFlyout == null) return;
+            if (_flyout == null) return;
+
+            var contextMenu = _flyout.ContextMenu;
+            if (contextMenu == null) return;
+
+            _menuFlyout.Items.Clear();
+
+            var items = contextMenu.MenuItems;
+            foreach (var item in items)
+            {
+                _menuFlyout.Items.Add(item);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml
new file mode 100644
index 0000000..3d11234
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls">
+    <Style TargetType="controls:NotificationFlyoutContextMenuFlyoutHost">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NotificationFlyoutContextMenuFlyoutHost">
+                    <Grid x:Name="Root">
+                        <FlyoutBase.AttachedFlyout>
+                            <MenuFlyout x:Name="Flyout" />
+                        </FlyoutBase.AttachedFlyout>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.cs
new file mode 100644
index 0000000..e2ca9d6
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.cs
@@ -0,0 +1,148 @@
+using System.Numerics;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Media;
+
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
+{
+    internal class NotificationFlyoutHost : Control
+    {
+        public static readonly DependencyProperty ContentProperty =
+            DependencyProperty.Register(nameof(Content),
+                typeof(UIElement), typeof(NotificationFlyoutHost),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty FlyoutPresenterStyleProperty =
+            DependencyProperty.Register(nameof(FlyoutPresenterStyle),
+                typeof(Style), typeof(NotificationFlyoutHost),
+                new PropertyMetadata(null));
+
+        private Flyout _flyout;
+        private bool _isLoaded;
+        private NotificationFlyout _notificationFlyout;
+        private string _placement;
+        private Grid _root;
+
+        public NotificationFlyoutHost() => DefaultStyleKey = typeof(NotificationFlyoutHost);
+
+        public UIElement Content
+        {
+            get => (UIElement)GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
+        }
+
+        public Style FlyoutPresenterStyle
+        {
+            get => (Style)GetValue(FlyoutPresenterStyleProperty);
+            set => SetValue(FlyoutPresenterStyleProperty, value);
+        }
+
+        public void HideFlyout()
+        {
+            if (_root == null) return;
+            FlyoutBase flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.Hide();
+        }
+
+        internal void UpdateThemeVisualState()
+        {
+
+        }
+
+        public void SetFlyoutPlacement(string placement)
+        {
+            if (!_isLoaded)
+            {
+                _placement = placement;
+            }
+
+            if (string.IsNullOrEmpty(placement)) return;
+            VisualStateManager.GoToState(this, placement, true);
+        }
+
+        public void ShowFlyout(FlyoutPlacementMode placementMode)
+        {
+            if (_root == null) return;
+            var flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.ShowAt(_root, new FlyoutShowOptions
+            {
+                Placement = placementMode,
+                ShowMode = FlyoutShowMode.Transient,
+            });
+        }
+
+        internal void SetOwningFlyout(NotificationFlyout flyout)
+        {
+            _notificationFlyout = flyout;
+
+            BindingOperations.SetBinding(this, ContentProperty,
+                new Binding
+                {
+                    Source = _notificationFlyout,
+                    Path =
+                    new PropertyPath(nameof(Content)),
+                    Mode = BindingMode.TwoWay
+                });
+
+            BindingOperations.SetBinding(this, RequestedThemeProperty,
+                new Binding
+                {
+                    Source = _notificationFlyout,
+                    Path = new PropertyPath(nameof(RequestedTheme)),
+                    Mode = BindingMode.TwoWay
+                });
+
+            BindingOperations.SetBinding(this, FlyoutPresenterStyleProperty,
+                new Binding
+                {
+                    Source = _notificationFlyout,
+                    Path = new PropertyPath(nameof(FlyoutPresenterStyle)),
+                    Mode = BindingMode.TwoWay
+                });
+        }
+
+        private NotificationFlyoutPresenter _flyoutPresenter;
+
+        protected override void OnApplyTemplate()
+        {
+            _flyoutPresenter = GetTemplateChild("FlyoutPresenter") as NotificationFlyoutPresenter;
+
+            _flyout = GetTemplateChild("Flyout") as Flyout;
+            if (_flyout != null)
+            {
+                _flyout.Closing -= OnFlyoutClosing;
+                _flyout.Closed -= OnFlyoutClosed;
+                _flyout.Opening -= OnFlyoutOpening;
+                _flyout.Opened -= OnFlyoutOpened;
+
+                _flyout.Closing += OnFlyoutClosing;
+                _flyout.Closed += OnFlyoutClosed;
+                _flyout.Opening += OnFlyoutOpening;
+                _flyout.Opened += OnFlyoutOpened;
+            }
+
+            _root = GetTemplateChild("Root") as Grid;
+            if (GetTemplateChild("ContentRoot") is Grid contentRoot)
+            {
+                contentRoot.Shadow = new ThemeShadow();
+
+                var currentTranslation = contentRoot.Translation;
+                var translation = new Vector3(currentTranslation.X, currentTranslation.Y, 16.0f);
+                contentRoot.Translation = translation;
+            }
+
+            _isLoaded = true;
+            SetFlyoutPlacement(_placement);
+        }
+
+        private void OnFlyoutClosed(object sender, object args) => _notificationFlyout?.InvokeClosedEvent(args);
+
+        private void OnFlyoutClosing(FlyoutBase sender, FlyoutBaseClosingEventArgs args) => _notificationFlyout?.InvokeClosingEvent(new NotificationFlyoutClosingEventArgs());
+
+        private void OnFlyoutOpened(object sender, object args) => _notificationFlyout?.InvokeOpenedEvent(args);
+
+        private void OnFlyoutOpening(object sender, object args) => _notificationFlyout?.InvokeOpeningEvent(args);
+    }
+}
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml
new file mode 100644
index 0000000..d93798e
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml
@@ -0,0 +1,110 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls">
+    <Style TargetType="controls:NotificationFlyoutHost">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NotificationFlyoutHost">
+                    <Grid x:Name="Root">
+                        <Grid.Resources>
+                            <Style x:Key="DefaultFlyoutPresenterStyle" TargetType="FlyoutPresenter">
+                                <Setter Property="IsDefaultShadowEnabled" Value="False" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="FlyoutPresenter">
+                                            <ContentPresenter
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Content="{TemplateBinding Content}"
+                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                ContentTransitions="{TemplateBinding ContentTransitions}" />
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                            <Style
+                                x:Key="TopFlyoutPresenterStyle"
+                                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                                TargetType="FlyoutPresenter">
+                                <Setter Property="Margin" Value="0,-7,0,0" />
+                            </Style>
+                            <Style
+                                x:Key="BottomFlyoutPresenterStyle"
+                                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                                TargetType="FlyoutPresenter">
+                                <Setter Property="Margin" Value="0,7,0,0" />
+                            </Style>
+                            <Style
+                                x:Key="LeftFlyoutPresenterStyle"
+                                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                                TargetType="FlyoutPresenter">
+                                <Setter Property="Margin" Value="-7,0,0,0" />
+                            </Style>
+                            <Style
+                                x:Key="RightFlyoutPresenterStyle"
+                                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+                                TargetType="FlyoutPresenter">
+                                <Setter Property="Margin" Value="7,0,0,0" />
+                            </Style>
+                        </Grid.Resources>
+                        <FlyoutBase.AttachedFlyout>
+                            <Flyout
+                                x:Name="Flyout"
+                                AreOpenCloseAnimationsEnabled="False"
+                                FlyoutPresenterStyle="{StaticResource BottomFlyoutPresenterStyle}"
+                                ShouldConstrainToRootBounds="False">
+                                <Grid x:Name="ContentRoot">
+                                    <Grid.Transitions>
+                                        <TransitionCollection>
+                                            <EntranceThemeTransition
+                                                x:Name="EntranceThemeTransition"
+                                                FromHorizontalOffset="0"
+                                                FromVerticalOffset="0" />
+                                        </TransitionCollection>
+                                    </Grid.Transitions>
+                                    <controls:NotificationFlyoutPresenter
+                                        x:Name="FlyoutPresenter"
+                                        Content="{TemplateBinding Content}"
+                                        Style="{TemplateBinding FlyoutPresenterStyle}" />
+                                </Grid>
+                            </Flyout>
+                        </FlyoutBase.AttachedFlyout>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="PlacementStates">
+                                <VisualState x:Name="Bottom">
+                                    <VisualState.Setters>
+                                        <Setter Target="Flyout.FlyoutPresenterStyle" Value="{StaticResource BottomFlyoutPresenterStyle}" />
+                                        <Setter Target="EntranceThemeTransition.FromHorizontalOffset" Value="0" />
+                                        <Setter Target="EntranceThemeTransition.FromVerticalOffset" Value="80" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Top">
+                                    <VisualState.Setters>
+                                        <Setter Target="Flyout.FlyoutPresenterStyle" Value="{StaticResource TopFlyoutPresenterStyle}" />
+                                        <Setter Target="EntranceThemeTransition.FromHorizontalOffset" Value="0" />
+                                        <Setter Target="EntranceThemeTransition.FromVerticalOffset" Value="-80" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Left">
+                                    <VisualState.Setters>
+                                        <Setter Target="Flyout.FlyoutPresenterStyle" Value="{StaticResource LeftFlyoutPresenterStyle}" />
+                                        <Setter Target="EntranceThemeTransition.FromHorizontalOffset" Value="-80" />
+                                        <Setter Target="EntranceThemeTransition.FromVerticalOffset" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Right">
+                                    <VisualState.Setters>
+                                        <Setter Target="Flyout.FlyoutPresenterStyle" Value="{StaticResource RightFlyoutPresenterStyle}" />
+                                        <Setter Target="EntranceThemeTransition.FromHorizontalOffset" Value="80" />
+                                        <Setter Target="EntranceThemeTransition.FromVerticalOffset" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs
new file mode 100644
index 0000000..e4e7bc8
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs
@@ -0,0 +1,9 @@
+using Windows.UI.Xaml.Controls;
+
+namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
+{
+    public class NotificationFlyoutPresenter : ContentControl
+    {
+        public NotificationFlyoutPresenter() => DefaultStyleKey = typeof(NotificationFlyoutPresenter);
+    }
+}
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
new file mode 100644
index 0000000..40afdf3
--- /dev/null
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
@@ -0,0 +1,81 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <AcrylicBrush
+                x:Key="AcrylicBackgroundFillColorBrush"
+                BackgroundSource="HostBackdrop"
+                FallbackColor="#2C2C2C"
+                TintColor="#2C2C2C"
+                TintOpacity="0.8" />
+            <StaticResource x:Key="NotificationFlyoutPresenterBackgroundBrush" ResourceKey="AcrylicBackgroundFillColorBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <AcrylicBrush
+                x:Key="AcrylicBackgroundFillColorBrush"
+                BackgroundSource="HostBackdrop"
+                FallbackColor="#F9F9F9"
+                TintColor="#FCFCFC"
+                TintOpacity="0.8" />
+            <StaticResource x:Key="NotificationFlyoutPresenterBackgroundBrush" ResourceKey="AcrylicBackgroundFillColorBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <SolidColorBrush x:Key="NotificationFlyoutPresenterBackgroundBrush" Color="Green" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+    <AcrylicBrush
+        x:Key="NotificationFlyoutPresenterBackgroundAccentBrush"
+        BackgroundSource="HostBackdrop"
+        FallbackColor="{StaticResource SystemAccentColorDark1}"
+        TintColor="{StaticResource SystemAccentColorDark1}"
+        TintOpacity="0.8" />
+    <Style TargetType="controls:NotificationFlyoutPresenter">
+        <Setter Property="Background" Value="{ThemeResource NotificationFlyoutPresenterBackgroundBrush}" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NotificationFlyoutPresenter">
+                    <Border
+                        x:Name="Root"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BackgroundSizing="OuterBorderEdge"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <ScrollViewer
+                            x:Name="ScrollViewer"
+                            AutomationProperties.AccessibilityView="Raw"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                            VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                            ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                            <ContentControl
+                                x:Name="ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        </ScrollViewer>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ThemeStates">
+                                <VisualState x:Name="DefaultTheme" />
+                                <VisualState x:Name="ColorPrevalenceTheme">
+                                    <VisualState.Setters>
+                                        <Setter Target="Root.Background" Value="{ThemeResource NotificationFlyoutPresenterBackgroundAccentBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
index 570c48b..5ccdd07 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
@@ -13,4 +13,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
-[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj
index 688f99b..0f4d476 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj
@@ -14,15 +14,15 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <Page Include="NotificationFlyout\NotificationFlyoutContextMenuFlyoutHost.xaml">
+    <Page Include="NotificationFlyoutContextMenuFlyoutHost\NotificationFlyoutContextMenuFlyoutHost.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="NotificationFlyout\NotificationFlyoutHost.xaml">
+    <Page Include="NotificationFlyoutHost\NotificationFlyoutHost.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="NotificationFlyout\NotificationFlyoutPresenter.xaml">
+    <Page Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -32,4 +32,8 @@
     </Page>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj" />
+  </ItemGroup>
+  
 </Project>
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
index db4726b..9719823 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.xaml" />
-        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutPresenter.xaml" />
-        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuFlyoutHost.xaml" />
+        <ResourceDictionary Source="ms-appx:///TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml" />
+        <ResourceDictionary Source="ms-appx:///TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml" />
+        <ResourceDictionary Source="ms-appx:///TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
index c6e0b49..d607cb3 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
@@ -1,9 +1,9 @@
-using NotificationFlyout.Shared.UI.Helpers;
-using NotificationFlyout.Uwp.UI;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers;
 using System.Windows;
 using System.Windows.Markup;
+using TheXamlGuy.NotificationFlyout.Shared.UI;
 
-namespace NotificationFlyout.Wpf.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 {
     [ContentProperty(nameof(Flyout))]
     public class NotificationFlyoutApplication : DependencyObject, INotificationFlyoutApplication
@@ -22,7 +22,6 @@ namespace NotificationFlyout.Wpf.UI.Controls
             Uwp.UI.Controls.NotificationFlyout.SetApplication(this);
 
             WndProcListener.Current.Start();
-
             PrepareFlyoutHost();
         }
 
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
index 0ee3e99..c88978c 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
@@ -1,9 +1,9 @@
-using NotificationFlyout.Uwp.UI.Controls;
-using NotificationFlyout.Shared.UI.Helpers;
-using NotificationFlyout.Wpf.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Uwp.UI.Controls;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers;
+using TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions;
 using System;
 
-namespace NotificationFlyout.Wpf.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 {
     internal class NotificationFlyoutContextMenuXamlHost : TransparentXamlHost<NotificationFlyoutContextMenuFlyoutHost>
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
index 0914309..0cb63a0 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
@@ -1,13 +1,12 @@
-using NotificationFlyout.Shared.UI.Extensions;
-using NotificationFlyout.Shared.UI.Helpers;
-using NotificationFlyout.Uwp.UI.Controls;
-using NotificationFlyout.Wpf.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers;
+using TheXamlGuy.NotificationFlyout.Uwp.UI.Controls;
+using TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions;
 using System;
 using System.Windows;
-using System.Windows.Input;
 using Windows.UI.Xaml.Controls.Primitives;
 
-namespace NotificationFlyout.Wpf.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 {
     internal class NotificationFlyoutXamlHost : TransparentXamlHost<NotificationFlyoutHost>
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Properties/AssemblyInfo.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Properties/AssemblyInfo.cs
index d121981..0dec65b 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Properties/AssemblyInfo.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Properties/AssemblyInfo.cs
@@ -2,4 +2,4 @@ using System.Windows;
 using System.Windows.Markup;
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj
index 4100c37..59c1384 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj" />
-    <ProjectReference Include="..\NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj" />
-    <ProjectReference Include="..\NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj" />
+    <ProjectReference Include="..\TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj" />
+    <ProjectReference Include="..\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj" />
+    <ProjectReference Include="..\TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/TransparentXamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/TransparentXamlHost.cs
index bdb64fd..c80666f 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/TransparentXamlHost.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/TransparentXamlHost.cs
@@ -1,9 +1,9 @@
 using Microsoft.Toolkit.Wpf.UI.XamlHost;
-using NotificationFlyout.Wpf.UI.Extensions;
+using TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions;
 using System.Windows;
 using System.Windows.Media;
 
-namespace NotificationFlyout.Wpf.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 {
     internal class TransparentXamlHost<TXamlContent> : XamlHost<TXamlContent> where TXamlContent : Windows.UI.Xaml.UIElement
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/XamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/XamlHost.cs
index 6e0c2fa..477fe5c 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/XamlHost.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/XamlHost/XamlHost.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Windows;
 
-namespace NotificationFlyout.Wpf.UI.Controls
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 {
     internal class XamlHost<TXamlContent> : Window where TXamlContent : Windows.UI.Xaml.UIElement
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/VisualExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/VisualExtensions.cs
index 95b3410..5e59881 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/VisualExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/VisualExtensions.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace NotificationFlyout.Wpf.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions
 {
     public static class VisualExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/WindowExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/WindowExtensions.cs
index 7b4067f..1f2f4ac 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/WindowExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/WindowExtensions.cs
@@ -3,7 +3,7 @@ using System;
 using System.Windows;
 using System.Windows.Interop;
 
-namespace NotificationFlyout.Wpf.UI.Extensions
+namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions
 {
     public static class WindowExtensions
     {
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
index f194f50..4d19c0d 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj
index 821c025..4d09476 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj
@@ -11,4 +11,8 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/TheXamlGuy.NotificationFlyout.sln b/src/TheXamlGuy.NotificationFlyout.sln
index f72018c..4cd2d48 100644
--- a/src/TheXamlGuy.NotificationFlyout.sln
+++ b/src/TheXamlGuy.NotificationFlyout.sln
@@ -8,13 +8,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{52CCF0D1-203C-42CC-8223-B725BF48D54E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{DBC9BB92-49C7-4900-AB47-E9E66089CD56}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls", "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj", "{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls", "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj", "{354F67A7-3699-4CCE-A49B-91DA70C98BF3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI", "TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj", "{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI", "TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj", "{EC20A0A9-CBCB-4357-846A-AA497BB02836}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls", "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj", "{A87383BC-B9FF-4B52-A763-69B5483FC00B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls", "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj", "{3205F101-E5F3-4B57-B0BB-33693F906B77}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,38 +24,38 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Debug|x64.ActiveCfg = Debug|x64
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Debug|x64.Build.0 = Debug|x64
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Release|x64.ActiveCfg = Release|x64
-		{52CCF0D1-203C-42CC-8223-B725BF48D54E}.Release|x64.Build.0 = Release|x64
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Debug|x64.ActiveCfg = Debug|x64
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Debug|x64.Build.0 = Debug|x64
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Release|x64.ActiveCfg = Release|x64
-		{DA69C51D-2DE7-47C4-BA7C-5492F5F378E3}.Release|x64.Build.0 = Release|x64
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Debug|x64.ActiveCfg = Debug|x64
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Debug|x64.Build.0 = Debug|x64
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Release|x64.ActiveCfg = Release|x64
-		{365B73CB-26DC-4B05-9CCE-9BF47D219BE3}.Release|x64.Build.0 = Release|x64
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Debug|x64.ActiveCfg = Debug|x64
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Debug|x64.Build.0 = Debug|x64
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Release|x64.ActiveCfg = Release|x64
-		{A87383BC-B9FF-4B52-A763-69B5483FC00B}.Release|x64.Build.0 = Release|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|Any CPU.Build.0 = Debug|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|x64.ActiveCfg = Debug|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|x64.Build.0 = Debug|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|x64.ActiveCfg = Release|x64
+		{DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|x64.Build.0 = Release|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|Any CPU.Build.0 = Debug|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x64.ActiveCfg = Debug|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x64.Build.0 = Debug|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x64.ActiveCfg = Release|x64
+		{354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x64.Build.0 = Release|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|Any CPU.Build.0 = Debug|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|x64.ActiveCfg = Debug|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|x64.Build.0 = Debug|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|x64.ActiveCfg = Release|x64
+		{EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|x64.Build.0 = Release|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|Any CPU.Build.0 = Debug|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|x64.ActiveCfg = Debug|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|x64.Build.0 = Debug|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|x64.ActiveCfg = Release|x64
+		{3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE