diff --git a/README.rst b/README.rst
index c06a554..c3e5b55 100644
--- a/README.rst
+++ b/README.rst
@@ -23,7 +23,9 @@ About
 =====
 
 Component interfaces are provided to allow a frictionless way to get started
-with physical computing::
+with physical computing:
+
+.. code:: python
 
     from gpiozero import LED
     from time import sleep
@@ -37,7 +39,9 @@ with physical computing::
         sleep(1)
 
 With very little code, you can quickly get going connecting your components
-together::
+together:
+
+.. code:: python
 
     from gpiozero import LED, Button
     from signal import pause
diff --git a/docs/conf.py b/docs/conf.py
index 6fb6ea2..259796e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,6 +2,7 @@
 
 import sys
 import os
+from datetime import datetime
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 import setup as _setup
@@ -52,12 +53,13 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8-sig'
 master_doc = 'index'
 project = _setup.__project__.title()
-copyright = '2015 %s' % _setup.__author__
+copyright = '2015-%s %s' % (datetime.now().year, _setup.__author__)
 version = _setup.__version__
 release = _setup.__version__
 #language = None
 #today_fmt = '%B %d, %Y'
 exclude_patterns = ['_build']
+highlight_language='python3'
 #default_role = None
 #add_function_parentheses = True
 #add_module_names = True
@@ -73,8 +75,8 @@ autodoc_member_order = 'groupwise'
 # -- Intersphinx configuration --------------------------------------------
 
 intersphinx_mapping = {
-    'python': ('http://docs.python.org/3.4', None),
-    'picamera': ('http://picamera.readthedocs.io/en/latest', None),
+    'python': ('https://docs.python.org/3.5', None),
+    'picamera': ('https://picamera.readthedocs.io/en/latest', None),
     }
 
 # -- Options for HTML output ----------------------------------------------
diff --git a/setup.py b/setup.py
index 5c03634..a7ea6ae 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,13 @@ __classifiers__ = [
     "Topic :: System :: Hardware",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python :: 2",
+    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.2",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
 __keywords__ = [