diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj b/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj
new file mode 100644
index 0000000..534f109
--- /dev/null
+++ b/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.19041</TargetFrameworks>
+    <Platforms>AnyCPU;x64</Platforms>
+    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
+    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+    <LangVersion>9.0</LangVersion>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Include="NotificationFlyoutPresenter.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
similarity index 92%
rename from NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml
rename to NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
index 8a24382..77eb5b9 100644
--- a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml
+++ b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
@@ -1,5 +1,5 @@
 <controls:NotificationFlyoutPresenter
-    x:Class="NotificationFlyout.Sample.NotificationFlyoutPresenter"
+    x:Class="NotificationFlyout.Sample.Uwp.NotificationFlyoutPresenter"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls">
diff --git a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs
similarity index 94%
rename from NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs
rename to NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs
index bd82345..6e102ec 100644
--- a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs
+++ b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs
@@ -1,4 +1,4 @@
-namespace NotificationFlyout.Sample
+namespace NotificationFlyout.Sample.Uwp
 {
     public sealed partial class NotificationFlyoutPresenter
     {
diff --git a/NotificationFlyout.Sample/Properties/AssemblyInfo.cs b/NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs
similarity index 81%
rename from NotificationFlyout.Sample/Properties/AssemblyInfo.cs
rename to NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs
index 31f2d77..9f09b60 100644
--- a/NotificationFlyout.Sample/Properties/AssemblyInfo.cs
+++ b/NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs
@@ -5,17 +5,16 @@ using System.Runtime.InteropServices;
 // 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("NotificationFlyout.Sample")]
+[assembly: AssemblyTitle("NotificationFlyout.Sample.Uwp")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NotificationFlyout.Sample")]
+[assembly: AssemblyProduct("NotificationFlyout.Sample.Uwp")]
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-//
-// information for an assembly consists of the following four values:
+// Version information for an assembly consists of the following four values:
 //
 //      Major Version
 //      Minor Version 
diff --git a/NotificationFlyout.Sample/NotificationFlyout.Sample.csproj b/NotificationFlyout.Sample/NotificationFlyout.Sample.csproj
deleted file mode 100644
index 3119f2f..0000000
--- a/NotificationFlyout.Sample/NotificationFlyout.Sample.csproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{675B9345-F416-44EF-8154-B7F6943877FA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NotificationFlyout.Sample</RootNamespace>
-    <AssemblyName>NotificationFlyout.Sample</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="NotificationFlyoutPresenter.xaml.cs">
-      <DependentUpon>NotificationFlyoutPresenter.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\NotificationFlyout.Sample.rd.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.0-prerelease.210113001</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="NotificationFlyoutPresenter.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj">
-      <Project>{9987b132-e42c-401a-9ad5-e62529faca40}</Project>
-      <Name>NotificationFlyout.Uwp.UI.Controls</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/NotificationFlyout.Sample/Properties/NotificationFlyout.Sample.rd.xml b/NotificationFlyout.Sample/Properties/NotificationFlyout.Sample.rd.xml
deleted file mode 100644
index 5e30990..0000000
--- a/NotificationFlyout.Sample/Properties/NotificationFlyout.Sample.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    https://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="NotificationFlyout.Sample">
-
-  	<!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/NotificationFlyout.Tray/App.xaml.cs b/NotificationFlyout.Tray/App.xaml.cs
index 9c36264..8e40b31 100644
--- a/NotificationFlyout.Tray/App.xaml.cs
+++ b/NotificationFlyout.Tray/App.xaml.cs
@@ -4,5 +4,6 @@ namespace NotificationFlyout.Sample.Wpf
 {
     public partial class App : Application
     {
+
     }
 }
\ No newline at end of file
diff --git a/NotificationFlyout.Tray/NotificationFlyout.Sample.Wpf.csproj b/NotificationFlyout.Tray/NotificationFlyout.Sample.Wpf.csproj
index b7af113..e873087 100644
--- a/NotificationFlyout.Tray/NotificationFlyout.Sample.Wpf.csproj
+++ b/NotificationFlyout.Tray/NotificationFlyout.Sample.Wpf.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NotificationFlyout.Sample\NotificationFlyout.Sample.csproj" />
+    <ProjectReference Include="..\NotificationFlyout.Sample.Uwp\NotificationFlyout.Sample.Uwp.csproj" />
     <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
     <ProjectReference Include="..\NotificationFlyout.Wpf.UI.Controls\NotificationFlyout.Wpf.UI.Controls.csproj" />
     <ProjectReference Include="..\NotificationFlyout.XamlHost\NotificationFlyout.XamlHost.csproj" />
diff --git a/NotificationFlyout.Tray/SampleNotificationFlyout.xaml b/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
index 947fc42..01b13eb 100644
--- a/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
+++ b/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
@@ -2,7 +2,7 @@
     x:Class="NotificationFlyout.Sample.Wpf.SampleNotificationFlyout"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sample="clr-namespace:NotificationFlyout.Sample;assembly=NotificationFlyout.Sample"
+    xmlns:sample="clr-namespace:NotificationFlyout.Sample.Uwp;assembly=NotificationFlyout.Sample.Uwp"
     IconSource="/Assets/Icon.ico"
     LightIconSource="/Assets/Icon-Light.ico">
     <sample:NotificationFlyoutPresenter />
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj
new file mode 100644
index 0000000..f3abab7
--- /dev/null
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj	
@@ -0,0 +1,31 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.19041</TargetFrameworks>
+    <Platforms>AnyCPU;x64</Platforms>
+    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
+    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+    <LangVersion>9.0</LangVersion>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="NotificationFlyoutHost\NotificationFlyoutHost.xaml" />
+    <None Remove="NotificationFlyoutPresenter\NotificationFlyoutContentPresenter.xaml" />
+    <None Remove="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml" />
+    <None Remove="Themes\Generic.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="NotificationFlyoutHost\NotificationFlyoutHost.xaml" />
+    <Page Include="NotificationFlyoutPresenter\NotificationFlyoutContentPresenter.xaml">
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
+    <Page Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml">
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="NotificationFlyoutHost\NotificationFlyoutHost.cs">
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
index 58d7770..162f0c3 100644
--- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
@@ -1,139 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9987B132-E42C-401A-9AD5-E62529FACA40}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NotificationFlyout.Uwp.UI.Controls</RootNamespace>
-    <AssemblyName>NotificationFlyout.Uwp.UI.Controls</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworks>uap10.0.19041</TargetFrameworks>
+    <Platforms>AnyCPU;x64</Platforms>
+    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
+    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+    <LangVersion>9.0</LangVersion>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="NotificationFlyoutHost\NotificationFlyoutHost.cs" />
-    <Compile Include="NotificationFlyoutPresenter\NotificationFlyoutContentPresenter.cs" />
-    <Compile Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\NotificationFlyout.Uwp.UI.Controls.rd.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.0-prerelease.210113001</Version>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="NotificationFlyoutHost\NotificationFlyoutHost.xaml">
       <SubType>Designer</SubType>
@@ -144,30 +17,12 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup>
-    <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
-    <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
-  </PropertyGroup>
-  <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutContentPresenter.xaml b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutContentPresenter.xaml
index bd13a0d..efea53e 100644
--- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutContentPresenter.xaml
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutContentPresenter.xaml
@@ -28,8 +28,8 @@
     <AcrylicBrush
         x:Key="NotificationFlyoutPresenterBackgroundAccentBrush"
         BackgroundSource="HostBackdrop"
-        FallbackColor="{ThemeResource SystemAccentColorDark1}"
-        TintColor="{ThemeResource SystemAccentColorDark1}"
+        FallbackColor="{StaticResource SystemAccentColorDark1}"
+        TintColor="{StaticResource SystemAccentColorDark1}"
         TintOpacity="0.8" />
     <Style TargetType="controls:NotificationFlyoutContentPresenter">
         <Setter Property="Background" Value="{ThemeResource NotificationFlyoutPresenterBackgroundBrush}" />
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs
index dd391d8..438fb37 100644
--- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs
@@ -1,4 +1,5 @@
-using Windows.UI.Popups;
+using System.Linq;
+using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -16,6 +17,7 @@ namespace NotificationFlyout.Uwp.UI.Controls
             DefaultStyleKey = typeof(NotificationFlyoutPresenter);       
             RegisterPropertyChangedCallback(RequestedThemeProperty, RequestedThemePropertyChanged);
         }
+
         public void UpdateFlyoutTheme(string theme, bool isColorPrevalence)
         {
             _isColorPrevalence = isColorPrevalence;
@@ -34,7 +36,7 @@ namespace NotificationFlyout.Uwp.UI.Controls
 
         protected override void OnApplyTemplate()
         {
-            _contentPresenter = GetTemplateChild("ContentPresenter") as NotificationFlyoutContentPresenter;
+            var _contentPresenter = GetTemplateChild("ContentPresenter") as NotificationFlyoutContentPresenter;
             Loaded += OnLoaded;
         }
 
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
index 8266207..6520feb 100644
--- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
@@ -8,6 +8,8 @@
                 <ControlTemplate TargetType="controls:NotificationFlyoutPresenter">
                     <controls:NotificationFlyoutContentPresenter
                         x:Name="ContentPresenter"
+                        Width="200"
+                        Height="200"
                         Content="{TemplateBinding Content}"
                         ContentTemplate="{TemplateBinding ContentTemplate}" />
                 </ControlTemplate>
diff --git a/NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
index 836252c..2bb7383 100644
--- a/NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
+++ b/NotificationFlyout.Uwp.UI.Controls/Properties/AssemblyInfo.cs
@@ -11,4 +11,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/NotificationFlyout.Uwp.UI.Controls/Properties/NotificationFlyout.Uwp.UI.Controls.rd.xml b/NotificationFlyout.Uwp.UI.Controls/Properties/NotificationFlyout.Uwp.UI.Controls.rd.xml
deleted file mode 100644
index 0d8e415..0000000
--- a/NotificationFlyout.Uwp.UI.Controls/Properties/NotificationFlyout.Uwp.UI.Controls.rd.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    https://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="NotificationFlyout.Uwp.UI.Controls">
-
-  	<!-- add directives for your library here -->
-  </Library>
-</Directives>
\ No newline at end of file
diff --git a/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml b/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
index 3c642bd..b7316a5 100644
--- a/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
@@ -3,6 +3,5 @@
         <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml" />
         <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml" />
         <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutContentPresenter.xaml" />
-
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
index 8731fa3..ba4fb18 100644
--- a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
+++ b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
@@ -16,4 +16,8 @@
     <ProjectReference Include="..\NotificationFlyout.Wpf.UI\NotificationFlyout.Wpf.UI.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.7" />
+  </ItemGroup>
+
 </Project>
diff --git a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
index 794c5cb..9229a5f 100644
--- a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
+++ b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
@@ -112,7 +112,6 @@ namespace NotificationFlyout.Wpf.UI.Controls
         private void OnThemeChanged(object sender, SystemPersonalisationChangedEventArgs args)
         {
             NewMethod(args);
-
             UpdateIcon();
         }
 
diff --git a/NotificationFlyout.Wpf.UI/NotificationFlyout.Wpf.UI.csproj b/NotificationFlyout.Wpf.UI/NotificationFlyout.Wpf.UI.csproj
index 4909a30..432750c 100644
--- a/NotificationFlyout.Wpf.UI/NotificationFlyout.Wpf.UI.csproj
+++ b/NotificationFlyout.Wpf.UI/NotificationFlyout.Wpf.UI.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <LangVersion>9.0</LangVersion>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/NotificationFlyout.XamlHost/App.xaml b/NotificationFlyout.XamlHost/App.xaml
index 41474d6..2b769b7 100644
--- a/NotificationFlyout.XamlHost/App.xaml
+++ b/NotificationFlyout.XamlHost/App.xaml
@@ -2,8 +2,4 @@
     x:Class="NotificationFlyout.XamlHost.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xamlhost="using:Microsoft.Toolkit.Win32.UI.XamlHost">
-    <xamlhost:XamlApplication.Resources>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-    </xamlhost:XamlApplication.Resources>
-</xamlhost:XamlApplication>
\ No newline at end of file
+    xmlns:xamlhost="using:Microsoft.Toolkit.Win32.UI.XamlHost" />
\ No newline at end of file
diff --git a/NotificationFlyout.sln b/NotificationFlyout.sln
index b41cd5c..21b32a4 100644
--- a/NotificationFlyout.sln
+++ b/NotificationFlyout.sln
@@ -11,13 +11,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Sample.W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Wpf.UI.Controls", "NotificationFlyout.Wpf.UI.Controls\NotificationFlyout.Wpf.UI.Controls.csproj", "{0A782234-DC9F-4C4A-8820-FC640B03D233}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyout.Uwp.UI.Controls", "NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj", "{9987B132-E42C-401A-9AD5-E62529FACA40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Uwp.UI.Controls", "NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj", "{9987B132-E42C-401A-9AD5-E62529FACA40}"
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NotificationFlyout.Package", "NotificationFlyout.Package\NotificationFlyout.Package.wapproj", "{46FF88D3-C2C7-419B-94F6-1AC01307C31A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Wpf.UI", "NotificationFlyout.Wpf.UI\NotificationFlyout.Wpf.UI.csproj", "{29430194-7EDE-4C33-AF59-CE121F48F66E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyout.Sample", "NotificationFlyout.Sample\NotificationFlyout.Sample.csproj", "{675B9345-F416-44EF-8154-B7F6943877FA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B7EEAC24-4F8A-4C73-90B3-DAC77D44CCF2}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyout.Sample.Uwp", "NotificationFlyout.Sample.Uwp\NotificationFlyout.Sample.Uwp.csproj", "{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -175,8 +180,8 @@ Global
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x64.Build.0 = Debug|Any CPU
+		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x64.ActiveCfg = Debug|x64
+		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x64.Build.0 = Debug|x64
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|x86.Build.0 = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -189,26 +194,26 @@ Global
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x64.Build.0 = Release|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x86.ActiveCfg = Release|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x86.Build.0 = Release|Any CPU
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|ARM.ActiveCfg = Debug|ARM
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|ARM.Build.0 = Debug|ARM
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|ARM64.Build.0 = Debug|ARM64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|x64.ActiveCfg = Debug|x64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|x64.Build.0 = Debug|x64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|x86.ActiveCfg = Debug|x86
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Debug|x86.Build.0 = Debug|x86
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|ARM.ActiveCfg = Release|ARM
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|ARM.Build.0 = Release|ARM
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|ARM64.ActiveCfg = Release|ARM64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|ARM64.Build.0 = Release|ARM64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|x64.ActiveCfg = Release|x64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|x64.Build.0 = Release|x64
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|x86.ActiveCfg = Release|x86
-		{675B9345-F416-44EF-8154-B7F6943877FA}.Release|x86.Build.0 = Release|x86
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|ARM.Build.0 = Debug|ARM
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|x64.ActiveCfg = Debug|x64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|x64.Build.0 = Debug|x64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|x86.ActiveCfg = Debug|x86
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Debug|x86.Build.0 = Debug|x86
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|ARM.ActiveCfg = Release|ARM
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|ARM.Build.0 = Release|ARM
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|ARM64.Build.0 = Release|ARM64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|x64.ActiveCfg = Release|x64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|x64.Build.0 = Release|x64
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|x86.ActiveCfg = Release|x86
+		{FD1A3672-31B4-4499-AC09-4BD6BBD4C0DF}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Test/Class1.cs b/Test/Class1.cs
new file mode 100644
index 0000000..c1ecde3
--- /dev/null
+++ b/Test/Class1.cs
@@ -0,0 +1,10 @@
+using NotificationFlyout.Uwp.UI.Controls;
+using System;
+using Windows.UI.Xaml.Controls;
+
+namespace Test
+{
+    public class Class1 : NotificationFlyoutPresenter
+    {
+    }
+}
diff --git a/Test/Test.csproj b/Test/Test.csproj
new file mode 100644
index 0000000..d7337eb
--- /dev/null
+++ b/Test/Test.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="MSBuild.Sdk.Extras/3.0.22">
+  <PropertyGroup>
+    <TargetFrameworks>uap10.0.19041</TargetFrameworks>
+    <Platforms>AnyCPU;x64</Platforms>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/demo.gif b/demo.gif
deleted file mode 100644
index d78071d..0000000
Binary files a/demo.gif and /dev/null differ
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..1388cfa
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+        "MSBuild.Sdk.Extras": "3.0.22"
+    }
+}
\ No newline at end of file
diff --git a/image.png b/image.png
deleted file mode 100644
index 1af43a3..0000000
Binary files a/image.png and /dev/null differ