diff --git a/README.md b/README.md
index a305e3b0..928d9f0f 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Generate metrics that can be embedded everywhere, including your GitHub profile
   </tr>
   <tr>
     <th colspan="2" align="center">
-      <a href="/source/plugins/README.md">🧩 Customizable with 38 plugins and 234 options!</a>
+      <h3><a href="/source/plugins/README.md">🧩 Customizable with 38 plugins and 234 options!</a></h3>
     </th>
   </tr>
   <tr>
@@ -380,7 +380,7 @@ Generate metrics that can be embedded everywhere, including your GitHub profile
 
   <tr>
     <th colspan="2" align="center">
-      <a href="/source/templates/README.md">🖼️ And even more with 4+ templates!</a>
+      <h3><a href="/source/templates/README.md">🖼️ And even more with 4+ templates!</a></h3>
     </th>
   </tr>
   <tr>
@@ -453,21 +453,21 @@ Generate metrics that can be embedded everywhere, including your GitHub profile
 
 There are several ways to setup metrics, each having its advantages and disadvantages:
 
-* [⚙️ Using GitHub Action on a profile repository *(~10 min)*](/.github/readme/partials/setup/action.md)
+* [⚙️ Using GitHub Action on a profile repository *(~10 min)*](/.github/readme/partials/documentation/setup/action.md)
   * ✔️ All features
   * ✔️ High availability (no downtimes)
   * ➖ Configuration can be a bit time-consuming
-* [💕 Using the shared instance *(~1 min)*](/.github/readme/partials/setup/shared.md)
+* [💕 Using the shared instance *(~1 min)*](/.github/readme/partials/documentation/setup/shared.md)
   * ✔️ Easily configurable and previewable
   * ➖ Limited features *(compute-intensive features are disabled)*
 * 🐳 Using command line with docker *(~5 min)* *(documentation not available yet)*
   * ✔️ Suited for one-time rendering
-* [🏗️ Deploying your own web instance *(~20 min)*](/.github/readme/partials/setup/web.md)
+* [🏗️ Deploying your own web instance *(~20 min)*](/.github/readme/partials/documentation/setup/web.md)
   * ➖ Mostly intended for development, or to create another shared instance
 
 Additional resources for setup:
-* [🏦 Configuring metrics for organizations](/.github/readme/partials/organizations.md)
-* [🧰 Template/Plugin compatibility matrix](/.github/readme/partials/compatibility.md)
+* [🏦 Configuring metrics for organizations](/.github/readme/partials/documentation/organizations.md)
+* 🧰 Template/Plugin compatibility matrix *(documentation not available yet)*
 ## 🖼️ Templates
 
 Templates lets you change general appearance of rendered metrics.