diff --git a/doc/cli.rst b/doc/cli.rst
index 5bd123d..af2b5f1 100644
--- a/doc/cli.rst
+++ b/doc/cli.rst
@@ -29,7 +29,7 @@
 |                       | the console as well as returned in the exit      |                                         |
 |                       | status code.                                     |                                         |
 +-----------------------+--------------------------------------------------+-----------------------------------------+
-| pyrsa-priv2pub        | Reads a private key and outputs the              |                                         |
+| pyrsa-priv2pub        | Reads a private key and outputs the              | \-                                      |
 |                       | corresponding public key.                        |                                         |
 +-----------------------+--------------------------------------------------+-----------------------------------------+
 | pyrsa-encrypt-bigfile | Encrypts a file to an encrypted VARBLOCK file.   | :py:func:`rsa.bigfile.encrypt_bigfile`  |
diff --git a/doc/compatibility.rst b/doc/compatibility.rst
index d82d1fa..7d8b10f 100644
--- a/doc/compatibility.rst
+++ b/doc/compatibility.rst
@@ -1,4 +1,4 @@
-Compatibility with standards and other software
+Compatibility with standards
 ==================================================
 
 .. index:: OpenSSL
diff --git a/doc/conf.py b/doc/conf.py
index 6493ad7..7cdbcf3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -57,7 +57,7 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -94,7 +94,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinxdoc'
 
 # 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
diff --git a/doc/index.rst b/doc/index.rst
index 02577ab..c7600a0 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -10,6 +10,13 @@
 encryption and decryption, signing and verifying signatures, and key
 generation according to PKCS#1 version 1.5.
 
+If you have the time and skill to improve the implementation, by all
+means be my guest. The best way is to clone the `Mercurial
+repository`_ and send me a merge request when you've got something
+worth merging.
+
+.. _`Mercurial repository`: https://bitbucket.org/sybren/python-rsa
+
 
 Security notice
 --------------------------------------------------
@@ -26,11 +33,6 @@
 judgement to decide whether this module is secure enough for your
 application.
 
-If you have the time and skill to improve the implementation, by all
-means be my guest. The best way is to clone the Mercurial repository
-and send me a merge request when you've got something worth merging.
-
-
 Contents
 --------------------------------------------------
 
@@ -49,3 +51,4 @@
 
 
 * :ref:`genindex`
+* :ref:`search`