diff --git a/_layouts/doc.html b/_layouts/doc.html
index 8153750d2..8cca60927 100644
--- a/_layouts/doc.html
+++ b/_layouts/doc.html
@@ -107,54 +107,10 @@
-
- Modules documentation
-
-
+ {% include directory-tree.html
+ dir="/doc/modules"
+ strong=true
+ dir_class="r-docs-subnav list-group-item" %}
Workers documentation
diff --git a/doc/modules/antivirus.md b/doc/modules/antivirus.md
index af7574575..7c1e9d17d 100644
--- a/doc/modules/antivirus.md
+++ b/doc/modules/antivirus.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Antivirus module
+title: Antivirus
strong: true
---
diff --git a/doc/modules/chartable.md b/doc/modules/chartable.md
index 9fadea337..1dcf78328 100644
--- a/doc/modules/chartable.md
+++ b/doc/modules/chartable.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Chartable module
+title: Chartable
---
# Chartable module
diff --git a/doc/modules/dkim.md b/doc/modules/dkim.md
index d678db22a..3a37b8701 100644
--- a/doc/modules/dkim.md
+++ b/doc/modules/dkim.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: DKIM module
+title: DKIM
---
# DKIM module
diff --git a/doc/modules/dkim_signing.md b/doc/modules/dkim_signing.md
index fee964b73..e91a816c3 100644
--- a/doc/modules/dkim_signing.md
+++ b/doc/modules/dkim_signing.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: DKIM signing module
+title: DKIM signing
---
# DKIM signing module
diff --git a/doc/modules/dmarc.md b/doc/modules/dmarc.md
index 3c7c1d614..b4db6807b 100644
--- a/doc/modules/dmarc.md
+++ b/doc/modules/dmarc.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: DMARC module
+title: DMARC
---
# DMARC module
diff --git a/doc/modules/elastic.md b/doc/modules/elastic.md
index 0f7d45545..db6fbd8ee 100644
--- a/doc/modules/elastic.md
+++ b/doc/modules/elastic.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Elasticsearch module
+title: Elasticsearch exporter
---
# Elasticsearch module
diff --git a/doc/modules/emails.md b/doc/modules/emails.md
index fab96700e..25c3cf3c1 100644
--- a/doc/modules/emails.md
+++ b/doc/modules/emails.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Emails module
+title: Emails scan
---
# Emails module
diff --git a/doc/modules/external_relay.md b/doc/modules/external_relay.md
index 6790c86ae..c5314e553 100644
--- a/doc/modules/external_relay.md
+++ b/doc/modules/external_relay.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: External Relay module
+title: External relay
---
# External Relay module
diff --git a/doc/modules/force_actions.md b/doc/modules/force_actions.md
index 2fcb87986..aaefa0dfa 100644
--- a/doc/modules/force_actions.md
+++ b/doc/modules/force_actions.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Force Actions module
+title: Force Actions
strong: true
---
diff --git a/doc/modules/fuzzy_check.md b/doc/modules/fuzzy_check.md
index 479e573fc..1843278ce 100644
--- a/doc/modules/fuzzy_check.md
+++ b/doc/modules/fuzzy_check.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Fuzzy check module
+title: Fuzzy check
---
# Fuzzy check module
diff --git a/doc/modules/hfilter.md b/doc/modules/hfilter.md
index 6e667186d..2eecb1fae 100644
--- a/doc/modules/hfilter.md
+++ b/doc/modules/hfilter.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Hfilter module
+title: Hfilter
---
# Hfilter module
diff --git a/doc/modules/history_redis.md b/doc/modules/history_redis.md
index a5e6c0555..975f5f99c 100644
--- a/doc/modules/history_redis.md
+++ b/doc/modules/history_redis.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Redis history module
+title: History redis module
---
# Redis history module
diff --git a/doc/modules/known_senders.md b/doc/modules/known_senders.md
index 23fdc5d08..a47e5853d 100644
--- a/doc/modules/known_senders.md
+++ b/doc/modules/known_senders.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: known_senders module
+title: Known senders module
---
# Rspamd `known_senders` Plugin Documentation
diff --git a/doc/modules/maillist.md b/doc/modules/maillist.md
index 2fc859b3e..03a79d176 100644
--- a/doc/modules/maillist.md
+++ b/doc/modules/maillist.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Mailing lists module
+title: Mailing list
---
# Mail list module
diff --git a/doc/modules/milter_headers.md b/doc/modules/milter_headers.md
index 48bc57052..798c530c7 100644
--- a/doc/modules/milter_headers.md
+++ b/doc/modules/milter_headers.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Milter headers module
+title: Milter headers
strong: true
---
diff --git a/doc/modules/mime_types.md b/doc/modules/mime_types.md
index f3c27b6a0..3bcc7eecb 100644
--- a/doc/modules/mime_types.md
+++ b/doc/modules/mime_types.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Mime types modules
+title: Mime types
---
# Rspamd mime types module
diff --git a/doc/modules/multimap.md b/doc/modules/multimap.md
index 93e436f4a..353963cb9 100644
--- a/doc/modules/multimap.md
+++ b/doc/modules/multimap.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Multimap module
+title: Multimap
strong: true
---
# Multimap module
diff --git a/doc/modules/mx_check.md b/doc/modules/mx_check.md
index 9694289f6..f683fc3ca 100644
--- a/doc/modules/mx_check.md
+++ b/doc/modules/mx_check.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: MX Check module
+title: MX Check
---
# MX Check module
diff --git a/doc/modules/once_received.md b/doc/modules/once_received.md
index 9b98d5985..9d41f18f1 100644
--- a/doc/modules/once_received.md
+++ b/doc/modules/once_received.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Once received module
+title: Received policy
---
# Once received module
diff --git a/doc/modules/phishing.md b/doc/modules/phishing.md
index 010837599..263b11d56 100644
--- a/doc/modules/phishing.md
+++ b/doc/modules/phishing.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Phishing module
+title: Phishing check
---
# Phishing module
diff --git a/doc/modules/ratelimit.md b/doc/modules/ratelimit.md
index 4ea6272cc..22aac9c0c 100644
--- a/doc/modules/ratelimit.md
+++ b/doc/modules/ratelimit.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Ratelimit module
+title: Ratelimit
strong: true
---
diff --git a/doc/modules/rbl.md b/doc/modules/rbl.md
index bba533dd3..682cb6404 100644
--- a/doc/modules/rbl.md
+++ b/doc/modules/rbl.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: RBL module
+title: RBL
strong: true
---
# RBL module
diff --git a/doc/modules/regexp.md b/doc/modules/regexp.md
index 1f54a0127..5283a25d7 100644
--- a/doc/modules/regexp.md
+++ b/doc/modules/regexp.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Regexp module
+title: Regexp
strong: true
---
diff --git a/doc/modules/reputation.md b/doc/modules/reputation.md
index 6c9981de5..3a1e582f5 100644
--- a/doc/modules/reputation.md
+++ b/doc/modules/reputation.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Reputation module
+title: Reputation
---
# Reputation plugin
diff --git a/doc/modules/rspamd_update.md b/doc/modules/rspamd_update.md
index 02b26470a..f8df93a43 100644
--- a/doc/modules/rspamd_update.md
+++ b/doc/modules/rspamd_update.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Rspamd updates module
+title: Rspamd update
---
# Rspamd update module
diff --git a/doc/modules/spamassassin.md b/doc/modules/spamassassin.md
index ad9a4cc42..c666b9b7a 100644
--- a/doc/modules/spamassassin.md
+++ b/doc/modules/spamassassin.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Spamassassin module
+title: Spamassassin rules
---
# Spamassassin rules module
diff --git a/doc/modules/spamtrap.md b/doc/modules/spamtrap.md
index ba9f755a7..3872438c6 100644
--- a/doc/modules/spamtrap.md
+++ b/doc/modules/spamtrap.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Spamtrap module
+title: Spamtrap
---
# Spamtrap module
diff --git a/doc/modules/spf.md b/doc/modules/spf.md
index 90628aafd..22b0b488d 100644
--- a/doc/modules/spf.md
+++ b/doc/modules/spf.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: SPF module
+title: SPF
---
# SPF module
diff --git a/doc/modules/trie.md b/doc/modules/trie.md
index 1f1450f72..9d270f7f0 100644
--- a/doc/modules/trie.md
+++ b/doc/modules/trie.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Trie module
+title: Trie matcher
---
# Trie plugin
diff --git a/doc/modules/url_redirector.md b/doc/modules/url_redirector.md
index 81ecc21da..3bb8a8467 100644
--- a/doc/modules/url_redirector.md
+++ b/doc/modules/url_redirector.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: URL redirector module
+title: URL redirector
---
# URL redirector module
diff --git a/doc/modules/whitelist.md b/doc/modules/whitelist.md
index f726d1bc8..e954ed7d1 100644
--- a/doc/modules/whitelist.md
+++ b/doc/modules/whitelist.md
@@ -1,6 +1,6 @@
---
layout: doc
-title: Whitelist module
+title: Whitelist
---
# Whitelist module