2 files changed, 24 insertions, 51 deletions
diff --git a/docs/apps.rst b/docs/apps.rst
index 0cb75ce..d015852 100644
--- a/docs/apps.rst
+++ b/docs/apps.rst
@@ -6,29 +6,31 @@ Application Library
 .. contents::
     :local:
 
+Watch faces
+-----------
+
+.. automodule:: apps.clock
+
+.. automodule:: apps.chrono
+
+.. automodule:: apps.fibonacci_clock
+
 Built-in
 --------
 
-The built-in application are summarised below but because these apps are
-treated as examples they are described in detail as part of the
-:ref:`Wasp-os Reference Manual`: 
+.. automodule:: apps.heart
 
- * :py:class:`.ClockApp`
- * :py:class:`.HeartApp`
- * :py:class:`.LauncherApp`
- * :py:class:`.PagerApp`
- * :py:class:`.SettingsApp`
- * :py:class:`.SoftwareApp`
- * :py:class:`.StepCounterApp`
- * :py:class:`.StopwatchApp`
- * :py:class:`.TemplateApp`
+.. automodule:: apps.stopwatch
 
-Watch faces
------------
+.. automodule:: apps.steps
 
-.. automodule:: apps.chrono
+.. automodule:: apps.launcher
 
-.. automodule:: apps.fibonacci_clock
+.. automodule:: apps.settings
+
+.. automodule:: apps.software
+
+.. automodule:: apps.pager
 
 Applications
 ------------
diff --git a/docs/wasp.rst b/docs/wasp.rst
index 73bb1f9..e7c7953 100644
--- a/docs/wasp.rst
+++ b/docs/wasp.rst
@@ -28,6 +28,12 @@ System
 .. automodule:: fonts.sans24
    :members:
 
+.. automodule:: fonts.sans28
+   :members:
+
+.. automodule:: fonts.sans36
+   :members:
+
 .. automodule:: logo
    :members:
    :undoc-members:
@@ -56,41 +62,6 @@ Device drivers
 .. automodule:: drivers.vibrator
    :members:
 
-Applications
-------------
-
-.. automodule:: apps.clock
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.heart
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.launcher
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.pager
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.settings
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.software
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.steps
-   :members:
-   :undoc-members:
-
-.. automodule:: apps.stopwatch
-   :members:
-   :undoc-members:
-
 Bootloader
 ----------