diff --git a/README.md b/README.md
index 930072229..541deac73 100644
--- a/README.md
+++ b/README.md
@@ -40,16 +40,16 @@ Bulwark Webmail is a self-hosted webmail client for [Stalwart Mail Server](https
 
 <p align="center">
   <a href="https://bulwarkmail.org/docs/features/calendar"><picture><source media="(prefers-color-scheme: dark)" srcset="screenshots/dark-calendar-week.webp" /><img src="screenshots/light-calendar-week.webp" alt="Calendar week view with events from several calendars" width="49%" /></picture></a>
-  <a href="https://bulwarkmail.org/docs/features/contacts"><picture><source media="(prefers-color-scheme: dark)" srcset="screenshots/dark-contact.webp" /><img src="screenshots/light-contact.webp" alt="Contact details with recent mail and upcoming events" width="49%" /></picture></a>
+  <a href="https://bulwarkmail.org/docs/features/contacts"><picture><source media="(prefers-color-scheme: dark)" srcset="screenshots/dark-contacts-detail.webp" /><img src="screenshots/light-contacts-detail.webp" alt="Contact details with recent mail and upcoming events" width="49%" /></picture></a>
   <br />
   <sub>Calendar week view&nbsp;&nbsp;·&nbsp;&nbsp;Contact details with recent mail and upcoming events</sub>
 </p>
 
 <p align="center">
-  <a href="https://bulwarkmail.org/docs/features/email/composing"><picture><source media="(prefers-color-scheme: dark)" srcset="screenshots/dark-composer.webp" /><img src="screenshots/light-composer.webp" alt="Rich-text composer next to the message list" width="49%" /></picture></a>
+  <a href="https://bulwarkmail.org/docs/features/email/composing"><picture><source media="(prefers-color-scheme: dark)" srcset="screenshots/dark-composer-mention.webp" /><img src="screenshots/light-composer-mention.webp" alt="The composer with an @mention chip and the contact card it opens" width="49%" /></picture></a>
   <a href="https://bulwarkmail.org/docs/guides/customization"><img src="screenshots/split-inbox.webp" alt="The inbox split diagonally between the light and dark theme" width="49%" /></a>
   <br />
-  <sub>Composer with identities and formatting&nbsp;&nbsp;·&nbsp;&nbsp;Light and dark themes</sub>
+  <sub>Composer with @mention cards&nbsp;&nbsp;·&nbsp;&nbsp;Light and dark themes</sub>
 </p>
 
 ## Features
diff --git a/public/screenshot-1280x720.png b/public/screenshot-1280x720.png
index 424a520d4..db1dac24e 100644
Binary files a/public/screenshot-1280x720.png and b/public/screenshot-1280x720.png differ
diff --git a/public/screenshot-540x720.png b/public/screenshot-540x720.png
index 35ebaa39b..fad39afc0 100644
Binary files a/public/screenshot-540x720.png and b/public/screenshot-540x720.png differ
diff --git a/screenshots/dark-calendar-week.webp b/screenshots/dark-calendar-week.webp
index 65fe59e5f..d83c7df50 100644
Binary files a/screenshots/dark-calendar-week.webp and b/screenshots/dark-calendar-week.webp differ
diff --git a/screenshots/dark-composer-mention.webp b/screenshots/dark-composer-mention.webp
new file mode 100644
index 000000000..e76ece0e8
Binary files /dev/null and b/screenshots/dark-composer-mention.webp differ
diff --git a/screenshots/dark-composer.webp b/screenshots/dark-composer.webp
deleted file mode 100644
index 54cf1101b..000000000
Binary files a/screenshots/dark-composer.webp and /dev/null differ
diff --git a/screenshots/dark-contact.webp b/screenshots/dark-contact.webp
deleted file mode 100644
index 6a37d2ffe..000000000
Binary files a/screenshots/dark-contact.webp and /dev/null differ
diff --git a/screenshots/dark-contacts-detail.webp b/screenshots/dark-contacts-detail.webp
new file mode 100644
index 000000000..019b2f2f9
Binary files /dev/null and b/screenshots/dark-contacts-detail.webp differ
diff --git a/screenshots/dark-laptop-phone.webp b/screenshots/dark-laptop-phone.webp
index ea11b134d..bca015934 100644
Binary files a/screenshots/dark-laptop-phone.webp and b/screenshots/dark-laptop-phone.webp differ
diff --git a/screenshots/light-calendar-week.webp b/screenshots/light-calendar-week.webp
index 84eaec349..6ab11b94c 100644
Binary files a/screenshots/light-calendar-week.webp and b/screenshots/light-calendar-week.webp differ
diff --git a/screenshots/light-composer-mention.webp b/screenshots/light-composer-mention.webp
new file mode 100644
index 000000000..3548d2907
Binary files /dev/null and b/screenshots/light-composer-mention.webp differ
diff --git a/screenshots/light-composer.webp b/screenshots/light-composer.webp
deleted file mode 100644
index 59101bd8f..000000000
Binary files a/screenshots/light-composer.webp and /dev/null differ
diff --git a/screenshots/light-contact.webp b/screenshots/light-contact.webp
deleted file mode 100644
index 01589c4e9..000000000
Binary files a/screenshots/light-contact.webp and /dev/null differ
diff --git a/screenshots/light-contacts-detail.webp b/screenshots/light-contacts-detail.webp
new file mode 100644
index 000000000..2aca0fd47
Binary files /dev/null and b/screenshots/light-contacts-detail.webp differ
diff --git a/screenshots/light-laptop-phone.webp b/screenshots/light-laptop-phone.webp
index 221ff0ab5..d090ef031 100644
Binary files a/screenshots/light-laptop-phone.webp and b/screenshots/light-laptop-phone.webp differ
diff --git a/screenshots/split-inbox.webp b/screenshots/split-inbox.webp
index be80f59b4..4df93aac1 100644
Binary files a/screenshots/split-inbox.webp and b/screenshots/split-inbox.webp differ