diff --git a/Directory.build.props b/Directory.build.props
index fc75e87f..8c2f9fe5 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -18,7 +18,7 @@
     <RepositoryUrl>https://github.com/Baseflow/XF-Material-Library</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.6.5</Version>
+    <Version>1.6.6</Version>
     <Platform>AnyCPU</Platform>
 
     <!--<Nullable>enable</Nullable>-->
@@ -97,7 +97,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Directory.build.targets b/Directory.build.targets
index 886b4b22..ffcaeb0f 100644
--- a/Directory.build.targets
+++ b/Directory.build.targets
@@ -2,6 +2,9 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
     <DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
+    <DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
   </PropertyGroup>
@@ -10,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
diff --git a/Samples/Directory.build.targets b/Samples/Directory.build.targets
index 886b4b22..ffcaeb0f 100644
--- a/Samples/Directory.build.targets
+++ b/Samples/Directory.build.targets
@@ -2,6 +2,9 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
     <DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))">
+    <DefineConstants>$(DefineConstants);NETSTANDARD20</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
   </PropertyGroup>
@@ -10,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
     <DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
diff --git a/Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj b/Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj
index 93d151bf..6c9d86b0 100644
--- a/Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj
+++ b/Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj
@@ -63,7 +63,7 @@
       <Version>4.5.0.530</Version>
     </PackageReference>
     <PackageReference Include="Rg.Plugins.Popup">
-      <Version>2.0.0.3</Version>
+      <Version>2.0.0.4</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj b/Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj
index bed16e19..d27b8f92 100644
--- a/Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj
+++ b/Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj
@@ -155,7 +155,7 @@
       <Version>6.2.9</Version>
     </PackageReference>
     <PackageReference Include="Rg.Plugins.Popup">
-      <Version>2.0.0.3</Version>
+      <Version>2.0.0.4</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
       <Version>4.5.0.530</Version>
diff --git a/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj b/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj
index 31c7e061..8a60b98c 100644
--- a/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj
+++ b/Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj
@@ -185,7 +185,7 @@
       <Version>4.5.0.530</Version>
     </PackageReference>
     <PackageReference Include="Rg.Plugins.Popup">
-      <Version>2.0.0.3</Version>
+      <Version>2.0.0.4</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/Samples/MaterialMvvmSample/MaterialMvvmSample.csproj b/Samples/MaterialMvvmSample/MaterialMvvmSample.csproj
index 189a4aa7..d32c2fcb 100644
--- a/Samples/MaterialMvvmSample/MaterialMvvmSample.csproj
+++ b/Samples/MaterialMvvmSample/MaterialMvvmSample.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Autofac" Version="5.2.0" />
     <PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.0.0" />
     <PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
-    <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.3" />
+    <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs b/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
index e5edbd05..8bb01e74 100644
--- a/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
+++ b/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
@@ -7,6 +7,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using XF.Material.Forms.Resources;
+using Keyboard = Xamarin.Forms.Keyboard;
 
 namespace XF.Material.Forms.UI.Internals
 {
@@ -763,4 +764,4 @@ private void UpdateCounter()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/XF.Material/UI/MaterialTextField.xaml.cs b/XF.Material/UI/MaterialTextField.xaml.cs
index 037a7d11..1969a566 100644
--- a/XF.Material/UI/MaterialTextField.xaml.cs
+++ b/XF.Material/UI/MaterialTextField.xaml.cs
@@ -12,6 +12,7 @@
 using XF.Material.Forms.Resources;
 using XF.Material.Forms.UI.Dialogs;
 using XF.Material.Forms.UI.Internals;
+using Keyboard = Xamarin.Forms.Keyboard;
 
 namespace XF.Material.Forms.UI
 {
diff --git a/XF.Material/XF.Material.csproj b/XF.Material/XF.Material.csproj
index 2302680a..4f64180b 100644
--- a/XF.Material/XF.Material.csproj
+++ b/XF.Material/XF.Material.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup Condition=" '$(TargetsToBuild)' == 'All' ">
-    <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;monoandroid10.0;tizen40;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.18362;$(TargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10;xamarin.watchos10;monoandroid10.0;tizen40;netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">uap10.0.17763;$(TargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetsToBuild)' != 'All' ">
     <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Android' ">netstandard2.0;monoandroid10.0;</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Uap' ">netstandard2.0;uap10.0.17763</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'iOS' ">netstandard2.0;xamarin.ios10</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TargetsToBuild)' == 'Apple' ">netstandard2.0;xamarin.ios10;xamarin.mac20;xamarin.tvos10</TargetFrameworks>
   </PropertyGroup>
@@ -56,7 +56,7 @@
     <Page Include="Platforms\Uap\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
     <None Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.ios')) ">
@@ -80,6 +80,8 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Mac\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
+    <BundleResource Include="Resources\*.png" />
+    <BundleResource Include="Resources\*.json" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.tvos')) ">
@@ -89,6 +91,8 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Tvos\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
+    <BundleResource Include="Resources\*.png" />
+    <BundleResource Include="Resources\*.json" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('xamarin.watchos')) ">
@@ -98,6 +102,8 @@
     <Compile Include="Platforms\Apple\**\*.cs" />
     <Compile Include="Platforms\Watchos\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
+    <BundleResource Include="Resources\*.png" />
+    <BundleResource Include="Resources\*.json" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
@@ -106,7 +112,7 @@
     <Compile Include="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\Xamarin\**\*.cs" />
     <AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
-    <AndroidResource Include="Resources\**\*.json" Generator="MSBuild:UpdateAndroidResources" />
+    <AndroidResource Include="Resources\raw\*.json" Generator="MSBuild:UpdateAndroidResources" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('tizen')) ">
@@ -121,10 +127,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.3" />
+    <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.4" />
     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
     <PackageReference Include="Xamarin.Forms" Version="4.5.0.530" />
-    <PackageReference Include="Com.Airbnb.Xamarin.Forms.Lottie" Version="3.1.2" />
+    <PackageReference Include="Com.Airbnb.Xamarin.Forms.Lottie" Version="3.1.3" />
   </ItemGroup>
   
 </Project>
diff --git a/global.json b/global.json
index 80d84a25..7025f06d 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.54"
+    "MSBuild.Sdk.Extras": "2.1.2"
   }
 }
\ No newline at end of file