diff --git a/Directory.build.props b/Directory.build.props
index cd5105cb..c17875a9 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -6,8 +6,8 @@
     <PackageIconUrl>https://raw.githubusercontent.com/BaseflowIT/XF-Material-Library/develop/icon.png</PackageIconUrl>
     <Authors>Dustin Catap, Martijn van Dijk</Authors>
     <Owners>Dustin Catap, Martijn van Dijk</Owners>
-    <PackageTags>xamarin, android, plugin</PackageTags>
-    <PackageReleaseNotes>https://github.com/BaseflowIT/XF-Material-Library</PackageReleaseNotes>
+    <PackageTags>xamarin, android, plugin, XF.Material, Material, Material Design, Xamarin.Forms, Forms</PackageTags>
+    <PackageReleaseNotes>https://github.com/BaseflowIT/XF-Material-Library/releases</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 
     <RepositoryUrl>https://github.com/BaseflowIT/XF-Material-Library</RepositoryUrl>
diff --git a/XF.Material-Azure.nuspec b/XF.Material-Azure.nuspec
deleted file mode 100644
index a4d1a20c..00000000
--- a/XF.Material-Azure.nuspec
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>XF.Material</id>
-    <title>XF.Material Library</title>
-    <version>1.4.1.3</version>
-    <authors>Dustin Catap</authors>
-    <owners>Dustin Catap</owners>
-    <projectUrl>https://github.com/contrix09/XF-Material-Library</projectUrl>
-    <license type="file">LICENSE.md</license>
-    <iconUrl>https://github.com/contrix09/XF-Material-Library/raw/master/images/xf.material_logo.png</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <releaseNotes>https://github.com/contrix09/XF-Material-Library/blob/master/RELEASE_NOTES.md</releaseNotes>
-    <description>A Xamarin.Forms library for Xamarin.Android and Xamarin.iOS to implement Google's Material Design.</description>
-    <copyright>Copyright © 2019 - Dustin Catap</copyright>
-    <tags>Xamarin.Forms Xamarin</tags>
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-      <group targetFramework="MonoAndroid90">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Com.Airbnb.Android.Lottie"
-                    version="2.7.0" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-      <group targetFramework="Xamarin.iOS10">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Com.Airbnb.iOS.Lottie"
-                    version="2.5.6" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="LICENSE.md" target="" />
-    <file src="XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.dll"
-          target="lib\netstandard2.0" />
-    <file src="XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.pdb"
-          target="lib\netstandard2.0" />
-    <file src="XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.xml"
-          target="lib\netstandard2.0" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Forms.dll"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Forms.pdb"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Forms.xml"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Droid.dll"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Droid.pdb"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.Droid\bin\Release\XF.Material.Droid.xml"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.Forms.dll"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.Forms.pdb"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.Forms.xml"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.iOS.dll"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.iOS.pdb"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material.iOS\bin\Release\XF.Material.iOS.xml"
-          target="lib\Xamarin.iOS10" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/XF.Material.nuspec b/XF.Material.nuspec
deleted file mode 100644
index 689b0692..00000000
--- a/XF.Material.nuspec
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>XF.Material</id>
-    <title>XF.Material Library</title>
-    <version>1.4.1.3</version>
-    <authors>Dustin Catap</authors>
-    <owners>Dustin Catap</owners>
-    <projectUrl>https://github.com/contrix09/XF-Material-Library</projectUrl>
-    <license type="file">LICENSE.md</license>
-    <iconUrl>https://github.com/contrix09/XF-Material-Library/raw/master/images/xf.material_logo.png</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <releaseNotes>https://github.com/contrix09/XF-Material-Library/blob/master/RELEASE_NOTES.md</releaseNotes>
-    <description>A Xamarin.Forms library for Xamarin.Android and Xamarin.iOS to implement Google's Material Design.</description>
-    <copyright>Copyright © 2019 - Dustin Catap</copyright>
-    <tags>Xamarin.Forms Xamarin</tags>
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-      <group targetFramework="MonoAndroid90">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Com.Airbnb.Android.Lottie"
-                    version="2.7.0" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-      <group targetFramework="Xamarin.iOS10">
-        <dependency id="Com.Airbnb.Xamarin.Forms.Lottie"
-                    version="2.7.0" />
-        <dependency id="Com.Airbnb.iOS.Lottie"
-                    version="2.5.6" />
-        <dependency id="Rg.Plugins.Popup"
-                    version="1.1.5.188" />
-        <dependency id="Xamarin.Forms"
-                    version="3.5.0.129452" />
-        <dependency id="Xamarin.Essentials"
-                    version="1.0.1" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="LICENSE.md" target="" />
-    <file src="XF.Material\XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.dll"
-          target="lib\netstandard2.0" />
-    <file src="XF.Material\XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.pdb"
-          target="lib\netstandard2.0" />
-    <file src="XF.Material\XF.Material.Forms\bin\Release\netstandard2.0\XF.Material.Forms.xml"
-          target="lib\netstandard2.0" />   
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Forms.dll"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Forms.pdb"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Forms.xml"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Droid.dll"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Droid.pdb"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.Droid\bin\Release\XF.Material.Droid.xml"
-          target="lib\MonoAndroid90" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.Forms.dll"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.Forms.pdb"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.Forms.xml"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.iOS.dll"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.iOS.pdb"
-          target="lib\Xamarin.iOS10" />
-    <file src="XF.Material\XF.Material.iOS\bin\Release\XF.Material.iOS.xml"
-          target="lib\Xamarin.iOS10" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/XF.Material.sln b/XF.Material.sln
index 4f91312c..23d5f902 100644
--- a/XF.Material.sln
+++ b/XF.Material.sln
@@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
-		XF.Material-Azure.nuspec = XF.Material-Azure.nuspec
-		XF.Material.nuspec = XF.Material.nuspec
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FFBBBA05-A99D-4D52-8950-3F61A8D25401}"