diff --git a/docs/source/api/evennia.commands.default.rst b/docs/source/api/evennia.commands.default.rst
index fbfd575c7d..93224311b7 100644
--- a/docs/source/api/evennia.commands.default.rst
+++ b/docs/source/api/evennia.commands.default.rst
@@ -9,14 +9,6 @@ evennia.commands.default package
 Submodules
 ----------
 
-evennia.commands.default module
--------------------------------
-
-.. automodule:: evennia.commands.default
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 evennia.commands.default.account module
 ---------------------------------------
 
diff --git a/docs/source/api/evennia.contrib.rst b/docs/source/api/evennia.contrib.rst
index cfc9afaf69..c2dbd1f9fd 100644
--- a/docs/source/api/evennia.contrib.rst
+++ b/docs/source/api/evennia.contrib.rst
@@ -11,6 +11,7 @@ Subpackages
 
 .. toctree::
 
+   evennia.contrib.awsstorage
    evennia.contrib.ingame_python
    evennia.contrib.security
    evennia.contrib.turnbattle
@@ -20,14 +21,6 @@ Subpackages
 Submodules
 ----------
 
-evennia.contrib module
-----------------------
-
-.. automodule:: evennia.contrib
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 evennia.contrib.barter module
 -----------------------------
 
@@ -212,6 +205,14 @@ evennia.contrib.talking\_npc module
    :undoc-members:
    :show-inheritance:
 
+evennia.contrib.test\_traits module
+-----------------------------------
+
+.. automodule:: evennia.contrib.test_traits
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 evennia.contrib.tests module
 ----------------------------
 
@@ -220,6 +221,14 @@ evennia.contrib.tests module
    :undoc-members:
    :show-inheritance:
 
+evennia.contrib.traits module
+-----------------------------
+
+.. automodule:: evennia.contrib.traits
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 evennia.contrib.tree\_select module
 -----------------------------------
 
diff --git a/docs/source/api/evennia.server.rst b/docs/source/api/evennia.server.rst
index 0b51a9125d..5a3cae2db9 100644
--- a/docs/source/api/evennia.server.rst
+++ b/docs/source/api/evennia.server.rst
@@ -20,14 +20,6 @@ Subpackages
 Submodules
 ----------
 
-evennia.server module
----------------------
-
-.. automodule:: evennia.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 evennia.server.admin module
 ---------------------------
 
diff --git a/docs/source/api/evennia.utils.tests.rst b/docs/source/api/evennia.utils.tests.rst
index d404a3f5a9..18e78e4d74 100644
--- a/docs/source/api/evennia.utils.tests.rst
+++ b/docs/source/api/evennia.utils.tests.rst
@@ -16,6 +16,14 @@ Subpackages
 Submodules
 ----------
 
+evennia.utils.tests.test\_ansi module
+-------------------------------------
+
+.. automodule:: evennia.utils.tests.test_ansi
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 evennia.utils.tests.test\_batchprocessors module
 ------------------------------------------------
 
diff --git a/docs/source/api/evennia.web.rst b/docs/source/api/evennia.web.rst
index 4eb290cc75..807da66150 100644
--- a/docs/source/api/evennia.web.rst
+++ b/docs/source/api/evennia.web.rst
@@ -11,6 +11,7 @@ Subpackages
 
 .. toctree::
 
+   evennia.web.api
    evennia.web.utils
    evennia.web.webclient
    evennia.web.website