diff --git a/.gitignore b/.gitignore
index a433903..368fd53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -330,3 +330,4 @@ ASALocalRun/
 .mfractor/
 /nuget/Plugin.Glypher/Temp
 /nuget/Plugin.Glypher.FontAwesome5Pro/Temp
+/nuget/Plugin.Glypher.FontAwesome5Free/Temp
diff --git a/nuget/Plugin.Glypher.FontAwesome5Free/Copylibs.ps1 b/nuget/Plugin.Glypher.FontAwesome5Free/Copylibs.ps1
new file mode 100644
index 0000000..19b0d8e
--- /dev/null
+++ b/nuget/Plugin.Glypher.FontAwesome5Free/Copylibs.ps1
@@ -0,0 +1,10 @@
+Remove-Item ".\Temp\*" -Recurse
+
+Copy-Item "..\..\scr\Plugin.Glypher.FontAwesome5Free\bin\Release\Plugin.Glypher.FontAwesome5Free.*.nupkg" -Destination '.\Temp\nupkg.zip'
+#Copy-Item "..\scr\Plugin.LocalNotification\bin\Release\Plugin.LocalNotification.*.snupkg" -Destination '.\Temp\snupkg.zip'
+
+Expand-Archive -Path '.\Temp\nupkg.zip' -DestinationPath "Temp\pkg"
+#Expand-Archive -Path '.\Temp\snupkg.zip' -DestinationPath "Temp\spkg"
+
+Copy-Item '.\Temp\pkg\lib\*' -Destination '.\pkglib' -Recurse -ErrorAction SilentlyContinue
+#Copy-Item '.\Temp\spkg\lib\*' -Destination '.\spkglib' -Recurse -ErrorAction SilentlyContinue
\ No newline at end of file
diff --git a/nuget/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.5.8.1.nuspec b/nuget/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.5.8.1.nuspec
new file mode 100644
index 0000000..5daee21
--- /dev/null
+++ b/nuget/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.5.8.1.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <id>Plugin.Glypher.FontAwesome5Free</id>
+    <version>5.8.1</version>
+	<authors>Elvin (Tharindu) Thudugala</authors>
+    <owners>ththlk</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/thudugala/Plugin.Glypher</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/thudugala/Plugin.Glypher/master/screenshots/fontAwesomeIcon.png</iconUrl>
+    <description>This plugin extend support for font-glyphs (font-icons) using FontAwesomeFree in Xamarin.Forms applications.</description>
+    <releaseNotes>Check: https://github.com/thudugala/Plugin.Glypher/releases</releaseNotes>
+    <copyright>Copyright © Elvin (Tharindu) Thudugala</copyright>
+    <tags>android, ios, xamarin, xamarin.forms, font, icon, glyph, fontawesome, free</tags>
+	<title>Xamarin.Forms font-glyphs (font-icons)</title>
+    <repository type="git" url="https://github.com/thudugala/Plugin.Glypher" commit="b5a9cc42ce681f4380f694f4b9fda5acdbb19ac0" />	
+    <dependencies>
+      <group targetFramework=".NETStandard2.0">
+        <dependency id="Plugin.Glypher" version="1.0.0" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>	
+  </metadata>
+  <files>
+    <file src="pkglib\**" target="lib" />
+  </files>
+</package>
\ No newline at end of file
diff --git a/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.dll b/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.dll
new file mode 100644
index 0000000..24ae0cd
Binary files /dev/null and b/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.dll differ
diff --git a/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.xml b/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.xml
new file mode 100644
index 0000000..d3878f5
--- /dev/null
+++ b/nuget/Plugin.Glypher.FontAwesome5Free/pkglib/netstandard2.0/Plugin.Glypher.FontAwesome5Free.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Plugin.Glypher.FontAwesome5Free</name>
+    </assembly>
+    <members>
+        <member name="T:Plugin.Glypher.FontAwesome5Free.GlyphFont">
+            <summary>
+            Font Awesome 5 Pro fonts
+            </summary>
+        </member>
+        <member name="P:Plugin.Glypher.FontAwesome5Free.GlyphFont.Brand">
+            <summary>
+            Brand font.
+            </summary>
+        </member>
+        <member name="P:Plugin.Glypher.FontAwesome5Free.GlyphFont.Regular">
+            <summary>
+            Regular font.
+            </summary>
+        </member>
+        <member name="P:Plugin.Glypher.FontAwesome5Free.GlyphFont.Solid">
+            <summary>
+            Solid font.
+            </summary>
+        </member>
+        <member name="T:Plugin.Glypher.FontAwesome5Free.GlyphList">
+            <summary>
+            Font Awesome Pro 5.8.1
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/nuget/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.5.8.1.1.nuspec b/nuget/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.5.8.1.1.nuspec
index e5d33b7..1f7cfc8 100644
--- a/nuget/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.5.8.1.1.nuspec
+++ b/nuget/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.5.8.1.1.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Plugin.Glypher.FontAwesome5Pro</id>
-    <version>5.8.1</version>
+    <version>5.8.1.1</version>
 	<authors>Elvin (Tharindu) Thudugala</authors>
     <owners>ththlk</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/scr/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj b/scr/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj
index 4ec623c..fff837e 100644
--- a/scr/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj
+++ b/scr/Plugin.Glypher.FontAwesome5Free/Plugin.Glypher.FontAwesome5Free.csproj
@@ -1,10 +1,45 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup>   
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Product>$(AssemblyName) ($(TargetFramework))</Product>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <NeutralLanguage>en</NeutralLanguage>
+    <LangVersion>latest</LangVersion>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Authors>Elvin (Tharindu) Thudugala</Authors>
+    <PackageTags>android, ios, xamarin, xamarin.forms, font, icon, glyph, fontawesome, free</PackageTags>
+    <PackageProjectUrl>https://github.com/thudugala/Plugin.Glypher</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/thudugala/Plugin.Glypher</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Description>This plugin extend support for font-glyphs (font-icons) using FontAwesomeFree in Xamarin.Forms applications.</Description>
+    <PackageIconUrl>https://raw.githubusercontent.com/thudugala/Plugin.Glypher/master/screenshots/fontAwesomeIcon.png</PackageIconUrl>
+    <Copyright>Copyright © Elvin (Tharindu) Thudugala</Copyright>
+    <Version>5.8.1</Version>
+    <PackageReleaseNotes>Check: https://github.com/thudugala/Plugin.Glypher/releases </PackageReleaseNotes>
+    <owners>ththlk</owners>
+
+    <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Company />
+
+    <!-- Optional: Include the PDB in the built .nupkg -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
     <PackageReference Include="Plugin.Glypher" Version="1.0.0" />
   </ItemGroup>
 
diff --git a/scr/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj b/scr/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj
index c602960..d901083 100644
--- a/scr/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj
+++ b/scr/Plugin.Glypher.FontAwesome5Pro/Plugin.Glypher.FontAwesome5Pro.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -21,7 +20,7 @@
     <Description>This plugin extend support for font-glyphs (font-icons) using FontAwesomePro in Xamarin.Forms applications.</Description>
     <PackageIconUrl>https://raw.githubusercontent.com/thudugala/Plugin.Glypher/master/screenshots/fontAwesomeIcon.png</PackageIconUrl>
     <Copyright>Copyright © Elvin (Tharindu) Thudugala</Copyright>
-    <Version>5.8.1</Version>
+    <Version>5.8.1.1</Version>
     <PackageReleaseNotes>Check: https://github.com/thudugala/Plugin.Glypher/releases </PackageReleaseNotes>
     <owners>ththlk</owners>