diff --git a/autofs5/contrib/screenshots/autofs-create-mount-point-2.png b/autofs5/contrib/screenshots/autofs-create-mount-point-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ffe0a48dff86b83a28cfd4de8ae8c8dc73275b7
Binary files /dev/null and b/autofs5/contrib/screenshots/autofs-create-mount-point-2.png differ
diff --git a/autofs5/contrib/screenshots/autofs-create-mount-point.png b/autofs5/contrib/screenshots/autofs-create-mount-point.png
new file mode 100644
index 0000000000000000000000000000000000000000..375872ff25f8314dc196d3e16ecba277ecc9e06f
Binary files /dev/null and b/autofs5/contrib/screenshots/autofs-create-mount-point.png differ
diff --git a/autofs5/contrib/screenshots/autofs-created.png b/autofs5/contrib/screenshots/autofs-created.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fd95e5cee64c631df000c0ea70689041be8ca36
Binary files /dev/null and b/autofs5/contrib/screenshots/autofs-created.png differ
diff --git a/autofs5/contrib/yaml/description.yaml b/autofs5/contrib/yaml/description.yaml
index 88c008d5bb71b80012be345e51535c843909245f..3602e9e371e88c7fc0b819eef23bcfefcf98c61f 100644
--- a/autofs5/contrib/yaml/description.yaml
+++ b/autofs5/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/autofs5/html/themes/breezy/icons/48/apps/autofs.png
   name: autofs5
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/autofs5/contrib/screenshots/autofs-create-mount-point.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/autofs5/contrib/screenshots/autofs-create-mount-point-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/autofs5/contrib/screenshots/autofs-created.png
   status: Stable
   tags:
   - server
diff --git a/freeradius/contrib/screenshots/freeradius-posixgroup-1.png b/freeradius/contrib/screenshots/freeradius-posixgroup-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd2dae67906fb19b3bdcb54115279c7decfa2e48
Binary files /dev/null and b/freeradius/contrib/screenshots/freeradius-posixgroup-1.png differ
diff --git a/freeradius/contrib/screenshots/freeradius-user-1.png b/freeradius/contrib/screenshots/freeradius-user-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3faa7a9adcaee1e1a532c45fa982b5564ad11c2b
Binary files /dev/null and b/freeradius/contrib/screenshots/freeradius-user-1.png differ
diff --git a/freeradius/contrib/screenshots/freeradius-user-2.png b/freeradius/contrib/screenshots/freeradius-user-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb5312976cf284cd82e8c79ad2209c87245201b
Binary files /dev/null and b/freeradius/contrib/screenshots/freeradius-user-2.png differ
diff --git a/freeradius/contrib/screenshots/freeradius-user-3.png b/freeradius/contrib/screenshots/freeradius-user-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2921315c09aef91ce5959e017bdfa4d888b06c2
Binary files /dev/null and b/freeradius/contrib/screenshots/freeradius-user-3.png differ
diff --git a/freeradius/contrib/screenshots/freeradius-user-4.png b/freeradius/contrib/screenshots/freeradius-user-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..936f12f4a5fd50da1b2005dfa8d05afff7a0d9ca
Binary files /dev/null and b/freeradius/contrib/screenshots/freeradius-user-4.png differ
diff --git a/freeradius/contrib/yaml/description.yaml b/freeradius/contrib/yaml/description.yaml
index ae5070223d884585d8fb403f3734c6e11476515e..bdb3b555154a0b45b8f1810361256c44a09634bb 100644
--- a/freeradius/contrib/yaml/description.yaml
+++ b/freeradius/contrib/yaml/description.yaml
@@ -6,7 +6,12 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/html/themes/breezy/icons/48/apps/freeradius.png
   name: freeradius
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/contrib/screenshots/freeradius-user-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/contrib/screenshots/freeradius-user-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/contrib/screenshots/freeradius-user-3.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/contrib/screenshots/freeradius-user-4.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/freeradius/contrib/screenshots/freeradius-posixgroup-1.png
   status: Stable
   tags:
   - user
diff --git a/kerberos/contrib/screenshots/kerberos-user-1.png b/kerberos/contrib/screenshots/kerberos-user-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaf2ddde90309b637f95cbad42ef24f30f3e655d
Binary files /dev/null and b/kerberos/contrib/screenshots/kerberos-user-1.png differ
diff --git a/kerberos/contrib/screenshots/kerberos-user-2.png b/kerberos/contrib/screenshots/kerberos-user-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..d07992f2f4df99ae24d7b4e176347061a8ca9982
Binary files /dev/null and b/kerberos/contrib/screenshots/kerberos-user-2.png differ
diff --git a/kerberos/contrib/yaml/description.yaml b/kerberos/contrib/yaml/description.yaml
index 9d53ec05489a7d699a916106725ecfb13f1bfd66..097ad8f75cf6142ef82a0d16620d92d0b1654fb4 100644
--- a/kerberos/contrib/yaml/description.yaml
+++ b/kerberos/contrib/yaml/description.yaml
@@ -6,7 +6,9 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/kerberos/html/themes/breezy/icons/48/apps/kerberos.png
   name: kerberos
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/kerberos/contrib/screenshots/kerberos-user-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/kerberos/contrib/screenshots/kerberos-user-2.png
   status: Stable
   tags:
   - user
diff --git a/netgroups/contrib/screenshots/netgroups-create.png b/netgroups/contrib/screenshots/netgroups-create.png
new file mode 100644
index 0000000000000000000000000000000000000000..856461be3cc0d29d78dae82e7430b74bf66974ff
Binary files /dev/null and b/netgroups/contrib/screenshots/netgroups-create.png differ
diff --git a/netgroups/contrib/screenshots/netgroups-list.png b/netgroups/contrib/screenshots/netgroups-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eedc5139ff69020f8c2ba663479a3703831724f
Binary files /dev/null and b/netgroups/contrib/screenshots/netgroups-list.png differ
diff --git a/netgroups/contrib/screenshots/netgroups-user-1.png b/netgroups/contrib/screenshots/netgroups-user-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..76b10ea598fa8b4e6181144dea1ff89cfb1cd9f1
Binary files /dev/null and b/netgroups/contrib/screenshots/netgroups-user-1.png differ
diff --git a/netgroups/contrib/yaml/description.yaml b/netgroups/contrib/yaml/description.yaml
index 7aa5b2f6eb7f31df591dbd91e5b6d7423a540fb9..be1e2fbc8cc9484c7701286340639d865d7f5233 100644
--- a/netgroups/contrib/yaml/description.yaml
+++ b/netgroups/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/netgroups/html/themes/breezy/icons/48/apps/netgroups.png
   name: netgroups
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/netgroups/contrib/screenshots/netgroups-list.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/netgroups/contrib/screenshots/netgroups-create.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/netgroups/contrib/screenshots/netgroups-user-1.png
   status: Stable
   tags:
   - group
diff --git a/notifications/contrib/screenshots/notifications-config.png b/notifications/contrib/screenshots/notifications-config.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e015bdbbf0192f6a2d22e9eb7e54d349bf11547
Binary files /dev/null and b/notifications/contrib/screenshots/notifications-config.png differ
diff --git a/notifications/contrib/screenshots/notifications-task-1.png b/notifications/contrib/screenshots/notifications-task-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..430df9286077cc1732e14798d74fe5013e92176c
Binary files /dev/null and b/notifications/contrib/screenshots/notifications-task-1.png differ
diff --git a/notifications/contrib/screenshots/notifications-task-2.png b/notifications/contrib/screenshots/notifications-task-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3851c16085b6639f1a5df1e9d2e093df241b9360
Binary files /dev/null and b/notifications/contrib/screenshots/notifications-task-2.png differ
diff --git a/notifications/contrib/screenshots/notifications-task-3.png b/notifications/contrib/screenshots/notifications-task-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0d2675af53bd112e50f8ee78028d9235fb43932
Binary files /dev/null and b/notifications/contrib/screenshots/notifications-task-3.png differ
diff --git a/notifications/contrib/screenshots/notifications-task-4.png b/notifications/contrib/screenshots/notifications-task-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..90a7ac3b59a6428cc3eb4c3b220f940745288c51
Binary files /dev/null and b/notifications/contrib/screenshots/notifications-task-4.png differ
diff --git a/notifications/contrib/yaml/description.yaml b/notifications/contrib/yaml/description.yaml
index 0ec0f3d1cce6ac6bfa6bf3ef1d9906f0cfbfac27..2249397ef4d2991f9726445358b9a9bf1bfbe919 100644
--- a/notifications/contrib/yaml/description.yaml
+++ b/notifications/contrib/yaml/description.yaml
@@ -6,7 +6,12 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notifications/html/themes/breezy/icons/48/apps/notifications.png
   name: notifications
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notification/contrib/screenshots/notifications-config.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notification/contrib/screenshots/notifications-task-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notification/contrib/screenshots/notifications-task-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notification/contrib/screenshots/notifications-task-3.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/notification/contrib/screenshots/notifications-task-4.png
   status: Stable
   tags:
   - user
diff --git a/opsi/contrib/screenshots/opsi-create-1.png b/opsi/contrib/screenshots/opsi-create-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef3e9c40f4a3521d640b7dc506269d3d49a88b6b
Binary files /dev/null and b/opsi/contrib/screenshots/opsi-create-1.png differ
diff --git a/opsi/contrib/screenshots/opsi-create-2.png b/opsi/contrib/screenshots/opsi-create-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a237043457d53d83ee9274710dff0aca57bd392
Binary files /dev/null and b/opsi/contrib/screenshots/opsi-create-2.png differ
diff --git a/opsi/contrib/screenshots/opsi-list.png b/opsi/contrib/screenshots/opsi-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cc9e17846edee710236b278d66725df17bb1c82
Binary files /dev/null and b/opsi/contrib/screenshots/opsi-list.png differ
diff --git a/opsi/contrib/screenshots/opsi-software-create.png b/opsi/contrib/screenshots/opsi-software-create.png
new file mode 100644
index 0000000000000000000000000000000000000000..274ab8a072130136efa22ee2997c8c9327a86d6d
Binary files /dev/null and b/opsi/contrib/screenshots/opsi-software-create.png differ
diff --git a/opsi/contrib/screenshots/opsi-system-service.png b/opsi/contrib/screenshots/opsi-system-service.png
new file mode 100644
index 0000000000000000000000000000000000000000..7df998a6c9ff9f1bf8219a30aa0be8ca348d7662
Binary files /dev/null and b/opsi/contrib/screenshots/opsi-system-service.png differ
diff --git a/opsi/contrib/yaml/description.yaml b/opsi/contrib/yaml/description.yaml
index 27ada3c123e1a6e72a1dd036e7bae02c184d9117..09782ec4ec9c8dd40f3936b712f01962bfa75d62 100644
--- a/opsi/contrib/yaml/description.yaml
+++ b/opsi/contrib/yaml/description.yaml
@@ -6,7 +6,12 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/html/themes/breezy/icons/48/apps/opsi.png
   name: opsi
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/contrib/screenshots/opsi-list.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/contrib/screenshots/opsi-create-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/contrib/screenshots/opsi-create-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/contrib/screenshots/opsi-software-create.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/opsi/contrib/screenshots/opsi-system-service.png
   status: Stable
   tags:
   - workstation
diff --git a/posix/contrib/screenshots/posix-create.png b/posix/contrib/screenshots/posix-create.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b4a6ff4e9d00ce3e42eb276b7648718f99cc37a
Binary files /dev/null and b/posix/contrib/screenshots/posix-create.png differ
diff --git a/posix/contrib/screenshots/posix-list.png b/posix/contrib/screenshots/posix-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5f19b715beac7323f62a0ef0050a40c039ce147
Binary files /dev/null and b/posix/contrib/screenshots/posix-list.png differ
diff --git a/posix/contrib/screenshots/posix-user-1.png b/posix/contrib/screenshots/posix-user-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..413cb250dab5c3868921c59a38fc0c18d0687801
Binary files /dev/null and b/posix/contrib/screenshots/posix-user-1.png differ
diff --git a/posix/contrib/screenshots/posix-user-2.png b/posix/contrib/screenshots/posix-user-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..720b517f1f7fb218711a7764dfd7c85af3ef5a62
Binary files /dev/null and b/posix/contrib/screenshots/posix-user-2.png differ
diff --git a/posix/contrib/screenshots/posix-user-3.png b/posix/contrib/screenshots/posix-user-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aa27d226b37ef08367467cd59f2c89c522b96ca
Binary files /dev/null and b/posix/contrib/screenshots/posix-user-3.png differ
diff --git a/posix/contrib/screenshots/posix-user-4.png b/posix/contrib/screenshots/posix-user-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c632fd9adac60f7093d91f112be8b2e056c824e3
Binary files /dev/null and b/posix/contrib/screenshots/posix-user-4.png differ
diff --git a/posix/contrib/yaml/description.yaml b/posix/contrib/yaml/description.yaml
index d809a29c15258164dd2f7ee0730438f0e6c75287..d9b79a3d73f03bd60fbd95df8595a487b2a7b67e 100644
--- a/posix/contrib/yaml/description.yaml
+++ b/posix/contrib/yaml/description.yaml
@@ -6,7 +6,13 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/html/themes/breezy/icons/48/apps/os-linux.png
   name: posix
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-list.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-create.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-user-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-user-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-user-3.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/posix/contrib/screenshots/posix-user-4.png
   status: Stable
   tags:
   - user
diff --git a/postfix/contrib/screenshots/postfix-service-1.png b/postfix/contrib/screenshots/postfix-service-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a668eee2f3e53eb7992d7efb55ad6cba03bb74e
Binary files /dev/null and b/postfix/contrib/screenshots/postfix-service-1.png differ
diff --git a/postfix/contrib/screenshots/postfix-service-2.png b/postfix/contrib/screenshots/postfix-service-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8519f8da60041bb0b76adee97331dfda325719c
Binary files /dev/null and b/postfix/contrib/screenshots/postfix-service-2.png differ
diff --git a/postfix/contrib/screenshots/postfix-service-3.png b/postfix/contrib/screenshots/postfix-service-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5e2c9afea9f26204d65c083fe94491b0a346bca
Binary files /dev/null and b/postfix/contrib/screenshots/postfix-service-3.png differ
diff --git a/postfix/contrib/yaml/description.yaml b/postfix/contrib/yaml/description.yaml
index 144d9cfb77bf69ed59c1fe51bf4f298adc1fdcc9..8b5e8b85f89ae1229ee396a278a6c20fa5914fac 100644
--- a/postfix/contrib/yaml/description.yaml
+++ b/postfix/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/postfix/html/themes/breezy/icons/48/apps/smtp.png
   name: postfix
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/postfix/contrib/screenshots/postfix-service-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/postfix/contrib/screenshots/postfix-service-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/postfix/contrib/screenshots/postfix-service-3.png
   status: Stable
   tags:
   - server
diff --git a/ppolicy/contrib/screenshots/ppolicy-create.png b/ppolicy/contrib/screenshots/ppolicy-create.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9ad303cd6b1a3ec531a61b62cb39a13fa9181d4
Binary files /dev/null and b/ppolicy/contrib/screenshots/ppolicy-create.png differ
diff --git a/ppolicy/contrib/screenshots/ppolicy-list.png b/ppolicy/contrib/screenshots/ppolicy-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..56118ea2d8fb90c50482827a24a9599c994968f2
Binary files /dev/null and b/ppolicy/contrib/screenshots/ppolicy-list.png differ
diff --git a/ppolicy/contrib/screenshots/ppolicy-user-assign.png b/ppolicy/contrib/screenshots/ppolicy-user-assign.png
new file mode 100644
index 0000000000000000000000000000000000000000..1570d011c20f5e74ea6f8c7f95dc7d0e69d02109
Binary files /dev/null and b/ppolicy/contrib/screenshots/ppolicy-user-assign.png differ
diff --git a/ppolicy/contrib/yaml/description.yaml b/ppolicy/contrib/yaml/description.yaml
index 28e8365d28db32524d3db023014b8005bbcf13f3..a7c1ed7757e0e85c569f043b1e2d835cfdc6cde7 100644
--- a/ppolicy/contrib/yaml/description.yaml
+++ b/ppolicy/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/ppolicy/html/themes/breezy/icons/48/apps/ppolicy.png
   name: ppolicy
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/ppolicy/contrib/screenshots/ppolicy-list.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/ppolicy/contrib/screenshots/ppolicy-create.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/ppolicy/contrib/screenshots/ppolicy-user-assign.png
   status: Stable
   tags:
   - user
diff --git a/quota/contrib/screenshots/quota-service-1.png b/quota/contrib/screenshots/quota-service-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02a7cfb921853104e67bc70f6b42c677eb7abf6
Binary files /dev/null and b/quota/contrib/screenshots/quota-service-1.png differ
diff --git a/quota/contrib/screenshots/quota-service-2.png b/quota/contrib/screenshots/quota-service-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f17a4f8ba2d3414e87edb3199f636d53b836eab6
Binary files /dev/null and b/quota/contrib/screenshots/quota-service-2.png differ
diff --git a/quota/contrib/screenshots/quota-service-3.png b/quota/contrib/screenshots/quota-service-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a54cf8568b45824251dff503c7477216eb6fe13a
Binary files /dev/null and b/quota/contrib/screenshots/quota-service-3.png differ
diff --git a/quota/contrib/yaml/description.yaml b/quota/contrib/yaml/description.yaml
index 74637b097500897a70eb7dc8390cfc99f5752849..c9e22ead3827b06730daa11572c787e4f9fa6734 100644
--- a/quota/contrib/yaml/description.yaml
+++ b/quota/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/quota/html/themes/breezy/icons/48/apps/quota.png
   name: quota
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/quota/contrib/screenshots/quota-service-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/quota/contrib/screenshots/quota-service-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/quota/contrib/screenshots/quota-service-3.png
   status: Stable
   tags:
   - user
diff --git a/repository/contrib/screenshots/repository-service.png b/repository/contrib/screenshots/repository-service.png
new file mode 100644
index 0000000000000000000000000000000000000000..890eb3f9a2288fed071783aec4ec2a424dfac277
Binary files /dev/null and b/repository/contrib/screenshots/repository-service.png differ
diff --git a/repository/contrib/yaml/description.yaml b/repository/contrib/yaml/description.yaml
index 6c433e4b3ef60b7e1225ede4ca9026e7977f944a..2899f06d8f24d4afd3265b19cebd836a0ee2d244 100644
--- a/repository/contrib/yaml/description.yaml
+++ b/repository/contrib/yaml/description.yaml
@@ -6,7 +6,8 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/repository/html/themes/breezy/icons/48/apps/repository.png
   name: repository
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/repository/contrib/screenshots/repository-service.png
   status: Stable
   tags:
   - server
diff --git a/samba/contrib/screenshots/samba-group-create-1.png b/samba/contrib/screenshots/samba-group-create-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..28344345bb0092e233032743f3b3fabdf108c58a
Binary files /dev/null and b/samba/contrib/screenshots/samba-group-create-1.png differ
diff --git a/samba/contrib/screenshots/samba-service-1.png b/samba/contrib/screenshots/samba-service-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ddc420ea95f1e5049c6096e9a575123eed9b83d
Binary files /dev/null and b/samba/contrib/screenshots/samba-service-1.png differ
diff --git a/samba/contrib/screenshots/samba-user-create-1.png b/samba/contrib/screenshots/samba-user-create-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b06aa87297143b51ffd11f0ba5ba4a8e408eefba
Binary files /dev/null and b/samba/contrib/screenshots/samba-user-create-1.png differ
diff --git a/samba/contrib/screenshots/samba-user-create-2.png b/samba/contrib/screenshots/samba-user-create-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fde895c197d53aeb125d7bd49637b87c1a08939
Binary files /dev/null and b/samba/contrib/screenshots/samba-user-create-2.png differ
diff --git a/samba/contrib/screenshots/samba-user-create-3.png b/samba/contrib/screenshots/samba-user-create-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cce16d4797e532be335c29b6319b94fe9b0186e3
Binary files /dev/null and b/samba/contrib/screenshots/samba-user-create-3.png differ
diff --git a/samba/contrib/screenshots/samba-user-create-4.png b/samba/contrib/screenshots/samba-user-create-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9ac6ac60d46649c0329e026d6610ae8f8d7bb41
Binary files /dev/null and b/samba/contrib/screenshots/samba-user-create-4.png differ
diff --git a/samba/contrib/yaml/description.yaml b/samba/contrib/yaml/description.yaml
index b5fa8dff7a30cbf502a41dade4420dc03cf966b8..04f151cfba08ec3291e1ac251790914fef64be24 100644
--- a/samba/contrib/yaml/description.yaml
+++ b/samba/contrib/yaml/description.yaml
@@ -6,7 +6,13 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/html/themes/breezy/icons/48/apps/samba.png
   name: samba
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-service-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-user-create-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-user-create-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-user-create-3.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-user-create-4.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/samba/contrib/screenshots/samba-group-create-1.png
   status: Stable
   tags:
   - server
diff --git a/schac/contrib/screenshots/schac-user.png b/schac/contrib/screenshots/schac-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..37b2e82a3e582f84790a6c97ebc09a1d68f8073f
Binary files /dev/null and b/schac/contrib/screenshots/schac-user.png differ
diff --git a/schac/contrib/yaml/description.yaml b/schac/contrib/yaml/description.yaml
index 051c58d0956847bd0296628e83457db025afba88..50558afe444d695b5b1c1f500e030a93c335749c 100644
--- a/schac/contrib/yaml/description.yaml
+++ b/schac/contrib/yaml/description.yaml
@@ -6,7 +6,8 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/schac/html/themes/breezy/icons/48/apps/schac.png
   name: schac
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/schac/contrib/screenshots/schac-user.png
   status: Stable
   tags:
   - user
diff --git a/spamassassin/contrib/screenshots/spamassassin-service-1.png b/spamassassin/contrib/screenshots/spamassassin-service-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5dba749a22572b017a4e28a39d4e3d5a2fdcc9
Binary files /dev/null and b/spamassassin/contrib/screenshots/spamassassin-service-1.png differ
diff --git a/spamassassin/contrib/screenshots/spamassassin-service-2.png b/spamassassin/contrib/screenshots/spamassassin-service-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f07719ab29ad2840912b637d10a53805d0e60f5
Binary files /dev/null and b/spamassassin/contrib/screenshots/spamassassin-service-2.png differ
diff --git a/spamassassin/contrib/screenshots/spamassassin-service-3.png b/spamassassin/contrib/screenshots/spamassassin-service-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f82b6bdc5b75cd9baabfd0465c503b82d2534e5
Binary files /dev/null and b/spamassassin/contrib/screenshots/spamassassin-service-3.png differ
diff --git a/spamassassin/contrib/screenshots/spamassassin-user.png b/spamassassin/contrib/screenshots/spamassassin-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2e876f4621d9dac67f425f7149f3b09e6634cab
Binary files /dev/null and b/spamassassin/contrib/screenshots/spamassassin-user.png differ
diff --git a/spamassassin/contrib/yaml/description.yaml b/spamassassin/contrib/yaml/description.yaml
index ebd4e10c381dc50955d283a9389372a40d579f96..2e8bdabe9b41db9a51c05ff99a39397dfecf5f11 100644
--- a/spamassassin/contrib/yaml/description.yaml
+++ b/spamassassin/contrib/yaml/description.yaml
@@ -6,7 +6,11 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/spamassassin/html/themes/breezy/icons/48/apps/spamassassin.png
   name: spamassassin
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/spamassassin/contrib/screenshots/spamassassin-service-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/spamassassin/contrib/screenshots/spamassassin-service-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/spamassassin/contrib/screenshots/spamassassin-service-3.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/spamassassin/contrib/screenshots/spamassassin-user.png
   status: Stable
   tags:
   - user
diff --git a/supann-ext/contrib/screenshots/supannext-config-1.png b/supann-ext/contrib/screenshots/supannext-config-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..435d0a273e2a92399cb4613272ea240025996992
Binary files /dev/null and b/supann-ext/contrib/screenshots/supannext-config-1.png differ
diff --git a/supann-ext/contrib/screenshots/supannext-config-2.png b/supann-ext/contrib/screenshots/supannext-config-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a3a0425576f51fe8fdec67d917a6e239aef4665
Binary files /dev/null and b/supann-ext/contrib/screenshots/supannext-config-2.png differ
diff --git a/supann-ext/contrib/screenshots/supannext-user-1.png b/supann-ext/contrib/screenshots/supannext-user-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d04225b16dd3fa6b3495fb71813b322ffdac15f
Binary files /dev/null and b/supann-ext/contrib/screenshots/supannext-user-1.png differ
diff --git a/supann-ext/contrib/screenshots/supannext-user-2.png b/supann-ext/contrib/screenshots/supannext-user-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5db3a713e9a78a18780159154ae8df7765322903
Binary files /dev/null and b/supann-ext/contrib/screenshots/supannext-user-2.png differ
diff --git a/supann-ext/contrib/yaml/description.yaml b/supann-ext/contrib/yaml/description.yaml
index 23bda74d7561879c2dc520f0cccce47bbee00890..947850404f320b2fd4289a8fe62ae3ffa3948c5c 100644
--- a/supann-ext/contrib/yaml/description.yaml
+++ b/supann-ext/contrib/yaml/description.yaml
@@ -6,7 +6,11 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/supann-ext/html/themes/breezy/icons/48/apps/supann-ext.png
   name: supann-ext
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/supann-ext/contrib/screenshots/supannext-config-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/supann-ext/contrib/screenshots/supannext-config-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/supann-ext/contrib/screenshots/supannext-user-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/supann-ext/contrib/screenshots/supannext-user-2.png
   status: Stable
   tags:
   - user
diff --git a/webauthn/contrib/screenshots/webauthn-config-1.png b/webauthn/contrib/screenshots/webauthn-config-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..84ab6b2204bbb56d4a6e14904e8b37f109cc649f
Binary files /dev/null and b/webauthn/contrib/screenshots/webauthn-config-1.png differ
diff --git a/webauthn/contrib/screenshots/webauthn-config-2.png b/webauthn/contrib/screenshots/webauthn-config-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f106a98a86c3231cb3426a993f44452c6499203
Binary files /dev/null and b/webauthn/contrib/screenshots/webauthn-config-2.png differ
diff --git a/webauthn/contrib/screenshots/webauthn-user.png b/webauthn/contrib/screenshots/webauthn-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2057dedd13fe556d47096573e2abab7c00f461d
Binary files /dev/null and b/webauthn/contrib/screenshots/webauthn-user.png differ
diff --git a/webauthn/contrib/yaml/description.yaml b/webauthn/contrib/yaml/description.yaml
index 81c7399305714d81f47f04be0ca359a98da68592..edffefee2d5551f55dd5b33bf734fb6a6f8b7d47 100644
--- a/webauthn/contrib/yaml/description.yaml
+++ b/webauthn/contrib/yaml/description.yaml
@@ -6,7 +6,10 @@ information:
   logoUrl: https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/webauthn/html/themes/breezy/icons/48/apps/webauthn.png
   name: webauthn
   origin: package
-  screenshotUrl: []
+  screenshotUrl:
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/webauthn/contrib/screenshots/webauthn-config-1.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/webauthn/contrib/screenshots/webauthn-config-2.png
+  - https://raw.githubusercontent.com/fusiondirectory/fusiondirectory-plugins/dev/webauthn/contrib/screenshots/webauthn-user.png
   status: Stable
   tags:
   - user