diff --git a/Documentation/index.rst b/Documentation/index.rst
index 1fe90f2eb24532ce0c2d017bedcfe42ea30cb380..50fdc4af56404e540c8280c01c0e6a839fc7e80d 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -47,3 +47,10 @@ Last but not least, if you want to start hacking the lower-level firmware, the
    epicardium/overview
    epicardium/api
    epicardium-guide
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/Documentation/pycardium/color.rst b/Documentation/pycardium/color.rst
index d4c95d5305fae0ea59438aa14af0f202a168a43a..ae654b13f79b8a11b79421d254668fdfbd604fe5 100644
--- a/Documentation/pycardium/color.rst
+++ b/Documentation/pycardium/color.rst
@@ -21,6 +21,8 @@ The color module also contains a few constanst for commonly used colors:
 .. py:data:: color.MAGENTA
 .. py:data:: color.CYAN
 
+.. py:module:: htmlcolor
+
 ``htmlcolor`` - Color Constants
 ===============================
 The ``htmlcolor`` module contains even more color constants.  Note
diff --git a/Documentation/pycardium/light-sensor.rst b/Documentation/pycardium/light-sensor.rst
index f07df5cac6d17443c753493c1e92ae7f41487a2b..daf34a3e743dc174bee10a4a59b3bd1aea0f146b 100644
--- a/Documentation/pycardium/light-sensor.rst
+++ b/Documentation/pycardium/light-sensor.rst
@@ -1,3 +1,5 @@
+.. py:module:: light_sensor
+
 ``light_sensor`` - Ambient Brightness
 =====================================
 On the harmonic board, there is an IR-LED which can be used in reverse as a
diff --git a/Documentation/pycardium/utime.rst b/Documentation/pycardium/utime.rst
index c765d2febc672331903a3a782f110eb4dd2543a2..958c888cb39a36815d9ec552a68f4dd69b23b0ff 100644
--- a/Documentation/pycardium/utime.rst
+++ b/Documentation/pycardium/utime.rst
@@ -1,3 +1,5 @@
+.. py:module:: utime
+
 ``utime`` - Time
 ================
 The ``utime`` module loosely follows CPython's |time|_ module, but is heavily
diff --git a/Documentation/pycardium/vibra.rst b/Documentation/pycardium/vibra.rst
index 096e200c0984c8bbb9395b687338c90b69153fb0..1cefbdaa14974c13e56a88c785356489e59ad726 100644
--- a/Documentation/pycardium/vibra.rst
+++ b/Documentation/pycardium/vibra.rst
@@ -1,3 +1,5 @@
+.. py:module:: vibra
+
 ``vibra`` - Vibration Motor
 ===========================