diff --git a/doc/index.rst b/doc/index.rst
index de61131e..bbb83a9e 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -14,12 +14,7 @@ Welcome to the official polybar documentation.
 
    user/actions
    user/ipc
-
-.. toctree::
-   :maxdepth: 1
-   :caption: Modules:
-
-   user/modules/tray
+   user/modules/index
 
 .. toctree::
    :maxdepth: 1
diff --git a/doc/user/modules/index.rst b/doc/user/modules/index.rst
new file mode 100644
index 00000000..6bbec15d
--- /dev/null
+++ b/doc/user/modules/index.rst
@@ -0,0 +1,31 @@
+Modules
+=======
+
+.. toctree::
+   :maxdepth: 1
+
+   System Tray <tray>
+
+   Alsa <https://github.com/polybar/polybar/wiki/Module:-alsa>
+   Backlight <https://github.com/polybar/polybar/wiki/Module:-backlight>
+   Battery <https://github.com/polybar/polybar/wiki/Module:-battery>
+   bspwm <https://github.com/polybar/polybar/wiki/Module:-bspwm>
+   CPU <https://github.com/polybar/polybar/wiki/Module:-cpu>
+   Date and Time <https://github.com/polybar/polybar/wiki/Module:-date>
+   Filesystem <https://github.com/polybar/polybar/wiki/Module:-filesystem>
+   GitHub <https://github.com/polybar/polybar/wiki/Module:-github>
+   i3 <https://github.com/polybar/polybar/wiki/Module:-i3>
+   Inter-process-messaging (IPC) <https://github.com/polybar/polybar/wiki/Module:-ipc>
+   Memory <https://github.com/polybar/polybar/wiki/Module:-memory>
+   Menu <https://github.com/polybar/polybar/wiki/Module:-menu>
+   MPD <https://github.com/polybar/polybar/wiki/Module:-mpd>
+   Network <https://github.com/polybar/polybar/wiki/Module:-network>
+   PulseAudio <https://github.com/polybar/polybar/wiki/Module:-pulseaudio>
+   Script <https://github.com/polybar/polybar/wiki/Module:-script>
+   Temperature <https://github.com/polybar/polybar/wiki/Module:-temperature>
+   Text <https://github.com/polybar/polybar/wiki/Module:-text>
+   XBacklight <https://github.com/polybar/polybar/wiki/Module:-xbacklight>
+   XKeyboard <https://github.com/polybar/polybar/wiki/Module:-xkeyboard>
+   XWindow <https://github.com/polybar/polybar/wiki/Module:-xwindow>
+   XWorkspaces <https://github.com/polybar/polybar/wiki/Module:-xworkspaces>
+   User contributed modules <https://github.com/polybar/polybar/wiki/User-contributed-modules>