From 851f11ba29c80558dd427a204d0431d653873c1c Mon Sep 17 00:00:00 2001
From: Bernardo <programming@bernardomg.com>
Date: Wed, 1 Feb 2023 00:26:44 +0100
Subject: [PATCH] Accessibility corrections

---
 README.md                                     |  2 +-
 pom.xml                                       |  8 +++---
 .../META-INF/maven/macros/menu-macros.vm      |  8 +++---
 src/main/resources/META-INF/maven/site.vm     |  6 +++--
 src/site/markdown/acquire.md.vm               |  2 +-
 src/site/markdown/custom_site_descriptor.md   |  2 +-
 src/site/markdown/usage.md                    |  2 +-
 src/site/site.xml                             |  4 +--
 src/test/resources/it/bottom_nav/pom.xml      |  4 +--
 .../resources/it/bottom_nav/src/site/site.xml |  4 +--
 .../resources/it/bottom_nav/verify.groovy     | 21 ++++++++++-----
 src/test/resources/it/bottom_nav_max/pom.xml  |  4 +--
 .../src/site/markdown/acquire.md.vm           | 26 +++----------------
 .../it/custom_shine_dark_default/pom.xml      |  4 +--
 .../src/site/site.xml                         |  4 +--
 .../it/custom_shine_dark_overriden/pom.xml    |  4 +--
 .../src/site/site.xml                         |  4 +--
 .../resources/it/custom_shine_default/pom.xml |  4 +--
 .../it/custom_shine_default/src/site/site.xml |  4 +--
 .../resources/it/icons_list/src/site/site.xml |  2 +-
 .../resources/it/icons_list/verify.groovy     |  6 ++---
 src/test/resources/it/links/verify.groovy     |  7 ++++-
 .../it/menu/src/site/markdown/acquire.md.vm   | 26 +++----------------
 src/test/resources/it/menu/verify.groovy      |  8 ++++++
 .../menu_max/src/site/markdown/acquire.md.vm  | 26 +++----------------
 .../resources/it/page_content/verify.groovy   |  2 +-
 26 files changed, 78 insertions(+), 116 deletions(-)

diff --git a/README.md b/README.md
index fa5174a1..3c9664fd 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ Any kind of help with the project will be well received, and there are two main
 
 ### Issues Management
 
-Issues are managed at the GitHub [project issues tracker][issues], where any Github user may report bugs or ask for new features.
+Issues are managed at the GitHub [project issues tracker][issues], where any GitHub user may report bugs or ask for new features.
 
 ### Getting the Code
 
diff --git a/pom.xml b/pom.xml
index 38a0dfb6..49bf4992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -83,11 +83,11 @@
          </distributionManagement>
       </profile>
       <profile>
-         <!-- Github deployment profile. -->
+         <!-- GitHub deployment profile. -->
          <id>deployment-github</id>
          <distributionManagement>
             <repository>
-               <!-- Github repository -->
+               <!-- GitHub repository -->
                <id>github</id>
                <name>GitHub Packages</name>
                <url>https://maven.pkg.github.com/Bernardo-MG/docs-maven-skin</url>
@@ -223,7 +223,7 @@
       <!-- ============================================== -->
       <!-- ================= MAVEN SITE ================= -->
       <!-- ============================================== -->
-      <site.skin.version>2.2.7</site.skin.version>
+      <site.skin.version>2.3.0</site.skin.version>
       <mavenURL>https://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}</mavenURL>
       <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
diff --git a/src/main/resources/META-INF/maven/macros/menu-macros.vm b/src/main/resources/META-INF/maven/macros/menu-macros.vm
index aa3f9223..d49289b6 100644
--- a/src/main/resources/META-INF/maven/macros/menu-macros.vm
+++ b/src/main/resources/META-INF/maven/macros/menu-macros.vm
@@ -37,7 +37,7 @@
                         <a href="#" class="nav-link dropdown-toggle" id="$element.name.replace(" ", "_")_menu" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">$element.name</a>
                         <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="$element.name.replace(" ", "_")_menu">
 #*    *##foreach( $item in $element.items )
-                            <li><a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a></li>
+                            <li><a class="dropdown-item" href="$item.href" title="$item.name" aria-label="$item.name">$item.name</a></li>
 #*    *##end
                         </ul>
                     </li>
@@ -82,7 +82,7 @@
                         <a href="#" class="nav-link dropdown-toggle" id="links_menu" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links</a>
                         <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="links_menu">
 #*    *##foreach( $item in $elements )
-                            <li><a class="dropdown-item" href="$item.href" title="$item.name">$item.name</a></li>
+                            <li><a class="dropdown-item" href="$item.href" title="$item.name" aria-label="$item.name">$item.name</a></li>
 #*    *##end
                         </ul>
                     </li>
@@ -134,9 +134,9 @@
 #**##end
 #**##foreach( $item in $element.items )
 #*    *##if( $item.description )
-              <dd><a href="$item.href" title="$item.name" class="link-noted">$item.name <span class="note">$item.description</span></a></dd>
+              <dd><a href="$item.href" title="$item.name" aria-label="$item.name" class="link-noted">$item.name <span class="note">$item.description</span></a></dd>
 #*    *##else
-              <dd><a href="$item.href" title="$item.name">$item.name</a></dd>
+              <dd><a href="$item.href" title="$item.name" aria-label="$item.name">$item.name</a></dd>
 #*    *##end
 #**##end
     </dl>
diff --git a/src/main/resources/META-INF/maven/site.vm b/src/main/resources/META-INF/maven/site.vm
index c7cfc65a..49209e77 100644
--- a/src/main/resources/META-INF/maven/site.vm
+++ b/src/main/resources/META-INF/maven/site.vm
@@ -156,9 +156,11 @@
         </div>
     </nav>
 </header>
-<section id="main-section" class="container flex-grow-1">
+<main>
+    <section id="main-section" class="container flex-grow-1">
 $bodyContent
-</section>
+    </section>
+</main>
 <footer class="footer w-100 pt-2 border-top bg-$bgshine">
     <div id="footer-nav" class="bg-$bgshine container">
 #set( $menuElements = [] )
diff --git a/src/site/markdown/acquire.md.vm b/src/site/markdown/acquire.md.vm
index 85f5c547..35172df5 100644
--- a/src/site/markdown/acquire.md.vm
+++ b/src/site/markdown/acquire.md.vm
@@ -1,7 +1,7 @@
 #set( $symbol_pound = '#' )
 ${symbol_pound} Setting up the dependencies
 
-The project files are hosted in the the [Maven Central Repository][maven-repo], and the [Github Packages Repository][github-repo]. This means that most Maven setups will be able to acquire the dependency without any additional configuration.
+The project files are hosted in the the [Maven Central Repository][maven-repo], and the [GitHub Packages Repository][github-repo]. This means that most Maven setups will be able to acquire the dependency without any additional configuration.
 
 For any additional information about how to set up the dependency check the [dependency information section](./dependency-info.html).
 
diff --git a/src/site/markdown/custom_site_descriptor.md b/src/site/markdown/custom_site_descriptor.md
index b453e094..57e1f5e3 100644
--- a/src/site/markdown/custom_site_descriptor.md
+++ b/src/site/markdown/custom_site_descriptor.md
@@ -79,7 +79,7 @@ For this to work you just need to add an image attribute to the menu item:
 <body>
    ...
    <menu name="Icons" inherit="bottom">
-      <item name="Github" img="fab fa-github" href="${project.scm.url}" />
+      <item name="GitHub" img="fab fa-github" href="${project.scm.url}" />
    </menu>
    ...
 </body>
diff --git a/src/site/markdown/usage.md b/src/site/markdown/usage.md
index cedac045..ddaab49b 100644
--- a/src/site/markdown/usage.md
+++ b/src/site/markdown/usage.md
@@ -81,7 +81,7 @@ The following example for a site.xml file will be useful for most sites:
          <item name="Maven Central" href="${mavenURL}" />
       </menu>
       <menu name="Icons" inherit="bottom">
-         <item name="Github" img="fab fa-github" href="${project.scm.url}" />
+         <item name="GitHub" img="fab fa-github" href="${project.scm.url}" />
       </menu>
    </body>
 </project>
diff --git a/src/site/site.xml b/src/site/site.xml
index d0222324..eab2dabd 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -63,10 +63,10 @@
       </menu>
       <menu name="Releases" inherit="bottom">
          <item name="Maven Central" href="${mavenURL}" />
-         <item name="Github" href="${githubArtifactURL}" />
+         <item name="GitHub" href="${githubArtifactURL}" />
       </menu>
       <menu name="Icons" inherit="bottom">
-         <item name="Github" img="fab fa-github" href="${project.scm.url}" />
+         <item name="GitHub" img="fab fa-github" href="${project.scm.url}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/bottom_nav/pom.xml b/src/test/resources/it/bottom_nav/pom.xml
index a5477da8..7fb6ab70 100644
--- a/src/test/resources/it/bottom_nav/pom.xml
+++ b/src/test/resources/it/bottom_nav/pom.xml
@@ -30,7 +30,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -44,8 +44,8 @@
       <plugin.site.version>@plugin.site.version@</plugin.site.version>
       <!-- Maven Site -->
       <site.skin.version>@project.version@</site.skin.version>
-      <bintrayURL>https://bintray.com/bernardo-mg/maven/docs-maven-skin/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin</mavenURL>
+      <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
 
    <!-- ********************************************** -->
diff --git a/src/test/resources/it/bottom_nav/src/site/site.xml b/src/test/resources/it/bottom_nav/src/site/site.xml
index 32f7e641..22578951 100644
--- a/src/test/resources/it/bottom_nav/src/site/site.xml
+++ b/src/test/resources/it/bottom_nav/src/site/site.xml
@@ -36,8 +36,8 @@
          </item>
       </menu>
       <menu name="Releases" inherit="bottom">
-         <item name="Bintray" href="https://bintray.com/bernardo-mg/maven/docs-maven-skin/view" />
-         <item name="Maven Central" href="http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin" />
+         <item name="Maven Central" href="${mavenURL}" />
+         <item name="GitHub" href="${githubArtifactURL}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/bottom_nav/verify.groovy b/src/test/resources/it/bottom_nav/verify.groovy
index 23367183..080749c9 100644
--- a/src/test/resources/it/bottom_nav/verify.groovy
+++ b/src/test/resources/it/bottom_nav/verify.groovy
@@ -40,6 +40,7 @@ link = link.children().first()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('./acquire.html')
 assert link.attr( 'title' ).equals('Acquire')
+assert link.attr( 'aria-label' ).equals('Acquire')
 assert link.html().equals('Acquire')
 
 link = row.get(1)
@@ -48,6 +49,7 @@ link = link.children().first()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('./usage.html')
 assert link.attr( 'title' ).equals('Usage')
+assert link.attr( 'aria-label' ).equals('Usage')
 assert link.html().equals('Usage')
 
 // Second column
@@ -60,6 +62,7 @@ link = link.children().first()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('https://github.com/Bernardo-MG/docs-maven-skin')
 assert link.attr( 'title' ).equals('SCM')
+assert link.attr( 'aria-label' ).equals('SCM')
 assert link.html().equals('SCM <span class="note">GitHub</span>')
 assert link.hasClass( 'link-noted' )
 
@@ -69,7 +72,8 @@ link = link.children().first()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('https://github.com/Bernardo-MG/docs-maven-skin/actions')
 assert link.attr( 'title' ).equals('CI')
-assert link.html().equals('CI <span class="note">Github workflow</span>')
+assert link.attr( 'aria-label' ).equals('CI')
+assert link.html().equals('CI <span class="note">GitHub workflow</span>')
 assert link.hasClass( 'link-noted' )
 
 link = row.get(2)
@@ -78,6 +82,7 @@ link = link.children().first()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('https://www.github.com/bernardo-mg/docs-maven-skin/issues')
 assert link.attr( 'title' ).equals('Issues')
+assert link.attr( 'aria-label' ).equals('Issues')
 assert link.html().equals('Issues <span class="note">GitHub</span>')
 assert link.hasClass( 'link-noted' )
 
@@ -89,14 +94,16 @@ link = row.get(0)
 assert link.tag().normalName().equals('dd')
 link = link.children().first()
 assert link.tag().normalName().equals('a')
-assert link.attr( 'href' ).equals('https://bintray.com/bernardo-mg/maven/docs-maven-skin/view')
-assert link.attr( 'title' ).equals('Bintray')
-assert link.html().equals('Bintray')
+assert link.attr( 'href' ).equals('http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin')
+assert link.attr( 'title' ).equals('Maven Central')
+assert link.attr( 'aria-label' ).equals('Maven Central')
+assert link.html().equals('Maven Central')
 
 link = row.get(1)
 assert link.tag().normalName().equals('dd')
 link = link.children().first()
 assert link.tag().normalName().equals('a')
-assert link.attr( 'href' ).equals('http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin')
-assert link.attr( 'title' ).equals('Maven Central')
-assert link.html().equals('Maven Central')
+assert link.attr( 'href' ).equals('https://github.com/Bernardo-MG?tab=packages&repo_name=docs-maven-skin')
+assert link.attr( 'title' ).equals('GitHub')
+assert link.attr( 'aria-label' ).equals('GitHub')
+assert link.html().equals('GitHub')
diff --git a/src/test/resources/it/bottom_nav_max/pom.xml b/src/test/resources/it/bottom_nav_max/pom.xml
index f5bc8d4c..f2703d52 100644
--- a/src/test/resources/it/bottom_nav_max/pom.xml
+++ b/src/test/resources/it/bottom_nav_max/pom.xml
@@ -30,7 +30,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -44,8 +44,8 @@
       <plugin.site.version>@plugin.site.version@</plugin.site.version>
       <!-- Maven Site -->
       <site.skin.version>@project.version@</site.skin.version>
-      <bintrayURL>https://bintray.com/bernardo-mg/maven/docs-maven-skin/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin</mavenURL>
+      <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
 
    <!-- ********************************************** -->
diff --git a/src/test/resources/it/bottom_nav_max/src/site/markdown/acquire.md.vm b/src/test/resources/it/bottom_nav_max/src/site/markdown/acquire.md.vm
index 4747e336..35172df5 100644
--- a/src/test/resources/it/bottom_nav_max/src/site/markdown/acquire.md.vm
+++ b/src/test/resources/it/bottom_nav_max/src/site/markdown/acquire.md.vm
@@ -1,29 +1,9 @@
 #set( $symbol_pound = '#' )
 ${symbol_pound} Setting up the dependencies
 
-The project files are hosted on a [Bintray repository][bintray-repo], and have been replicated on JCenter and OSS Sonatype, which also replicates into the [Maven Central Repository][maven-repo].
-
-This means that most Maven setups will be able to acquire the dependency without any additional configuration. Still, if the repository should be registered it is recommended using the Bintray one.
+The project files are hosted in the the [Maven Central Repository][maven-repo], and the [GitHub Packages Repository][github-repo]. This means that most Maven setups will be able to acquire the dependency without any additional configuration.
 
 For any additional information about how to set up the dependency check the [dependency information section](./dependency-info.html).
 
-${symbol_pound}${symbol_pound} Snapshots
-
-Snapshot artifacts are stored on OSS Sonatype. They can be accessed by adding the following lines to the configuration files:
-
-${symbol_pound}${symbol_pound}${symbol_pound} Maven
-
-```xml
-<repositories>
-    ...
-    <repository>
-        <id>oss-sonatype-snapshots</id>
-        <name>OSS Sonatype snapshots repository</name>
-        <url>https://oss.sonatype.org/content/groups/staging</url>
-    </repository>
-    ...
-</repositories>
-```
-
-[bintray-repo]: ${bintrayURL}
-[maven-repo]: ${mavenURL}
\ No newline at end of file
+[maven-repo]: ${mavenURL}
+[github-repo]: ${githubArtifactURL}
\ No newline at end of file
diff --git a/src/test/resources/it/custom_shine_dark_default/pom.xml b/src/test/resources/it/custom_shine_dark_default/pom.xml
index 72c622bf..a63a4c97 100644
--- a/src/test/resources/it/custom_shine_dark_default/pom.xml
+++ b/src/test/resources/it/custom_shine_dark_default/pom.xml
@@ -30,7 +30,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -44,8 +44,8 @@
       <plugin.site.version>@plugin.site.version@</plugin.site.version>
       <!-- Maven Site -->
       <site.skin.version>@project.version@</site.skin.version>
-      <bintrayURL>https://bintray.com/bernardo-mg/maven/docs-maven-skin/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin</mavenURL>
+      <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
 
    <!-- ********************************************** -->
diff --git a/src/test/resources/it/custom_shine_dark_default/src/site/site.xml b/src/test/resources/it/custom_shine_dark_default/src/site/site.xml
index 51f39e20..8e6d04a5 100644
--- a/src/test/resources/it/custom_shine_dark_default/src/site/site.xml
+++ b/src/test/resources/it/custom_shine_dark_default/src/site/site.xml
@@ -38,8 +38,8 @@
          </item>
       </menu>
       <menu name="Releases" inherit="bottom">
-         <item name="Bintray" href="https://bintray.com/bernardo-mg/maven/docs-maven-skin/view" />
-         <item name="Maven Central" href="http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin" />
+         <item name="Maven Central" href="${mavenURL}" />
+         <item name="GitHub" href="${githubArtifactURL}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/custom_shine_dark_overriden/pom.xml b/src/test/resources/it/custom_shine_dark_overriden/pom.xml
index f558bfbb..20fd546e 100644
--- a/src/test/resources/it/custom_shine_dark_overriden/pom.xml
+++ b/src/test/resources/it/custom_shine_dark_overriden/pom.xml
@@ -30,7 +30,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -44,8 +44,8 @@
       <plugin.site.version>@plugin.site.version@</plugin.site.version>
       <!-- Maven Site -->
       <site.skin.version>@project.version@</site.skin.version>
-      <bintrayURL>https://bintray.com/bernardo-mg/maven/docs-maven-skin/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin</mavenURL>
+      <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
 
    <!-- ********************************************** -->
diff --git a/src/test/resources/it/custom_shine_dark_overriden/src/site/site.xml b/src/test/resources/it/custom_shine_dark_overriden/src/site/site.xml
index 64072b3b..4a006a64 100644
--- a/src/test/resources/it/custom_shine_dark_overriden/src/site/site.xml
+++ b/src/test/resources/it/custom_shine_dark_overriden/src/site/site.xml
@@ -39,8 +39,8 @@
          </item>
       </menu>
       <menu name="Releases" inherit="bottom">
-         <item name="Bintray" href="https://bintray.com/bernardo-mg/maven/docs-maven-skin/view" />
-         <item name="Maven Central" href="http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin" />
+         <item name="Maven Central" href="${mavenURL}" />
+         <item name="GitHub" href="${githubArtifactURL}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/custom_shine_default/pom.xml b/src/test/resources/it/custom_shine_default/pom.xml
index 76e177f4..a6918e0c 100644
--- a/src/test/resources/it/custom_shine_default/pom.xml
+++ b/src/test/resources/it/custom_shine_default/pom.xml
@@ -30,7 +30,7 @@
    </issueManagement>
 
    <ciManagement>
-      <system>Github workflow</system>
+      <system>GitHub workflow</system>
       <url>https://github.com/Bernardo-MG/docs-maven-skin/actions</url>
       <notifiers />
    </ciManagement>
@@ -44,8 +44,8 @@
       <plugin.site.version>@plugin.site.version@</plugin.site.version>
       <!-- Maven Site -->
       <site.skin.version>@project.version@</site.skin.version>
-      <bintrayURL>https://bintray.com/bernardo-mg/maven/docs-maven-skin/view</bintrayURL>
       <mavenURL>http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin</mavenURL>
+      <githubArtifactURL><![CDATA[https://github.com/Bernardo-MG?tab=packages&amp;repo_name=docs-maven-skin]]></githubArtifactURL>
    </properties>
 
    <!-- ********************************************** -->
diff --git a/src/test/resources/it/custom_shine_default/src/site/site.xml b/src/test/resources/it/custom_shine_default/src/site/site.xml
index 32f7e641..22578951 100644
--- a/src/test/resources/it/custom_shine_default/src/site/site.xml
+++ b/src/test/resources/it/custom_shine_default/src/site/site.xml
@@ -36,8 +36,8 @@
          </item>
       </menu>
       <menu name="Releases" inherit="bottom">
-         <item name="Bintray" href="https://bintray.com/bernardo-mg/maven/docs-maven-skin/view" />
-         <item name="Maven Central" href="http://mvnrepository.com/artifact/com.bernardomg.maven.skins/docs-maven-skin" />
+         <item name="Maven Central" href="${mavenURL}" />
+         <item name="GitHub" href="${githubArtifactURL}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/icons_list/src/site/site.xml b/src/test/resources/it/icons_list/src/site/site.xml
index 3149f8a1..af63a7f0 100644
--- a/src/test/resources/it/icons_list/src/site/site.xml
+++ b/src/test/resources/it/icons_list/src/site/site.xml
@@ -18,7 +18,7 @@
 
    <body>
       <menu name="Icons" inherit="bottom">
-         <item name="Github" img="fab fa-github" href="${project.scm.url}" />
+         <item name="GitHub" img="fab fa-github" href="${project.scm.url}" />
       </menu>
    </body>
 
diff --git a/src/test/resources/it/icons_list/verify.groovy b/src/test/resources/it/icons_list/verify.groovy
index 24446061..48181dd8 100644
--- a/src/test/resources/it/icons_list/verify.groovy
+++ b/src/test/resources/it/icons_list/verify.groovy
@@ -17,6 +17,6 @@ assert icons.size() == 1
 def link = icons.first().parent()
 assert link.tag().normalName().equals('a')
 assert link.attr( 'href' ).equals('https://github.com/Bernardo-MG/docs-maven-skin')
-assert link.attr( 'title' ).equals('Github')
-assert link.attr( 'aria-label' ).equals('Github')
-assert link.html().equals('<span class="navbar-icon fab fa-github ps-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span>')
+assert link.attr( 'title' ).equals('GitHub')
+assert link.attr( 'aria-label' ).equals('GitHub')
+assert link.html().equals('<span class="navbar-icon fab fa-github ps-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> GitHub</span>')
diff --git a/src/test/resources/it/links/verify.groovy b/src/test/resources/it/links/verify.groovy
index 8702110b..22ba7ecc 100644
--- a/src/test/resources/it/links/verify.groovy
+++ b/src/test/resources/it/links/verify.groovy
@@ -1,4 +1,4 @@
-// This script verifies that a minimal site contains only the barebones of a site.
+// This script verifies that the custom links are generated correctly.
 
 import org.jsoup.Jsoup
 import java.util.logging.Logger
@@ -13,6 +13,7 @@ def body = Jsoup.parse(html).body()
 def dropdowns = body.select( '#navbar-main-menu .dropdown-toggle' )
 assert dropdowns.size() == 1
 
+// Verifies the dropdown toggle structure
 def dropdown = dropdowns.first()
 assert dropdown.tag().normalName().equals('a')
 assert dropdown.id().equals('links_menu')
@@ -28,14 +29,18 @@ assert dropdown.hasClass( 'dropdown-toggle' )
 // Verifies the menu links exist
 def items = body.select( '#navbar-main-menu .dropdown-item' )
 
+// Verifies the first link
 def item = items.get(0)
 assert item.attr( 'href' ).equals('http://www.apache.org')
 assert item.attr( 'title' ).equals('Apache')
+assert item.attr( 'aria-label' ).equals('Apache')
 assert item.html().equals('Apache')
 assert item.hasClass( 'dropdown-item' )
 
+// Verifies the second link
 item = items.get(1)
 assert item.attr( 'href' ).equals('https://maven.apache.org')
 assert item.attr( 'title' ).equals('Maven')
+assert item.attr( 'aria-label' ).equals('Maven')
 assert item.html().equals('Maven')
 assert item.hasClass( 'dropdown-item' )
diff --git a/src/test/resources/it/menu/src/site/markdown/acquire.md.vm b/src/test/resources/it/menu/src/site/markdown/acquire.md.vm
index 4747e336..35172df5 100644
--- a/src/test/resources/it/menu/src/site/markdown/acquire.md.vm
+++ b/src/test/resources/it/menu/src/site/markdown/acquire.md.vm
@@ -1,29 +1,9 @@
 #set( $symbol_pound = '#' )
 ${symbol_pound} Setting up the dependencies
 
-The project files are hosted on a [Bintray repository][bintray-repo], and have been replicated on JCenter and OSS Sonatype, which also replicates into the [Maven Central Repository][maven-repo].
-
-This means that most Maven setups will be able to acquire the dependency without any additional configuration. Still, if the repository should be registered it is recommended using the Bintray one.
+The project files are hosted in the the [Maven Central Repository][maven-repo], and the [GitHub Packages Repository][github-repo]. This means that most Maven setups will be able to acquire the dependency without any additional configuration.
 
 For any additional information about how to set up the dependency check the [dependency information section](./dependency-info.html).
 
-${symbol_pound}${symbol_pound} Snapshots
-
-Snapshot artifacts are stored on OSS Sonatype. They can be accessed by adding the following lines to the configuration files:
-
-${symbol_pound}${symbol_pound}${symbol_pound} Maven
-
-```xml
-<repositories>
-    ...
-    <repository>
-        <id>oss-sonatype-snapshots</id>
-        <name>OSS Sonatype snapshots repository</name>
-        <url>https://oss.sonatype.org/content/groups/staging</url>
-    </repository>
-    ...
-</repositories>
-```
-
-[bintray-repo]: ${bintrayURL}
-[maven-repo]: ${mavenURL}
\ No newline at end of file
+[maven-repo]: ${mavenURL}
+[github-repo]: ${githubArtifactURL}
\ No newline at end of file
diff --git a/src/test/resources/it/menu/verify.groovy b/src/test/resources/it/menu/verify.groovy
index 47fd5785..bd94b308 100644
--- a/src/test/resources/it/menu/verify.groovy
+++ b/src/test/resources/it/menu/verify.groovy
@@ -13,6 +13,7 @@ def body = Jsoup.parse(html).body()
 def toggles = body.select( '#navbar-main-menu .dropdown-toggle' )
 assert toggles.size() == 2
 
+// Verifies the first menu
 def toggle = toggles.get(0)
 assert toggle.tag().normalName().equals('a')
 assert toggle.id().equals('Documentation_menu')
@@ -25,6 +26,7 @@ assert toggle.html().equals('Documentation')
 assert toggle.hasClass( 'nav-link' )
 assert toggle.hasClass( 'dropdown-toggle' )
 
+// Verifies the second menu
 toggle = toggles.get(1)
 assert toggle.tag().normalName().equals('a')
 assert toggle.id().equals('Info_and_reports_menu')
@@ -41,22 +43,28 @@ assert toggle.hasClass( 'dropdown-toggle' )
 def dropdowns = body.select( '#navbar-main-menu .dropdown' )
 def items = dropdowns.get(0).select( '.dropdown-item' )
 
+// Verifies the first menu link
 def item = items.get(0)
 assert item.attr( 'href' ).equals('./acquire.html')
 assert item.attr( 'title' ).equals('Acquire')
+assert item.attr( 'aria-label' ).equals('Acquire')
 assert item.html().equals('Acquire')
 assert item.hasClass( 'dropdown-item' )
 
+// Verifies the second menu link
 item = items.get(1)
 assert item.attr( 'href' ).equals('./usage.html')
 assert item.attr( 'title' ).equals('Usage')
+assert item.attr( 'aria-label' ).equals('Usage')
 assert item.html().equals('Usage')
 assert item.hasClass( 'dropdown-item' )
 
 items = dropdowns.get(1).select( '.dropdown-item' )
 
+// Verifies the first menu link
 item = items.get(0)
 assert item.attr( 'href' ).equals('./info.html')
 assert item.attr( 'title' ).equals('Info')
+assert item.attr( 'aria-label' ).equals('Info')
 assert item.html().equals('Info')
 assert item.hasClass( 'dropdown-item' )
diff --git a/src/test/resources/it/menu_max/src/site/markdown/acquire.md.vm b/src/test/resources/it/menu_max/src/site/markdown/acquire.md.vm
index 4747e336..35172df5 100644
--- a/src/test/resources/it/menu_max/src/site/markdown/acquire.md.vm
+++ b/src/test/resources/it/menu_max/src/site/markdown/acquire.md.vm
@@ -1,29 +1,9 @@
 #set( $symbol_pound = '#' )
 ${symbol_pound} Setting up the dependencies
 
-The project files are hosted on a [Bintray repository][bintray-repo], and have been replicated on JCenter and OSS Sonatype, which also replicates into the [Maven Central Repository][maven-repo].
-
-This means that most Maven setups will be able to acquire the dependency without any additional configuration. Still, if the repository should be registered it is recommended using the Bintray one.
+The project files are hosted in the the [Maven Central Repository][maven-repo], and the [GitHub Packages Repository][github-repo]. This means that most Maven setups will be able to acquire the dependency without any additional configuration.
 
 For any additional information about how to set up the dependency check the [dependency information section](./dependency-info.html).
 
-${symbol_pound}${symbol_pound} Snapshots
-
-Snapshot artifacts are stored on OSS Sonatype. They can be accessed by adding the following lines to the configuration files:
-
-${symbol_pound}${symbol_pound}${symbol_pound} Maven
-
-```xml
-<repositories>
-    ...
-    <repository>
-        <id>oss-sonatype-snapshots</id>
-        <name>OSS Sonatype snapshots repository</name>
-        <url>https://oss.sonatype.org/content/groups/staging</url>
-    </repository>
-    ...
-</repositories>
-```
-
-[bintray-repo]: ${bintrayURL}
-[maven-repo]: ${mavenURL}
\ No newline at end of file
+[maven-repo]: ${mavenURL}
+[github-repo]: ${githubArtifactURL}
\ No newline at end of file
diff --git a/src/test/resources/it/page_content/verify.groovy b/src/test/resources/it/page_content/verify.groovy
index 95cbf7c1..90232dad 100644
--- a/src/test/resources/it/page_content/verify.groovy
+++ b/src/test/resources/it/page_content/verify.groovy
@@ -47,7 +47,7 @@ def firstSubSubHeadingAnchor = firstSubSubHeading.select( 'a' ).first()
 assert firstSubSubHeadingAnchor.attr( 'name' ).equals( 'Smaller_subsection' )
 
 // Verifies the number of sections is correct
-def mainSections = body.select( '> section' )
+def mainSections = body.select( 'main > section' )
 assert mainSections.size() == 1
 
 // Verifies the number of subsections is correct