diff --git a/doc/api/diagram_source/hubs.ldr b/doc/api/diagram_source/hubs.ldr
new file mode 100644
index 0000000..6bd8f21
--- /dev/null
+++ b/doc/api/diagram_source/hubs.ldr
@@ -0,0 +1,11 @@
+0 Name: pupmotors
+0 Author: Pybricks {laurens@pybricks.com}
+0 !LICENSE MIT
+1 15 -420 -56 -250 1 0 0 0 1 0 0 0 1 26910.dat
+1 15 10 -80 140 1 0 0 0 1 0 0 0 1 28738.dat
+1 71 -270 -40 630 1 0 0 0 1 0 0 0 1 22127.dat
+1 15 200 -96 600 -1 0 0 0 1 0 0 0 -1 28739.dat
+1 15 470 -16 -90 1 0 0 0 1 0 0 0 1 45601p02.dat
+1 15 -800 -40 360 1 0 0 0 1 0 0 0 1 95646c01.dat
+1 15 -1160 32 -310 1 0 0 0 1 0 0 0 1 53788c01.dat
+1 71 -1340 -40 430 1 0 0 0 1 0 0 0 1 87576c01.dat
diff --git a/doc/api/diagram_source/pupremote.png b/doc/api/diagram_source/pupremote.png
new file mode 100644
index 0000000..90bc2cd
Binary files /dev/null and b/doc/api/diagram_source/pupremote.png differ
diff --git a/doc/api/hubs.rst b/doc/api/hubs.rst
index 0646544..cafeab9 100644
--- a/doc/api/hubs.rst
+++ b/doc/api/hubs.rst
@@ -1,30 +1,38 @@
 :mod:`hubs <pybricks.hubs>` -- Programmable Hubs
 ================================================
 
-.. automodule:: pybricks.hubs
-    :no-members:
+.. module:: pybricks.hubs
 
-Select your platform hub using the buttons below.
+Select your programmable hub using the buttons below.
 
 .. content-tabs::
 
     .. tab-container:: ev3brick
         :title: EV3 Brick
 
-        |
+        .. figure:: ../api/images/ev3brick.png
+            :height: 15 em
 
         .. include:: hubs_ev3brick.inc
 
     .. tab-container:: movehub
         :title: Move Hub
 
-        |
+        .. figure:: ../api/images/movehub.png
+            :height: 15 em
 
         .. include:: hubs_movehub.inc
 
     .. tab-container:: cityhub
         :title: City Hub
 
-        |
+        .. figure:: ../api/images/cityhub.png
+            :height: 15 em
 
         .. include:: hubs_cityhub.inc
+
+    .. tab-container:: cplushub
+        :title: Control+ Hub
+
+        .. figure:: ../api/images/cplushub.png
+            :height: 15 em
diff --git a/doc/api/hubs_cityhub.inc b/doc/api/hubs_cityhub.inc
index e2f5f8e..521afd0 100644
--- a/doc/api/hubs_cityhub.inc
+++ b/doc/api/hubs_cityhub.inc
@@ -1,8 +1,6 @@
 .. autoclass:: pybricks.hubs.CityHub
     :no-members:
 
-    Usage of each built-in device is described below.
-
     .. rubric:: Using the hub status light
 
     .. automethod:: pybricks.hubs::CityHub.light.on
diff --git a/doc/api/images/cityhub.png b/doc/api/images/cityhub.png
new file mode 100644
index 0000000..37d0e26
Binary files /dev/null and b/doc/api/images/cityhub.png differ
diff --git a/doc/api/images/cplushub.png b/doc/api/images/cplushub.png
new file mode 100644
index 0000000..d779700
Binary files /dev/null and b/doc/api/images/cplushub.png differ
diff --git a/doc/api/images/energymeter.png b/doc/api/images/energymeter.png
new file mode 100644
index 0000000..a426c7f
Binary files /dev/null and b/doc/api/images/energymeter.png differ
diff --git a/doc/api/images/ev3brick.png b/doc/api/images/ev3brick.png
new file mode 100644
index 0000000..24f627f
Binary files /dev/null and b/doc/api/images/ev3brick.png differ
diff --git a/doc/api/images/movehub.png b/doc/api/images/movehub.png
new file mode 100644
index 0000000..e9d9c28
Binary files /dev/null and b/doc/api/images/movehub.png differ
diff --git a/doc/api/images/nxtbrick.png b/doc/api/images/nxtbrick.png
new file mode 100644
index 0000000..9a237ac
Binary files /dev/null and b/doc/api/images/nxtbrick.png differ
diff --git a/doc/api/images/primehub.png b/doc/api/images/primehub.png
new file mode 100644
index 0000000..a1bb59c
Binary files /dev/null and b/doc/api/images/primehub.png differ
diff --git a/doc/api/images/pupremote.png b/doc/api/images/pupremote.png
new file mode 100644
index 0000000..f01d4eb
Binary files /dev/null and b/doc/api/images/pupremote.png differ