diff --git a/api/source/conf.py b/api/source/conf.py
index 401764f..b1e0dec 100644
--- a/api/source/conf.py
+++ b/api/source/conf.py
@@ -17,7 +17,9 @@ import sys
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath(os.path.join('..', '..', '..')))
+path_to_code = os.path.abspath(os.path.join(os.path.split(__file__)[0],
+    '..', '..', '..', '..', 'OpenLP', 'trunk'))
+sys.path.insert(0, path_to_code)
 
 # -- General configuration -----------------------------------------------------
 
diff --git a/api/source/core/index.rst b/api/source/core/index.rst
index 8555e1e..820cb1e 100644
--- a/api/source/core/index.rst
+++ b/api/source/core/index.rst
@@ -1,10 +1,10 @@
 .. _core-index:
 
-:mod:`core` Module
-==================
+Core Application
+================
 
-.. automodule:: openlp.core
-   :members:
+This is the core of the OpenLP application. Anything that is not a plugin is
+stored in the :mod:`~openlp.core` module.
 
 .. toctree::
    :maxdepth: 2
@@ -12,4 +12,7 @@
    lib
    theme
    ui
-   utils
\ No newline at end of file
+   utils
+
+.. automodule:: openlp.core
+   :members:
diff --git a/api/source/plugins/media.rst b/api/source/plugins/media.rst
index e5a49db..a8486c9 100644
--- a/api/source/plugins/media.rst
+++ b/api/source/plugins/media.rst
@@ -6,17 +6,17 @@ Media Plugin
 .. automodule:: openlp.plugins.media
    :members:
 
-  Plugin Class
-  ------------
+Plugin Class
+------------
 
 .. autoclass:: openlp.plugins.media.mediaplugin.MediaPlugin
    :members:
 
-  Helper Classes & Functions
-  --------------------------
+Helper Classes & Functions
+--------------------------
 
 .. automodule:: openlp.plugins.media.lib
    :members:
 
-  .. automodule:: openlp.plugins.media.lib.mediaitem
+.. automodule:: openlp.plugins.media.lib.mediaitem
    :members: