diff --git a/dev_requirements.txt b/dev_requirements.txt
index c90ac630..01fe2507 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -9,3 +9,6 @@ typogrify
 
 # To perform release
 bumpr==0.2.0
+
+# For docs theme
+sphinx_rtd_theme
diff --git a/docs/conf.py b/docs/conf.py
index 6db0f3d1..99acd1b6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,6 +2,8 @@
 from __future__ import unicode_literals
 import sys, os
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 sys.path.append(os.path.abspath(os.pardir))
 
 from pelican import __version__
@@ -21,29 +23,43 @@ rst_prolog = '''
 .. |last_stable| replace:: :pelican-doc:`{0}`
 '''.format(last_stable)
 
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
 extlinks = {
     'pelican-doc':  ('http://docs.getpelican.com/%s/', '')
 }
 
 # -- Options for HTML output ---------------------------------------------------
 
-html_theme_path = ['_themes']
-html_theme = 'pelican'
-
-html_theme_options = {
-    'nosidebar': True,
-    'index_logo': 'pelican.png',
-    'github_fork': 'getpelican/pelican',
-}
+html_theme = 'default'
+if not on_rtd:
+    try:
+        import sphinx_rtd_theme
+        html_theme = 'sphinx_rtd_theme'
+        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+    except ImportError:
+        pass
 
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Pelicandoc'
 
+html_use_smartypants = True
+
+# If false, no module index is generated.
+html_use_modindex = False
+
+# If false, no index is generated.
+html_use_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = False
+
 # -- Options for LaTeX output --------------------------------------------------
 latex_documents = [
-  ('index', 'Pelican.tex', 'Pelican Documentation',
+    ('index', 'Pelican.tex', 'Pelican Documentation',
    'Alexis Métaireau', 'manual'),
 ]
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 36cc3f9a..33f380a3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -243,9 +243,9 @@ posts for the month at ``posts/2011/Aug/index.html``.
     arrive at an appropriate archive of posts, without having to specify
     a page name.
 
-====================================================    =====================================================
+======================================================  =====================================================
 Setting name (default value)                            What does it do?
-====================================================    =====================================================
+======================================================  =====================================================
 `ARTICLE_URL` (``'{slug}.html'``)                       The URL to refer to an article.
 `ARTICLE_SAVE_AS` (``'{slug}.html'``)                   The place where we will save an article.
 `ARTICLE_LANG_URL` (``'{slug}-{lang}.html'``)           The URL to refer to an article which doesn't use the
@@ -256,7 +256,7 @@ Setting name (default value)                            What does it do?
 `DRAFT_SAVE_AS` (``'drafts/{slug}.html'``)              The place where we will save an article draft.
 `DRAFT_LANG_URL` (``'drafts/{slug}-{lang}.html'``)      The URL to refer to an article draft which doesn't
                                                         use the default language.
-`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which 
+`DRAFT_LANG_SAVE_AS` (``'drafts/{slug}-{lang}.html'``)  The place where we will save an article draft which
                                                         doesn't use the default language.
 `PAGE_URL` (``'pages/{slug}.html'``)                    The URL we will use to link to a page.
 `PAGE_SAVE_AS` (``'pages/{slug}.html'``)                The location we will save the page. This value has to be
@@ -279,7 +279,7 @@ Setting name (default value)                            What does it do?
                                                         non-alphanumerics when generating slugs. Specified
                                                         as a list of 2-tuples of ``(from, to)`` which are
                                                         applied in order.
-====================================================    =====================================================
+======================================================  =====================================================
 
 .. note::