diff --git a/doc/index.rst b/doc/index.rst
index e9d53f40..585ec2ab 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -23,18 +23,31 @@ You can follow this documentation to learn more on it, or join our official XMPP
    :caption: Contents:
    :maxdepth: 3
 
-   installation.rst
-   howto_email_gateway.rst
    overview.rst
+   installation.rst
    configuration.rst
-   encryption.rst
-   howto_backup.rst
-   tor.rst
    components.rst
-   developer.rst
+   encryption.rst
+   tor.rst
    /libervia-cli/index.rst
-   /libervia-tui/index.rst
-   /contributing/index.rst
+
+.. The TUI is temporarily on hold and broken, its documentation
+.. (``libervia-tui/``) is not included in the toctree (and excluded from the
+.. build) for the moment.
+
+.. toctree::
+   :caption: How-tos:
+   :maxdepth: 2
+
+   howto_backup.rst
+   howto_email_gateway.rst
+
+.. toctree::
+   :caption: Developer:
+   :maxdepth: 2
+
+   developer.rst
+   apps.rst
 
 
 Indices and tables