diff --git a/README.rst b/README.rst
index a5bfbc3..7f9ce24 100644
--- a/README.rst
+++ b/README.rst
@@ -62,7 +62,7 @@ Here are a few quickstart tutorials for the most common images.
 If you plan on partitioning your volume, you will need the ``parted``
 package and ``kpartx``:
 
-.. code:: sh
+.. code-block:: sh
 
     root@host:~# apt-get install parted kpartx
 
@@ -75,7 +75,7 @@ quits the process.
 Docker
 ~~~~~~
 
-.. code:: sh
+.. code-block:: sh
 
     user@host:~$ sudo -i # become root
     root@host:~# git clone https://github.com/andsens/bootstrap-vz.git # Clone the repo
@@ -93,7 +93,7 @@ it is recommended to install `the latest docker version <https://docs.docker.com
 VirtualBox Vagrant
 ~~~~~~~~~~~~~~~~~~
 
-.. code:: sh
+.. code-block:: sh
 
     user@host:~$ sudo -i # become root
     root@host:~# git clone https://github.com/andsens/bootstrap-vz.git # Clone the repo
@@ -109,7 +109,7 @@ __ https://my.vmware.com/web/vmware/info/slug/desktop_end_user_computing/vmware_
 Amazon EC2 EBS backed AMI
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. code:: sh
+.. code-block:: sh
 
     user@host:~$ sudo -i # become root
     root@host:~# git clone https://github.com/andsens/bootstrap-vz.git # Clone the repo
@@ -121,7 +121,7 @@ To bootstrap S3 backed AMIs, bootstrap-vz will also need the
 ``euca2ools`` package. However, version 3.2.0 is required meaning you
 must install it directly from the eucalyptus repository like this:
 
-.. code:: sh
+.. code-block:: sh
 
     apt-get install --no-install-recommends python-dev libxml2-dev libxslt-dev gcc zlib1g-dev
     pip install git+git://github.com/eucalyptus/euca2ools.git@v3.2.0
diff --git a/bootstrapvz/README.rst b/bootstrapvz/README.rst
index ff99d38..6a5003d 100644
--- a/bootstrapvz/README.rst
+++ b/bootstrapvz/README.rst
@@ -11,7 +11,7 @@ dependency graph where directed edges dictate precedence. Each task is
 a simple class that defines its predecessor tasks and successor tasks
 via attributes. Here is an example:
 
-.. code:: python
+.. code-block:: python
 
 	class MapPartitions(Task):
 		description = 'Mapping volume partitions'
diff --git a/bootstrapvz/plugins/admin_user/README.rst b/bootstrapvz/plugins/admin_user/README.rst
index dcf891e..346112a 100644
--- a/bootstrapvz/plugins/admin_user/README.rst
+++ b/bootstrapvz/plugins/admin_user/README.rst
@@ -33,7 +33,7 @@ Settings
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     plugins:
diff --git a/bootstrapvz/plugins/commands/README.rst b/bootstrapvz/plugins/commands/README.rst
index 1e31635..3cf72c4 100644
--- a/bootstrapvz/plugins/commands/README.rst
+++ b/bootstrapvz/plugins/commands/README.rst
@@ -23,7 +23,7 @@ Example
 ~~~~~~~
 
 Create an empty `index.html` in `/var/www` and delete all locales except english.
-.. code:: yaml
+.. code-block:: yaml
 
   commands:
     commands:
diff --git a/bootstrapvz/plugins/opennebula/README.rst b/bootstrapvz/plugins/opennebula/README.rst
index a29d7ae..121f57c 100644
--- a/bootstrapvz/plugins/opennebula/README.rst
+++ b/bootstrapvz/plugins/opennebula/README.rst
@@ -7,14 +7,14 @@ to the image, which sets up the network configuration and SSH keys.
 
 The virtual machine context should be configured as follows:
 
-::
+.. code-block:: text
 
-    ETH0_DNS      $NETWORK[DNS, NETWORK_ID=2]
-    ETH0_GATEWAY  $NETWORK[GATEWAY, NETWORK_ID=2]
-    ETH0_IP       $NIC[IP, NETWORK_ID=2]
-    ETH0_MASK     $NETWORK[MASK, NETWORK_ID=2]
-    ETH0_NETWORK  $NETWORK[NETWORK, NETWORK_ID=2]
-    FILES         path_to_my_ssh_public_key.pub
+  ETH0_DNS      $NETWORK[DNS, NETWORK_ID=2]
+  ETH0_GATEWAY  $NETWORK[GATEWAY, NETWORK_ID=2]
+  ETH0_IP       $NIC[IP, NETWORK_ID=2]
+  ETH0_MASK     $NETWORK[MASK, NETWORK_ID=2]
+  ETH0_NETWORK  $NETWORK[NETWORK, NETWORK_ID=2]
+  FILES         path_to_my_ssh_public_key.pub
 
 The plugin will install all *.pub* files in the root authorized\_keys
 file. When using the ec2 provider, the USER\_EC2\_DATA will be executed
diff --git a/bootstrapvz/providers/azure/README.rst b/bootstrapvz/providers/azure/README.rst
index 4e2c10d..40661a3 100644
--- a/bootstrapvz/providers/azure/README.rst
+++ b/bootstrapvz/providers/azure/README.rst
@@ -23,7 +23,7 @@ Provider
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/providers/docker/README.rst b/bootstrapvz/providers/docker/README.rst
index 2279e7d..f7fb836 100644
--- a/bootstrapvz/providers/docker/README.rst
+++ b/bootstrapvz/providers/docker/README.rst
@@ -43,7 +43,7 @@ Provider
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     name: bootstrap-vz:latest
diff --git a/bootstrapvz/providers/ec2/README.rst b/bootstrapvz/providers/ec2/README.rst
index f8bceec..4b78e75 100644
--- a/bootstrapvz/providers/ec2/README.rst
+++ b/bootstrapvz/providers/ec2/README.rst
@@ -53,7 +53,7 @@ under the ``provider`` section.
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
@@ -78,7 +78,7 @@ __ http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/virtualization_types.html
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
@@ -96,7 +96,7 @@ __ http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
@@ -117,7 +117,7 @@ Image
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/providers/gce/README.rst b/bootstrapvz/providers/gce/README.rst
index f38f7ac..43fc0fe 100644
--- a/bootstrapvz/providers/gce/README.rst
+++ b/bootstrapvz/providers/gce/README.rst
@@ -21,7 +21,7 @@ Provider
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/providers/kvm/README.rst b/bootstrapvz/providers/kvm/README.rst
index a2b06ce..e9610ae 100644
--- a/bootstrapvz/providers/kvm/README.rst
+++ b/bootstrapvz/providers/kvm/README.rst
@@ -18,7 +18,7 @@ Provider
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/providers/oracle/README.rst b/bootstrapvz/providers/oracle/README.rst
index 218f6a1..d3f1db3 100644
--- a/bootstrapvz/providers/oracle/README.rst
+++ b/bootstrapvz/providers/oracle/README.rst
@@ -28,7 +28,7 @@ generation. They will be used to authenticate the API client.
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
@@ -52,7 +52,7 @@ available to customize the process of uploading and verifying an image.
    Default: ``false``.
    ``optional``
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/providers/virtualbox/README.rst b/bootstrapvz/providers/virtualbox/README.rst
index 65590ef..ba36341 100644
--- a/bootstrapvz/providers/virtualbox/README.rst
+++ b/bootstrapvz/providers/virtualbox/README.rst
@@ -28,7 +28,7 @@ Provider
 
 Example:
 
-.. code:: yaml
+.. code-block:: yaml
 
     ---
     provider:
diff --git a/bootstrapvz/remote/README.rst b/bootstrapvz/remote/README.rst
index 90b35db..53b8b13 100644
--- a/bootstrapvz/remote/README.rst
+++ b/bootstrapvz/remote/README.rst
@@ -63,7 +63,7 @@ The file ``build-servers.yml`` informs bootstrap-vz about the different
 build servers you have at your disposal.
 In its simplest form you can just add your own machine like this:
 
-.. code:: yaml
+.. code-block:: yaml
 
   local:
     type: local
@@ -94,7 +94,7 @@ Remote settings
 The other (and more interesting) setting for ``type`` is ``ssh``,
 which requires a few more configuration settings:
 
-.. code:: yaml
+.. code-block:: yaml
 
   local_vm:
     type: ssh
@@ -141,7 +141,7 @@ This is useful when for example the VirtualBox guest additions ISO is located
 at ``/root/guest_additions.iso`` on server 1, while server 2 has it at
 ``/root/images/vbox.iso``.
 
-.. code:: yaml
+.. code-block:: yaml
 
   local:
     type: local
@@ -174,7 +174,7 @@ Run settings
 The run settings hold information about how to start a bootstrapped image.
 This is useful only when running system tests.
 
-.. code:: yaml
+.. code-block:: yaml
 
   local:
     type: local
diff --git a/docs/developers/plugins.rst b/docs/developers/plugins.rst
index 119eecc..d8a2524 100644
--- a/docs/developers/plugins.rst
+++ b/docs/developers/plugins.rst
@@ -12,7 +12,7 @@ Start by creating an ``__init__.py`` in your plugin folder.
 The only obligatory function you need to implement is ``resolve_tasks()``.
 This function adds tasks to be run to the tasklist:
 
-.. code:: python
+.. code-block:: python
 
 	def resolve_tasks(taskset, manifest):
 		taskset.add(tasks.DoSomething)
@@ -23,7 +23,7 @@ check of which release of Debian bootstrap-vz will create an image.
 
 A task is a class with a static ``run()`` function and some meta-information:
 
-.. code:: python
+.. code-block:: python
 
 	class DoSomething(Task):
 		description = 'Doing something'
@@ -46,7 +46,7 @@ process. If you created temporary files for example, you can add a task to the
 rollback taskset that deletes those files, you might even already have it because
 you run it after an image has been successfully bootstrapped:
 
-.. code:: python
+.. code-block:: python
 
 	def resolve_rollback_tasks(taskset, manifest, completed, counter_task):
 		counter_task(taskset, tasks.DoSomething, tasks.UndoSomething)
@@ -63,7 +63,7 @@ running through the completed tasklist and checking each completed task.
 You can also specify a ``validate_manifest()`` function.
 Typically it looks like this:
 
-.. code:: python
+.. code-block:: python
 
 	def validate_manifest(data, validator, error):
 		import os.path
@@ -75,7 +75,7 @@ The schema is a `JSON schema <http://json-schema.org/>`__, since bootstrap-vz
 supports `yaml <http://yaml.org/>`__, you can avoid a lot of curly braces
 quotes:
 
-.. code:: yaml
+.. code-block:: yaml
 
   $schema: http://json-schema.org/draft-04/schema#
   title: Example plugin manifest
@@ -110,7 +110,7 @@ specific to your use-case or when the plugin contains proprietary code that you
 would not like to share.
 They integrate with bootstrap-vz by exposing an entry-point through ``setup.py``:
 
-.. code:: python
+.. code-block:: python
 
 	setup(name='example-plugin',
 	      version=0.9.5,
@@ -123,7 +123,7 @@ They integrate with bootstrap-vz by exposing an entry-point through ``setup.py``
 Beyond ``setup.py`` the package might need a ``MANIFEST.in`` so that assets
 like ``manifest-schema.yml`` are included when the package is built:
 
-.. code::
+.. code-block:: text
 
 	include example/manifest-schema.yml
 	include example/README.rst
@@ -141,6 +141,6 @@ Some plugins may not find their way to the python package index
 (especially if it's in a private repo). They can of course still be installed
 using pip:
 
-.. code:: sh
+.. code-block:: sh
 
 	pip install git+ssh://git@github.com/username/repo#egg=plugin_name
diff --git a/tests/README.rst b/tests/README.rst
index c14730c..ee59591 100644
--- a/tests/README.rst
+++ b/tests/README.rst
@@ -9,7 +9,7 @@ Selecting tests
 ---------------
 To run one specific test suite simply append the module path to tox:
 
-.. code:: sh
+.. code-block:: sh
 
 	$ tox -e unit tests.unit.releases_tests
 
@@ -17,6 +17,6 @@ Specific tests can be selected by appending the function name with a colon
 to the modulepath -- to run more than one tests, simply attach more arguments.
 
 
-.. code:: sh
+.. code-block:: sh
 
 	$ tox -e unit tests.unit.releases_tests:test_lt tests.unit.releases_tests:test_eq
diff --git a/tests/system/README.rst b/tests/system/README.rst
index 815588e..d77c68a 100644
--- a/tests/system/README.rst
+++ b/tests/system/README.rst
@@ -46,7 +46,7 @@ Instead of creating manifests from scratch for each single test, reusable parts
 are factored out into partials in the manifest folder.
 This allows code like this:
 
-.. code:: python
+.. code-block:: python
 
 	partials = {'vdi': '{provider: {name: virtualbox}, volume: {backing: vdi}}',
 	            'vmdk': '{provider: {name: virtualbox}, volume: {backing: vmdk}}',
diff --git a/tests/system/providers/README.rst b/tests/system/providers/README.rst
index 80c6666..e16e83f 100644
--- a/tests/system/providers/README.rst
+++ b/tests/system/providers/README.rst
@@ -28,7 +28,7 @@ up logging and invokes a specific test can be used instead:
 
 Example:
 
-.. code:: python
+.. code-block:: python
 
     #!/usr/bin/env python
 
diff --git a/tox.ini b/tox.ini
index 8a0b7cd..0b8047e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,5 +32,7 @@ commands = nosetests --with-html --html-file=system.html --verbose {posargs:test
 
 [testenv:docs]
 changedir = docs
-deps = sphinx
+deps =
+    sphinx
+    sphinx_rtd_theme
 commands = sphinx-build -W -b html -d _build/html/doctrees . _build/html