diff --git a/.gitmodules b/.gitmodules
index 157e28c..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "doc/_themes/sphinx-theme-okfn"]
-	path = doc/_themes/sphinx-theme-okfn
-	url = https://github.com/okfn/sphinx-theme-okfn.git
diff --git a/doc-requirements.txt b/doc-requirements.txt
index 0ac9f95..0eb085d 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -6,3 +6,4 @@ OWSLib==0.8.6
 lxml>=2.3
 pyparsing==1.5.6
 Sphinx==1.2.3
+sphinx-rtd-theme==0.1.7
diff --git a/doc/_static/ckanlogo.png b/doc/_static/ckanlogo.png
deleted file mode 100644
index a234cc0..0000000
Binary files a/doc/_static/ckanlogo.png and /dev/null differ
diff --git a/doc/_static/preview-geojson.png b/doc/_static/preview-geojson.png
deleted file mode 100644
index c2ea881..0000000
Binary files a/doc/_static/preview-geojson.png and /dev/null differ
diff --git a/doc/_static/preview-wms.png b/doc/_static/preview-wms.png
deleted file mode 100644
index 1d947d3..0000000
Binary files a/doc/_static/preview-wms.png and /dev/null differ
diff --git a/doc/_templates/footer.html b/doc/_templates/footer.html
index 93ac4bc..b1492cd 100644
--- a/doc/_templates/footer.html
+++ b/doc/_templates/footer.html
@@ -1,29 +1,24 @@
-<p>An <a href="http://okfn.org">Open Knowledge Foundation</a> project.</p>
+<div>
 
-<p class="copyright">
-{%- if show_copyright %}
-  {% trans copyright=copyright|safe|e %}{{ copyright }}{% endtrans %}<br/>
-{%- endif %}
-</p>
+  <hr/ >
 
-<p>
-<a href="https://github.com/okfn/ckanext-spatial">Source</a>
-&mdash;
-<a href="https://github.com/okfn/ckanext-spatial/issues">Issues</a>
-&mdash;
-<a href="http://lists.okfn.org/mailman/listinfo/ckan-dev">Mailing List</a>
-&mdash;
-<a href="http://twitter.com/CKANProject">Twitter @CKANProject</a>
-</p>
+  <p>An <a href="http://okfn.org">Open Knowledge</a> project.</p>
 
-<p>
-Related Projects:
-<a href="http://thedatahub.org/">The DataHub</a>
-&mdash;
-<a href="http://datacatalogs.org">DataCatalogs.org</a>
-&mdash;
-<a href="http://openspending.org">OpenSpending.org</a>
-&mdash;
-<a href="http://opendatahandbook.org">Open Data Handbook</a>
-</p>
+  <p class="copyright">
+  {%- if show_copyright %}
+    {% trans copyright=copyright|safe|e %}{{ copyright }}{% endtrans %}<br/>
+  {%- endif %}
+  </p>
+
+  <p>
+  <a href="https://github.com/okfn/ckanext-spatial">Source</a>
+  &mdash;
+  <a href="https://github.com/okfn/ckanext-spatial/issues">Issues</a>
+  &mdash;
+  <a href="http://lists.okfn.org/mailman/listinfo/ckan-dev">Mailing List</a>
+  &mdash;
+  <a href="http://twitter.com/CKANProject">Twitter @CKANProject</a>
+  </p>
+
+</div>
 
diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn
deleted file mode 160000
index 59688a6..0000000
--- a/doc/_themes/sphinx-theme-okfn
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 59688a6679f3373a57e8d4e60e43f1b249878eb3
diff --git a/doc/conf.py b/doc/conf.py
index 93a6937..ab4097c 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'ckanext-spatial'
-copyright = u'2013, Open Knowledge Foundation'
+copyright = u'2015, Open Knowledge'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -96,6 +96,12 @@ exclude_trees = ['.build']
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+if not on_rtd:
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
 #html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
@@ -105,14 +111,6 @@ exclude_trees = ['.build']
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
-sys.path.append(os.path.abspath('_themes'))
-html_theme_path = ['_themes']
-html_theme = 'sphinx-theme-okfn'
-html_theme_options = {
-        'logo_icon': 'ckanlogo.png',
-        'show_version': False,
-        'show_okfn_logo': False,
-    }
 html_sidebars = {
     '**':  ['globaltoc.html']
 }
diff --git a/doc/index.rst b/doc/index.rst
index 465e881..d8b4547 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -11,9 +11,7 @@ The extension adds a spatial field to the default CKAN dataset schema,
 using PostGIS_ as the backend. This allows to perform spatial queries and
 display the dataset extent on the frontend. It also provides harvesters to
 import geospatial metadata into CKAN from other sources, as well as commands
-to support the OGC CSW standard via pycsw_. Finally, it also includes plugins to preview
-spatial formats such as GeoJSON_.
-
+to support the OGC CSW standard via pycsw_.
 
 Contents:
 
diff --git a/doc/spatial-search.rst b/doc/spatial-search.rst
index 416fe3b..3d4b728 100644
--- a/doc/spatial-search.rst
+++ b/doc/spatial-search.rst
@@ -106,6 +106,7 @@ details about the available options:
             <field name="minx" type="float" indexed="true" stored="true" />
             <field name="miny" type="float" indexed="true" stored="true" />
         </fields>
+
     The solr schema file is typically located at: (..)/src/ckan/ckan/config/solr/schema.xml
 
 * ``solr-spatial-field``