diff --git a/docs/__init__.py b/docs/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..013e4b7ec4eaa42e6c73bebdf41ce3e357bc6153 100644
--- a/docs/__init__.py
+++ b/docs/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/python
diff --git a/docs/conf.py b/docs/conf.py
index c2a49b1474167372280d42ef4a47c7611d073f92..7da4720aab87905ee0a06b6d086d5e7f41bd1996 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -16,6 +16,8 @@
 # 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.
 #
+import sphinx_bootstrap_theme
+
 import os
 import sys
 sys.path.insert(0, os.path.abspath('.'))
@@ -149,7 +151,7 @@ todo_include_todos = True
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'classic'
+html_theme = 'bootstrap'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -158,7 +160,8 @@ html_theme = 'classic'
 # html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
+#html_theme_path = []
+html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
diff --git a/docs/index.rst b/docs/index.rst
index 6d136d5ab92a9071387c48d76d9f0ce1d061b699..32339b8c15a093a9abd83ae2f95e974280f64bda 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-EV3-Toolbox for controlling Lego Mindstorms EV3 with MATLAB
-===========================================================
+Toolbox for controlling Lego Mindstorms EV3 with MATLAB
+=======================================================
 
 Contents:
 
diff --git a/docs/source.rst b/docs/source.rst
index caba8bead9a44f3a5c130be3a081e6930cc78756..589e1dd71f965275426b905e185bec519a40f781 100644
--- a/docs/source.rst
+++ b/docs/source.rst
@@ -1,5 +1,8 @@
 .. automodule:: source
 
+.. |br| raw:: html
+   
+   <br />
 EV3
 ===
 
@@ -14,18 +17,9 @@ Motor
    :members: start, stop, syncedStart, syncedStop, waitFor, internalReset, resetTachoCount, setBrake, setProperties
 
 
-Enumerations
-------------
-
-.. autoclass:: BrakeMode
-   :members:
-
-
 Sensor
 ======
 
 .. autoclass:: Sensor
    :members: reset, setProperties
 
-
-