diff --git a/docs/plugins.rst b/docs/plugins.rst
index 8e24b0af..4ea85138 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -59,8 +59,11 @@ individual repositories. Legacy plugins are located in the `pelican-plugins
 repository`_ and will be gradually phased out in favor of the namespace
 versions.
 
+You can also search packaqges with the `Pelican::Plugins Pypi classifier`_.
+
 .. _pelican-plugins organization: https://github.com/pelican-plugins
 .. _pelican-plugins repository: https://github.com/getpelican/pelican-plugins
+.. _Pelican::Plugins Pypi classifier: https://pypi.org/search/?c=Framework+%3A%3A+Pelican+%3A%3A+Plugins
 
 Please note that while we do our best to review and maintain these plugins,
 they are submitted by the Pelican community and thus may have varying levels of
diff --git a/docs/themes.rst b/docs/themes.rst
index e21a6c79..64ca7c00 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -1,7 +1,26 @@
 .. _theming-pelican:
 
+Themes
+######
+
+Where to find them?
+*******************
+Namespace themes can be found in the `pelican-themes repository`_.
+Please note that while we do our best to review and maintain these themes,
+they are submitted by the Pelican community and thus may have varying levels of
+support and interoperability.
+
+You can also search packaqges with the `Pelican::Themes Pypi classifier`_.
+
+.. _pelican-themes repository: https://github.com/getpelican/pelican-themes
+.. _Pelican::Themes Pypi classifier: https://pypi.org/search/?c=Framework+%3A%3A+Pelican+%3A%3A+Themes
+
+A Pelican contributor also built a web page inventoring many Pelican themes: 
+`<http://www.pelicanthemes.com>`_
+
+
 Creating themes
-###############
+***************
 
 To generate its HTML output, Pelican uses the `Jinja
 <https://palletsprojects.com/p/jinja/>`_ templating engine due to its flexibility and