diff --git a/README.rst b/README.rst
index c8cb19c..1c912d1 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@ Introduction
 ============
 
 .. image:: https://readthedocs.org/projects/adafruit-circuitpython-ili9341/badge/?version=latest
-    :target: https://circuitpython.readthedocs.io/projects/ili9341/en/latest/
+    :target: https://docs.circuitpython.org/projects/ili9341/en/latest/
     :alt: Documentation Status
 
 .. image:: https://img.shields.io/discord/327254708534116352.svg
@@ -62,7 +62,7 @@ Usage Example
 Documentation
 =============
 
-API documentation for this library can be found on `Read the Docs <https://circuitpython.readthedocs.io/projects/ili9341/en/latest/>`_.
+API documentation for this library can be found on `Read the Docs <https://docs.circuitpython.org/projects/ili9341/en/latest/>`_.
 
 Contributing
 ============
diff --git a/docs/conf.py b/docs/conf.py
index 90cbe40..9a9ca68 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,8 +28,8 @@ extensions = [
 # autodoc_mock_imports = ["digitalio", "busio"]
 
 intersphinx_mapping = {
-    "python": ("https://docs.python.org/3.4", None),
-    "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
+    "python": ("https://docs.python.org/3", None),
+    "CircuitPython": ("https://docs.circuitpython.org/en/latest/", None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/docs/index.rst b/docs/index.rst
index 39f6335..fb669ef 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,7 +36,7 @@ Table of Contents
     :caption: Other Links
 
     Download <https://github.com/adafruit/adafruit_CircuitPython_ILI9341/releases/latest>
-    CircuitPython Reference Documentation <https://circuitpython.readthedocs.io>
+    CircuitPython Reference Documentation <https://docs.circuitpython.org>
     CircuitPython Support Forum <https://forums.adafruit.com/viewforum.php?f=60>
     Discord Chat <https://adafru.it/discord>
     Adafruit Learning System <https://learn.adafruit.com>
diff --git a/setup.py b/setup.py
index c63a690..ce5c885 100644
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,6 @@ setup(
         "Topic :: System :: Hardware",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
     ],
     # What does your project relate to?
     keywords="adafruit blinka circuitpython micropython ili9341 display tft lcd displayio",