diff --git a/docs/main.py b/docs/include/macros.py
similarity index 100%
rename from docs/main.py
rename to docs/include/macros.py
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 616a0a5..e005129 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -4,7 +4,9 @@ site_author: Valentin Niess
 copyright: GPL-3.0
 
 repo_url: https://github.com/niess/python-appimage/
-edit_uri: edit/master/docs/
+edit_uri: edit/master/docs/src
+
+docs_dir: src
 
 nav:
   - Python AppImages: index.md
@@ -18,6 +20,7 @@ theme:
 plugins:
   - macros:
       include_dir: docs/include
+      module_name: include/macros
   - search
 
 markdown_extensions:
diff --git a/docs/docs/apps.md b/docs/src/apps.md
similarity index 99%
rename from docs/docs/apps.md
rename to docs/src/apps.md
index 5c76a38..8fe05c1 100644
--- a/docs/docs/apps.md
+++ b/docs/src/apps.md
@@ -154,7 +154,6 @@ environement variables][APPIMAGE_ENV] can be used as well, if needed. For
 example, `$APPDIR` points to the AppImage mount point at runtime.
 {% endraw %}
 
-{{ begin("#entrypoint-variables") }}
 | variable             | Description                                                   |
 |----------------------|---------------------------------------------------------------|
 | `architecture`       | The AppImage architecture, e.g. `x86_64`.                     |
@@ -163,7 +162,6 @@ example, `$APPDIR` points to the AppImage mount point at runtime.
 | `python-fullversion` | The Python full version string, e.g. `3.10.2`.                |
 | `python-tag`         | The Python compatibility tag, e.g. `cp310-cp310`.             |
 | `python-version`     | The Python short version string, e.g. `3.10`.                 |
-{{ end("#entrypoint-variables") }}
 {{ end(".capsule") }}
 
 {% raw %}
diff --git a/docs/docs/css/extra.css b/docs/src/css/extra.css
similarity index 73%
rename from docs/docs/css/extra.css
rename to docs/src/css/extra.css
index 6654d91..7595a97 100644
--- a/docs/docs/css/extra.css
+++ b/docs/src/css/extra.css
@@ -96,3 +96,36 @@ pre code.hljs {
     height: 18px;
     width: auto;
 }
+
+/* Reshape tables */
+.rst-content .section .docutils {
+    border-collapse: collapse;
+    box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
+    caption-side: bottom;
+    display: table;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.rst-content table.docutils thead {
+    background-color: #2e3440;
+    color: #d8dee9;
+    text-align: left;
+    vertical-align: middle;
+}
+
+.rst-content table.docutils tbody tr {
+    border-bottom: 1px solid #dddddd;
+}
+
+.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
+    background-color: white;
+}
+
+.rst-content table.docutils tbody tr:nth-of-type(even) {
+    background-color: #f3f3f3;
+}
+
+.rst-content table.docutils tbody tr:last-of-type {
+    border-bottom: 2px solid #2e3440;
+}
diff --git a/docs/docs/css/nord.min.css b/docs/src/css/nord.min.css
similarity index 100%
rename from docs/docs/css/nord.min.css
rename to docs/src/css/nord.min.css
diff --git a/docs/docs/index.md b/docs/src/index.md
similarity index 100%
rename from docs/docs/index.md
rename to docs/src/index.md
diff --git a/docs/docs/js/apps.js b/docs/src/js/apps.js
similarity index 100%
rename from docs/docs/js/apps.js
rename to docs/src/js/apps.js
diff --git a/docs/docs/js/highlight.min.js b/docs/src/js/highlight.min.js
similarity index 100%
rename from docs/docs/js/highlight.min.js
rename to docs/src/js/highlight.min.js
diff --git a/docs/docs/js/index.js b/docs/src/js/index.js
similarity index 100%
rename from docs/docs/js/index.js
rename to docs/src/js/index.js