diff --git a/docs/drivers.rst b/docs/drivers.rst
index c328d680..32e47333 100644
--- a/docs/drivers.rst
+++ b/docs/drivers.rst
@@ -35,53 +35,122 @@ Helper Libraries
These libraries build on top of the low level APIs to simplify common tasks.
+LED Helpers
+^^^^^^^^^^^^
+
+Helpers for animating LEDs.
+
+.. toctree::
+
+ Fancy LED (similar to FastLED)
+ LED Animation
+
+User Interface and GFX Helpers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Helpers for building graphical interfaces using the displayio core module.
+
.. toctree::
- Adafruit IO
- AVR programming
- Azure IoT
- binascii
- Bitmap Font
- Bluefruit LE Connect App
- Bluetooth Low Energy (BLE)
- Board Test Suite
- Google Cloud IoT Core
Cursor Control
- DC Motor and Servo
- Debouncer
+ Bitmap Font
Display Button
Display Shapes
Display Text
- Fancy LED (similar to FastLED)
+ PyBadger
+ PYOA
+ Turtle Graphics
+ Slideshow
Framebuf Module
- hashlib
- Hue Lights
+ miniQR Non-hardware QR code generator
Image Load
- InfraRed Remote
- IterTools
- JSON Web Token (JWT)
- LED Animation
+
+Motor Helpers
+^^^^^^^^^^^^^^
+
+Helpers for driving motors, servos, and steppers.
+
+.. toctree::
+
+ DC Motor and Servo
+ MotorKit
+ ServoKit
+
+Internet of Things Web Service Helpers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Helpers for connecting with hosted and self-hosted internet-of-things web services.
+
+.. toctree::
+
+ Adafruit IO
+ Azure IoT
+ Google Cloud IoT Core
LIFX Lights
- Logging
+ Hue Lights
+
+Internet-of-Things/Wireless Protocol Helpers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Helpers for interfacing with the internet or wireless communication.
+
+.. toctree::
+
+ Bluefruit LE Connect App
+ Bluetooth Low Energy (BLE)
+ TinyLoRa TTN Helper
Mini ESP Tool
MiniMQTT
- miniQR Non-hardware QR code generator
- MotorKit
- NTP (Network time Protocol)
- OneWire
- PyBadger
- PYOA
+ JSON Web Token (JWT)
Requests
- Ring Tone Text Transfer Language (RTTTL)
+ NTP (Network time Protocol)
+
+Cryptography Helpers
+^^^^^^^^^^^^^^^^^^^^^
+
+Helpers for secure communication.
+
+.. toctree::
+
RSA
+
+CPython-module Helpers
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Pure-Python implementations of standard CPython libraries. Some of these
+modules may have a CircuitPython Core API implementation too.
+
+.. toctree::
+
+ binascii
+ IterTools
+ Logging
+ hashlib
+
+Audio Helpers
+^^^^^^^^^^^^^^^
+
+Music, noisemakers, and more.
+
+.. toctree::
+
+ Ring Tone Text Transfer Language (RTTTL)
+ Waveform Generation
+
+Miscellaneous Helpers
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. toctree::
+
+ AVR programming
+ Board Test Suite
+ Debouncer
+ InfraRed Remote
+ OneWire
SD Card
- ServoKit
SimpleIO
- Slideshow
- TinyLoRa TTN Helper
- Turtle Graphics
USB Human Interface Device (Keyboard and Mouse)
- Waveform Generation
+
Blinky
--------