diff --git a/doc/source/GPy.plotting.gpy_plot.rst b/doc/source/GPy.plotting.gpy_plot.rst
new file mode 100644
index 00000000..8391cd3a
--- /dev/null
+++ b/doc/source/GPy.plotting.gpy_plot.rst
@@ -0,0 +1,62 @@
+GPy.plotting.gpy_plot package
+=============================
+
+Submodules
+----------
+
+GPy.plotting.gpy_plot.data_plots module
+---------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.data_plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.gpy_plot.gp_plots module
+-------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.gp_plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.gpy_plot.inference_plots module
+--------------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.inference_plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.gpy_plot.kernel_plots module
+-----------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.kernel_plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.gpy_plot.latent_plots module
+-----------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.latent_plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.gpy_plot.plot_util module
+--------------------------------------
+
+.. automodule:: GPy.plotting.gpy_plot.plot_util
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: GPy.plotting.gpy_plot
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/GPy.plotting.matplot_dep.controllers.rst b/doc/source/GPy.plotting.matplot_dep.controllers.rst
new file mode 100644
index 00000000..239f8e79
--- /dev/null
+++ b/doc/source/GPy.plotting.matplot_dep.controllers.rst
@@ -0,0 +1,30 @@
+GPy.plotting.matplot_dep.controllers package
+============================================
+
+Submodules
+----------
+
+GPy.plotting.matplot_dep.controllers.axis_event_controller module
+-----------------------------------------------------------------
+
+.. automodule:: GPy.plotting.matplot_dep.controllers.axis_event_controller
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.matplot_dep.controllers.imshow_controller module
+-------------------------------------------------------------
+
+.. automodule:: GPy.plotting.matplot_dep.controllers.imshow_controller
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: GPy.plotting.matplot_dep.controllers
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.controllers.rst b/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.controllers.rst
deleted file mode 100644
index 71826ed6..00000000
--- a/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.controllers.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-GPy.plotting.matplot_dep.latent_space_visualizations.controllers package
-========================================================================
-
-Submodules
-----------
-
-GPy.plotting.matplot_dep.latent_space_visualizations.controllers.axis_event_controller module
----------------------------------------------------------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.latent_space_visualizations.controllers.axis_event_controller
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.plotting.matplot_dep.latent_space_visualizations.controllers.imshow_controller module
------------------------------------------------------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.latent_space_visualizations.controllers.imshow_controller
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: GPy.plotting.matplot_dep.latent_space_visualizations.controllers
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.rst b/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.rst
deleted file mode 100644
index 6e5cf4bd..00000000
--- a/doc/source/GPy.plotting.matplot_dep.latent_space_visualizations.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-GPy.plotting.matplot_dep.latent_space_visualizations package
-============================================================
-
-Subpackages
------------
-
-.. toctree::
-
-    GPy.plotting.matplot_dep.latent_space_visualizations.controllers
-
-Module contents
----------------
-
-.. automodule:: GPy.plotting.matplot_dep.latent_space_visualizations
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/GPy.plotting.matplot_dep.rst b/doc/source/GPy.plotting.matplot_dep.rst
index 77780708..9521d9e6 100644
--- a/doc/source/GPy.plotting.matplot_dep.rst
+++ b/doc/source/GPy.plotting.matplot_dep.rst
@@ -6,31 +6,15 @@ Subpackages
 
 .. toctree::
 
-    GPy.plotting.matplot_dep.latent_space_visualizations
+    GPy.plotting.matplot_dep.controllers
 
 Submodules
 ----------
 
-GPy.plotting.matplot_dep.Tango module
--------------------------------------
+GPy.plotting.matplot_dep.defaults module
+----------------------------------------
 
-.. automodule:: GPy.plotting.matplot_dep.Tango
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.plotting.matplot_dep.base_plots module
-------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.base_plots
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.plotting.matplot_dep.dim_reduction_plots module
----------------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.dim_reduction_plots
+.. automodule:: GPy.plotting.matplot_dep.defaults
     :members:
     :undoc-members:
     :show-inheritance:
@@ -43,14 +27,6 @@ GPy.plotting.matplot_dep.img_plots module
     :undoc-members:
     :show-inheritance:
 
-GPy.plotting.matplot_dep.inference_plots module
------------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.inference_plots
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 GPy.plotting.matplot_dep.kernel_plots module
 --------------------------------------------
 
@@ -75,18 +51,10 @@ GPy.plotting.matplot_dep.maps module
     :undoc-members:
     :show-inheritance:
 
-GPy.plotting.matplot_dep.models_plots module
---------------------------------------------
+GPy.plotting.matplot_dep.plot_definitions module
+------------------------------------------------
 
-.. automodule:: GPy.plotting.matplot_dep.models_plots
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.plotting.matplot_dep.netpbmfile module
-------------------------------------------
-
-.. automodule:: GPy.plotting.matplot_dep.netpbmfile
+.. automodule:: GPy.plotting.matplot_dep.plot_definitions
     :members:
     :undoc-members:
     :show-inheritance:
@@ -115,6 +83,14 @@ GPy.plotting.matplot_dep.svig_plots module
     :undoc-members:
     :show-inheritance:
 
+GPy.plotting.matplot_dep.util module
+------------------------------------
+
+.. automodule:: GPy.plotting.matplot_dep.util
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 GPy.plotting.matplot_dep.variational_plots module
 -------------------------------------------------
 
diff --git a/doc/source/GPy.plotting.plotly_dep.rst b/doc/source/GPy.plotting.plotly_dep.rst
new file mode 100644
index 00000000..52642e49
--- /dev/null
+++ b/doc/source/GPy.plotting.plotly_dep.rst
@@ -0,0 +1,30 @@
+GPy.plotting.plotly_dep package
+===============================
+
+Submodules
+----------
+
+GPy.plotting.plotly_dep.defaults module
+---------------------------------------
+
+.. automodule:: GPy.plotting.plotly_dep.defaults
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.plotly_dep.plot_definitions module
+-----------------------------------------------
+
+.. automodule:: GPy.plotting.plotly_dep.plot_definitions
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: GPy.plotting.plotly_dep
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/GPy.plotting.rst b/doc/source/GPy.plotting.rst
index af035515..33c39c93 100644
--- a/doc/source/GPy.plotting.rst
+++ b/doc/source/GPy.plotting.rst
@@ -6,7 +6,29 @@ Subpackages
 
 .. toctree::
 
+    GPy.plotting.gpy_plot
     GPy.plotting.matplot_dep
+    GPy.plotting.plotly_dep
+
+Submodules
+----------
+
+GPy.plotting.Tango module
+-------------------------
+
+.. automodule:: GPy.plotting.Tango
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+GPy.plotting.abstract_plotting_library module
+---------------------------------------------
+
+.. automodule:: GPy.plotting.abstract_plotting_library
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/GPy.testing.rst b/doc/source/GPy.testing.rst
index 9ee1e34b..a10c3d18 100644
--- a/doc/source/GPy.testing.rst
+++ b/doc/source/GPy.testing.rst
@@ -164,6 +164,14 @@ GPy.testing.pickle_tests module
     :undoc-members:
     :show-inheritance:
 
+GPy.testing.plotting_tests module
+---------------------------------
+
+.. automodule:: GPy.testing.plotting_tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 GPy.testing.prior_tests module
 ------------------------------
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0925bf5c..91187571 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -54,6 +54,8 @@ extensions = [
 
 #sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 
+import sphinx_rtd_theme
+
 autodoc_default_flags = ['members',
                          #'undoc-members',
                          #'private-members',
@@ -68,7 +70,7 @@ show_authors = True
 
 # ------ Sphinx
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]#templates_path = ['_templates']
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string: