diff --git a/FOSS/content/AccessTokenManagement/_index.md b/FOSS/content/AccessTokenManagement/_index.md
index 16946845..4f2f30a7 100644
--- a/FOSS/content/AccessTokenManagement/_index.md
+++ b/FOSS/content/AccessTokenManagement/_index.md
@@ -7,7 +7,7 @@ chapter = true
 Duende.AccessTokenManagement
 ========
 
-This library provides automatic access token management features for .NET worker and ASP.NET Core web applications
+This library provides automatic access token management features for .NET worker and ASP.NET Core web applications:
 
 * automatic acquisition and lifetime management of client credentials based access tokens for machine to machine communication
 * automatic access token lifetime management using a refresh token for API calls on-behalf of the currently logged-in user
@@ -15,4 +15,4 @@ This library provides automatic access token management features for .NET worker
 
 The following tutorials are available:
 
-{{%children style="h4" /%}}
\ No newline at end of file
+{{%children style="h4" /%}}
diff --git a/FOSS/content/_index.md b/FOSS/content/_index.md
index d640359f..dafcc0c7 100644
--- a/FOSS/content/_index.md
+++ b/FOSS/content/_index.md
@@ -12,11 +12,13 @@ Duende Software sponsors a series of free open source libraries under the Apache
 
 These libraries help with building OAuth 2.0 and OpenID Connect clients. 
 
-## Duende.AccessTokenManagement
+## [Duende.AccessTokenManagement]({{< ref "AccessTokenManagement" >}})
 
 A set of .NET libraries that manage OAuth and OpenId Connect access tokens. These tools automatically acquire new tokens when old tokens are about to expire, provide conveniences for using the current token with HTTP clients, and can revoke tokens that are no longer needed.
 
-## Duende.IdentityModel
+The latest version of Duende.AccessTokenManagement targets .NET 8 and is available on [GitHub](https://github.com/DuendeSoftware/foss/tree/main/access-token-management) and [NuGet](https://www.nuget.org/packages/Duende.AccessTokenManagement").
+
+## [Duende.IdentityModel]({{< ref "IdentityModel" >}})
 
 The Duende.IdentityModel package is the base library for OIDC and OAuth 2.0 related protocol
 operations. It provides an object model to interact with the endpoints defined in the
@@ -25,12 +27,9 @@ requests and responses, extension methods to invoke requests constants defined i
 specifications, such as standard scope, claim, and parameter names, and other convenience
 methods for performing common identity related operations.
 
-Duende.IdentityModel targets .NET Standard 2.0, making it suitable for .NET and .NET Framework.
-
-- GitHub: <https://github.com/DuendeSoftware/foss/identitymodel>
-- NuGet: <https://www.nuget.org/packages/.Duende.IdentityModel/>
+Duende.IdentityModel targets .NET Standard 2.0, making it suitable for .NET and .NET Framework and is available on [GitHub](https://github.com/DuendeSoftware/foss/tree/main/identity-model") and [NuGet](https://www.nuget.org/packages/IdentityModel).
 
-## Duende.IdentityModel.OidcClient
+## [Duende.IdentityModel.OidcClient]({{< ref "IdentityModel.OidcClient" >}})
 
 Duende.IdentityModel.OidcClient is an OpenID Connect (OIDC) client library for mobile and native
 applications in .NET. It is a certified OIDC relying party and implements [RFC
@@ -39,5 +38,4 @@ Applications". It provides types that describe OIDC requests and responses, low
 methods to construct protocol state and handle responses, and higher level methods for
 logging in, logging out, retrieving userinfo, and refreshing tokens.
 
-- GitHub: <https://github.com/DuendeSoftware/foss/identitymodel>
-- NuGet: <https://www.nuget.org/packages/.Duende.IdentityModel/>
+Duende.IdentityModel.OidcClient targets .NET Standard 2.0, making it suitable for .NET and .NET Framework and is available on [GitHub](https://github.com/DuendeSoftware/foss/tree/main/identity-model-oidc-client) and [NuGet]({{https://www.nuget.org/packages/IdentityModel.OidcClient).