Update all Mastodon product screenshots to 4.3 (#1520)

update all using mastodon screenshots

content/en/user/contacts.md

@@ -9,13 +9,13 @@ menu:
 
 ## Generating invites {#invites}
 
-{{< figure src="assets/invites.jpg" caption="Invite people from your account&apos;s settings" >}}
+{{< figure src="assets/invites.png" width="70%" caption="Invite people to join your server" >}}
 
 Invite links can be generated and shared with other people, and some servers require invites in order to register for an account. When generating an invite link, you can set the max uses to limit how many times a certain link is used, or how long it has been active. Invite links can be deactivated at any time.
 
 ## Follows and followers {#relationships}
 
-{{< figure src="assets/relationships.jpg" caption="Mutuals who have not moved their account, sorted by last activity" >}}
+{{< figure src="assets/relationships.png" width="70%" caption="Mutuals who have not moved their account, sorted by most recent" >}}
 
 Within settings, you can find a relationship manager that lets you filter and sort through the profiles that you are connected to, based on different criteria:
 

content/en/user/discoverability.md

@@ -11,25 +11,19 @@ menu:
 
 ### Featured hashtags {#featured-tags}
 
-{{< figure src="assets/featured-tags.jpg" caption="A featured hashtag showing last usage date and total usage." >}}
+{{< figure src="assets/featured-tags.png" width="50%" caption="A list of featured hashtags showing last usage date and total usage" >}}
 
-You can choose to feature certain hashtags that you use often. Go to Settings &gt; Profile &gt; Featured hashtags to manage which hashtags you are currently featuring. Once featured, a link to the hashtag will be shown on your profile, with the date of the last time it was used in a status, as well as the total number of statuses in which it was used.
-
-### Featured profiles {#featured-profiles}
-
-{{< figure src="assets/featured-profiles.jpg" caption="Four randomly-selected featured profiles." >}}
-
-You can choose to feature profiles of people that you are following. Go to that person's profile dropdown menu and click "Feature on profile". When you feature a profile, a link to their profile will appear on your profile, under a section titled "your choices". Up to 4 profiles will be shown at a time, and these profiles are selected randomly from your pool of featured profiles every time the page is loaded.
+You can choose to feature certain hashtags that you use often. Go to **Preferences** &gt; **Edit profile** &gt; **Featured hashtags** to manage which hashtags you are currently featuring. Once featured, a link to the hashtag will be shown on your profile, with the date of the last time it was used in a status, as well as the total number of statuses in which it was used.
 
 ## Pinned posts {#pinned}
 
-{{< figure src="assets/pinned.jpg" caption="A pinned post by mastodon.social/@gargron" >}}
+{{< figure src="assets/pinned.png" width="70%" caption="An example of a user's pinned post" >}}
 
 You can choose to feature up to 5 of your own public posts at the top of your profile. Go to the status dropdown menu and click "Pin on profile". When you pin a post, it will appear at the top of your "posts" tab, before all other chronological status updates.
 
 ## Profile directory {#directory}
 
-{{< figure src="assets/directory.jpg" caption="Profile directory as seen from mastodon.social" >}}
+{{< figure src="assets/directory.png" width="70%" caption="List of users in the profile directory" >}}
 
 The profile directory shows all accounts that have opted into being shown in the directory, and can be used to quickly find profiles that you may be interested in following.
 

content/en/user/external.md

@@ -9,11 +9,9 @@ menu:
 
 ## Remote interactions on another Mastodon site {#interact}
 
-{{< figure src="assets/status-permalink.jpg" caption="An example of a post&apos;s public permalink on a Mastodon site." >}}
-
 When you are browsing a remote site powered by Mastodon, clicking on any of the interaction buttons will load a dialog that will redirect you to your local site.
 
-{{< figure src="assets/external-reply.jpg" caption="A remote interaction dialog for replying to a toot." >}}
+{{< figure src="assets/external-reply.gif" caption="A remote interaction dialog for replying to a post" >}}
 
 ## Signing into a client app {#apps}
 

content/en/user/moderating.md

@@ -11,13 +11,11 @@ menu:
 
 It is possible to filter statuses for specific keywords and phrases so that they can be hidden automatically.
 
-{{< figure src="assets/filter-list.jpg" caption="A sample of active filters for various keywords in different contexts." >}}
+{{< figure src="assets/filter-list.png" width="70%" caption="A sample of active filters for various keywords in different contexts" >}}
 
-To create or manage your filters, go to Settings &gt; Filters. The "Add new filter" button will let you create a new filter, and existing filters can be edited or deleted. Your existing filters will be summarized in a table.
+To create or manage your filters, go to **Preferences** &gt; **Filters**. The "Add new filter" button will let you create a new filter, and existing filters can be edited or deleted. Your existing filters will be summarized in a table.
 
-{{< figure src="assets/filter-edit.jpg" caption="Filters can have an expiry date, specific contexts, server-side drop, and use word boundaries." >}}
-
-Filters have the following settings:
+{{< figure src="assets/filter-edit.png" width="70%" caption="Filters can have an expiry date, specific contexts, server-side visibility options, and use word boundaries" >}}
 
 ### Keyword or phrase {#filter-phrase}
 
@@ -46,7 +44,7 @@ Filters normally apply to any status that contains the included characters, rega
 
 ## User-level actions {#blocking-and-muting}
 
-{{< figure src="assets/profile-dropdown.jpg" caption="The profile dropdown menu offers various actions." >}}
+{{< figure src="assets/profile-dropdown.png" width="70%" caption="The profile dropdown menu offers various actions" >}}
 
 ### Hiding boosts {#hide-boosts}
 
@@ -54,8 +52,6 @@ If you hide boosts from someone, you won’t see their boosts in your home feed.
 
 ### Muting {#mute}
 
-{{< figure src="assets/muted.jpg" caption="Sample of muted accounts." >}}
-
 When muting, you have the option to mute notifications from them or not. Muting without muting notifications hides the user from your view:
 
 * You won’t see the user in your home feed
@@ -71,8 +67,6 @@ The user has no way of knowing they have been muted.
 
 ### Blocking {#block}
 
-{{< figure src="assets/blocked.jpg" caption="Sample of blocked accounts." >}}
-
 Blocking hides a user from your view:
 
 * You won’t see the user in your home feed
@@ -92,7 +86,7 @@ If you and the blocked user are on the same server, the blocked user will not be
 
 ### Hiding an entire server {#block-domain}
 
-{{< figure src="assets/block-domain.png" caption="Sample of blocking an entire domain." >}}
+{{< figure src="assets/block-domain.png" width="70%" caption="Sample of blocking an entire domain" >}}
 
 If you block an entire server:
 
@@ -103,6 +97,6 @@ If you block an entire server:
 
 ## Reporting problematic content to moderators {#report}
 
-{{< figure src="assets/report-modal.jpg" caption="The report modal allows selecting example statuses, adding a note, and forwarding reports." >}}
+{{< figure src="assets/report-modal.png" width="70%" caption="The report modal allows selecting example statuses, adding a note, and forwarding reports" >}}
 
 If you see a status or user that is violating the rules of your website, you can report that user to your site's moderators. Clicking the "report" option on the user dropdown or status dropdown will open the report modal. Here, you can (and should) add a note about why you are reporting this account. You can attach certain problematic statuses for additional context on why you are reporting the account, and if their conduct is violating the rules of the remote website, you can also choose to forward the report to their site's moderators.

content/en/user/moving.md

@@ -9,7 +9,7 @@ menu:
 
 ## Exporting your information {#export}
 
-{{< figure src="assets/export.jpg" caption="The data export page in settings" >}}
+{{< figure src="assets/export.png" width="70%" caption="The data export page in settings" >}}
 
 At any time you want, you can go to Settings &gt; Export and download a CSV file for your current followed accounts, your currently created lists, your currently blocked accounts, your currently muted accounts, and your currently blocked domains. Your following, blocking, muting, and domain-blocking lists can be imported at Settings &gt; Import, where they can either be merged or overwritten.
 
@@ -21,24 +21,20 @@ From the bottom of Settings &gt; Account, you can find options related to accoun
 
 ### Profile redirect {#redirect}
 
-{{< figure src="assets/account-redirect.jpg" caption="Profile redirect form" >}}
-
 Redirecting your account disables posting from that account and displays a "profile moved" notice indicating your new account. Anyone viewing your profile can see this notice and will know to follow you at your new account. Following redirected accounts is not possible. The redirect can be canceled at any time.
 
 ### Profile move {#move}
 
-{{< figure src="assets/account-move.jpg" caption="Profile move form" >}}
+{{< figure src="assets/account-move.png" width="70%" caption="Profile move form" >}}
 
 Moving your account is the same as redirecting your account, but it will also irreversibly force everyone to unfollow your current account and follow your new account, if their software supports the Move activity. Your posts will not be moved, due to technical limitations. There is also a 30 day cooldown period in which you cannot migrate again, so be very careful before using this option!
 
 ### Account aliases {#aliases}
 
-{{< figure src="assets/account-aliases.jpg" caption="Alias management screen" >}}
-
 Profile moves can only be initiated when your two accounts have been aliased. Account aliases are currently not used for anything other than profile moves, where you will need to set your old account as an alias of your new account before initiating the move. Setting aliases is harmless and reversible on its own.
 
 ## Deleting your account {#delete}
 
-{{< figure src="assets/account-delete.jpg" caption="Account deletion form" >}}
+{{< figure src="assets/account-delete.png" width="70%" caption="Account deletion form" >}}
 
 From the bottom of Settings &gt; Account, you can find the form to delete your account. Deleting your account is irreversible, and will cause both your profile and username to become forever unusable.

content/en/user/network.md

@@ -7,17 +7,17 @@ menu:
     parent: user
 ---
 
-## Browsing content through public timelines {#timelines}
+## Browsing Content in Live Feeds {#timelines}
 
-{{< figure src="assets/timeline.jpg" caption="Posts within a public timeline" >}}
+{{< figure src="assets/timeline.png" width="70%" caption="Posts from other servers being streamed into the Live Feed" >}}
 
-To allow you to discover potentially interesting content, Mastodon provides a way to browse all public posts. Well, there is no global shared state between all servers, so there is no way to browse _all_ public posts. When you browse the **federated timeline**, you see all public posts that the server you are on knows about. There are various ways your server may discover posts, but the bulk of them will be from people that other users on your server follow.
+To allow you to discover potentially interesting content, Mastodon provides a way to browse all public posts. Well, there is no global shared state between all servers, so there is no way to browse _all_ public posts. When you browse **Live Feeds** > **Other Servers**, you see all public posts that the server you are on knows about. There are various ways your server may discover posts, but the bulk of them will be from people that other users on your server follow.
 
-There is a way to filter the federated timeline to view only public posts created on your server: The **local timeline**. Mind that “local” here refers to the server, not to a geographical location.
+You can also filter the Live Feeds to view only public posts created on your server.
 
-## Interacting with people's posts {#actions}
+## Interacting with Posts {#actions}
 
-{{< figure src="assets/status.jpg" caption="An expanded view can be loaded by clicking a status in the timeline." >}}
+{{< figure src="assets/status.png" width="70%" caption="An expanded view can be loaded by clicking a status in the timeline" >}}
 
 You can perform quick actions on a post directly from the timeline, or you can click on the post to load an expanded view that shows extra information, such as a full timestamp, interaction counts, and threaded replies, if any. The following actions can be performed on a post:
 
@@ -29,7 +29,7 @@ You can perform quick actions on a post directly from the timeline, or you can c
 
 ## Notifications {#notifications}
 
-{{< figure src="assets/notifications.jpg" caption="Notifications column" >}}
+{{< figure src="assets/notifications.png" width="70%" caption="Notifications column with grouping feature enabled" >}}
 
 When other people interact with you or your posts, you will receive a notification depending on the type of the event. Your notifications column allows you to view all notifications in the same stream, or to filter for specific types of notifications:
 
@@ -42,9 +42,9 @@ When other people interact with you or your posts, you will receive a notificati
 
 When unread notifications are present, a checkmark will appear in the column header. Clicking this checkmark will mark notifications as read.
 
-## Following profiles {#follow}
+## Following Profiles {#follow}
 
-{{< figure src="assets/profile.jpg" caption="Overview of a profile." >}}
+{{< figure src="assets/profile.png" width="70%" caption="Profile card with the Follow button shown" >}}
 
 As long as you encounter a person within your app’s user interface, e.g. the web interface on your home server, or your mobile app, you can just click “follow” and you won’t notice a difference if that person is on your server or not.
 
@@ -52,23 +52,23 @@ However if you come across someone’s public profile hosted on a different serv
 
 If you are visiting a public page on another Mastodon site, see [Using Mastodon outside of your site](../external/#interact).
 
-## Enabling notifications {#bell}
+## Enabling Notifications {#bell}
 
-{{< figure src="assets/bell.jpg" caption="An example of a profile that you are following." >}}
+{{< figure src="assets/bell.png" width="70%" caption="An example of a profile that you are following" >}}
 
 If you are following someone, you also have the option to receive a notification every time they post. To opt into this functionality, click the bell icon.
 
 ## Search {#search}
 
-{{< figure src="assets/search.jpg" caption="The search function can be accessed from the sidebar." >}}
+{{< figure src="assets/search.png" width="50%" caption="The search function with modifier options exposed" >}}
 
 Mastodon's basic search allows logged-in users to find posts containing a specific hashtag, or to load a user or status directly if they know the URL or address. Searching for a term will show profiles whose username or display name contains that term, as well as hashtags that match or contain that term.
 
-{{< figure src="assets/direct-url.jpg" caption="An example of a post being loaded directly by its URL." >}}
+{{< figure src="assets/direct-url.png" width="70%" caption="An example of a post being loaded directly by its URL" >}}
 
-{{< figure src="assets/search-accounts.jpg" caption="An example of accounts returned when searching for &quot;cats&quot;." >}}
+{{< figure src="assets/search-accounts.png" width="70%" caption="An example of results when searching for &quot;arstechnica&quot; including an account validated by the domain" >}}
 
-{{< figure src="assets/search-hashtags.jpg" caption="An example of hashtags returned when searching for &quot;cats&quot;." >}}
+{{< figure src="assets/search-hashtags.png" width="70%" caption="An example of hashtags returned when searching for &quot;friday&quot;" >}}
 
 Admins may optionally install full-text search. Mastodon’s full-text search allows logged-in users to find results from their own posts, their favourites, their bookmarks and their mentions. It deliberately does not allow searching for arbitrary strings in the entire database, in order to reduce the risk of abuse by people searching for controversial terms to find people to dogpile.
 
@@ -78,21 +78,16 @@ The following operators are supported:
 * **-exclude** will exclude the term prepended by a minus sign. This allows filtering out certain terms, such as `animals -cats` to find posts about animals without posts about cats.
 * **+include** will include the term after the plus sign. This allows searching for multiple terms that must be included, such as `cat +dog` to find posts about both cats and dogs.
 
-## Direct conversations {#direct}
+## Private Mentions {#private}
 
-{{< figure src="assets/dm-column.jpg" caption="A list of conversations containing direct messages." >}}
+{{< figure src="assets/dm-column.png" width="70%" caption="A list of conversations containing private mentions" >}}
 
-In Mastodon, direct messages are just posts that have the "direct" visibility selected. Visibility can be selected per-post, which allows changing the privacy level later in a thread. The direct messages column currently shows a list of all conversations containing a direct post. Clicking on a conversation will load the associated thread.
+In Mastodon, private mentions are just posts that have the "mention only" visibility selected. Visibility can be selected per-post, which allows changing the privacy level later in a thread. The private mentions column currently shows a list of all conversations containing a mention only post. Clicking on a conversation will load the associated thread.
 
-{{< figure src="assets/dm-thread.jpg" caption="A direct message in a thread." >}}
-
-## List timelines {#lists}
+## List Timelines {#lists}
 
 Lists are subsets of your home timeline. You can create a list, give it a name, and add users that you follow to that list.
 
-{{< figure src="assets/lists.jpg" caption="A list of lists" >}}
+{{< figure src="assets/lists.png" width="70%" caption="A list of lists" >}}
 
-
-Opening a list will load that list's timeline. List timelines contain only posts by members of that list, as well as replies to you or to other members of the list. This can be changed to show replies to all people you follow, or to no one.
-
-{{< figure src="assets/list.jpg" caption="A list timeline" >}}
+Opening a list will load that list's timeline. List timelines contain only posts by members of that list, as well as replies to you or to other members of the list. This can be changed to show replies to all people you follow, or to no one.

content/en/user/posting.md

@@ -7,7 +7,7 @@ menu:
     parent: user
 ---
 
-{{< figure src="assets/compose-with-cw.jpg" caption="Compose form with CW enabled" >}}
+{{< figure src="assets/compose-with-cw.png" width="50%" caption="Compose form with optional Content Warning enabled" >}}
 
 ## Text {#text}
 
@@ -15,27 +15,27 @@ The main body of each status update can be composed using the text field. The de
 
 ### Links {#links}
 
-{{< figure src="assets/compose-links.jpg" caption="Links must start with http(s):// and are counted as 23 characters regardless of length." >}}
+{{< figure src="assets/compose-links.png" width="50%" caption="Links must start with http(s):// and are counted as 23 characters regardless of length" >}}
 
 If you include links in your post, they must begin with `http://` or `https://`. All links are counted as 23 characters, no matter how long they actually are, so there is no need to use a link shortener to save characters. In fact, using a link shortener is actively discouraged.
 
 ### Mentions {#mentions}
 
-{{< figure src="assets/compose-mentions.jpg" caption="Suggested mentions for both local and remote users." >}}
+{{< figure src="assets/compose-mentions.png" width="50%" caption="Suggested mentions for both local and remote users" >}}
 
 You can mention users by typing out their full address, e.g. `@alice@example.com`. Note that any usage of`@word` will be interpreted as mentioning the local user with the username `word`, if that user exists. Only the username part will count against your character limit -- the domain is not counted.
 
 ### Hashtags {#hashtags}
 
-{{< figure src="assets/compose-hashtags.jpg" caption="Hashtags are autosuggested by usage frequency." >}}
+{{< figure src="assets/compose-hashtags.png" width="50%" caption="Hashtags are autosuggested with usage frequency" >}}
 
 You can use a `#hashtag` to make your post discoverable to anyone searching for that hashtag. Hashtags can contain alphanumeric characters and underscores, but cannot contain numbers only.
 
 ### Custom emoji {#emoji}
 
-{{< figure src="assets/compose-custom-emoji.jpg" caption="An array of custom emoji are available in the selector." >}}
+{{< figure src="assets/compose-custom-emoji.png" width="50%" caption="An array of custom emoji are available in the selector" >}}
 
-Each server offers a set of custom emoji you can use, like on Discord. You can use an emoji using its shortcode like `:thounking:`, or by clicking the emoji face in the compose box and browsing through the "Custom" category. You can also browse through and search for standard unicode emoji.
+Each server offers a set of custom emoji you can use, similar to Slack or Discord. You can use an emoji using its shortcode like `:thounking:` or by clicking the emoji face in the compose box and browsing through the "Custom" category. You can also browse through and search for standard unicode emoji.
 
 ## Attachments {#attachments}
 
@@ -43,9 +43,9 @@ You can attach either files or a poll to your status.
 
 ### Files {#media}
 
-{{< figure src="assets/compose-media-attachment.jpg" caption="Thumbnail for attached media, with options to delete, edit, or mark as sensitive" >}}
+{{< figure src="assets/compose-media-attachment.png" width="50%" caption="New post with a thumbnail for attached media, with an Edit button for additional options" >}}
 
-Click the paper clip to attach a file to your post. You can attach the following:
+Click the photo stack to attach a file to your post. You can attach the following:
 
 * **Images** (PNG, JPG, HEIF, WEBP, AVIF) **up to 16MB**. Images will be downscaled to 8.3 megapixels (enough for a 3840x2160 image). Up to 4 images can be attached, per post.
 * **Animated GIFs** (GIFV) **up to 16MB** are converted to soundless MP4s. GIF dimensions must be less than 1MP (1280x720). You can also upload soundless MP4 and WebM files, which will be looped in clients the same way as an animated GIF. Only one animated GIF can be attached, per post.
@@ -55,28 +55,30 @@ Click the paper clip to attach a file to your post. You can attach the following
 
 #### Editing media {#edit}
 
-{{< figure src="assets/edit-media.jpg" caption="Edit media to add a media description or choose a focal point for the preview thumbnail." >}}
+{{< figure src="assets/edit-media.png" caption="Edit media to add a media description (ALT text) or choose a focal point for the preview thumbnail" >}}
 
 By clicking the "Edit" link on the attachment thumbnail, you can load a modal which will allow adding a media description or changing the focal point. Although optional, it is a good idea to add media descriptions that briefly describe what is in contained in the media. These descriptions will be shown when the media fails to load for any reason, or when accessed by screen readers and other assistive technology. Setting the focal point is also optional, but can make preview thumbnails looks better when they are not shown in a 16:9 aspect ratio.
 
 ### Polls {#polls}
 
-{{< figure src="assets/compose-polls.jpg" caption="A poll with 2 one-of choices, expiring in 1 day" >}}
+{{< figure src="assets/compose-polls.png" width="50%" caption="New post with a poll in a 'pick one' style, that expires after one day" >}}
 
 Click the bar graph icon to attach a poll to your post.
 
 * You can add up to 4 choices. Each choice can be up to 25 characters.
-* Polls default to one-of / single-choice. Click on the radio button to switch your poll to any-of / multiple-choice checkboxes.
+* Polls default to pick-one/single-choice. Click on the radio button to switch your poll to any-of/multiple-choice checkboxes.
 * Polls can be set to expire in 5 minutes, 30 minutes, 1 hour, 6 hours, 1 day, 3 days, or 7 days.
 
 ## Publishing levels {#privacy}
 
+{{< figure src="assets/post-visibility.png" width="50%" caption="New post with the option to modify the publishing level" >}}
+
 | Level | Public timelines | Permalink | Profile view | Home feeds |
 | :--- | :--- | :--- | :--- | :--- |
 | Public | Yes | Yes | Yes | Yes |
-| Unlisted | No | Yes | Yes | Yes |
-| Followers-only | No | Logged in on the same site | In-app or logged in | Yes |
-| Direct | No | Logged in and mentioned | In-app or logged in | No |
+| Quiet Public | No | Yes | Yes | Yes |
+| Followers | No | Logged in on the same site | In-app or logged in | Yes |
+| Specific People | No | Logged in and mentioned | In-app or logged in | No |
 
 Posts can be published with one of four different privacy levels, as described below. You can [set a default privacy level for your posts](../preferences#posting), and you can change the privacy level for a draft post by selecting the "Change Post Privacy" icon beneath the text of the post.
 
@@ -89,13 +91,16 @@ The default option.
 * Your followers will receive the post in their home feeds, and anyone mentioned will receive the post in notifications.
 * Your post can be boosted into other home feeds.
 
-### Unlisted {#unlisted}
+### Quiet Public {#unlisted}
 
 Exactly the same as public, but with the following difference:
 
-* Your post will not appear in Mastodon's public timelines.
+* Your post will not appear in Mastodon's live feeds or explore features.
+* Your post will not appear in search results, even if your account has opted-in to full text search.
 
-### Followers-only {#private}
+This option was previously known as Unlisted.
+
+### Followers {#followers}
 
 A more limited delivery option.
 
@@ -112,7 +117,7 @@ To effectively publish private (followers-only) posts, you must **lock your acco
 Please mind that post privacy on Mastodon is per-post, rather than account-wide, and as such **there is no way to make past public posts private.**
 {{< /hint >}}
 
-### Direct {#direct}
+### Specific People {#private}
 
 Send your post only to mentioned users.
 
@@ -122,10 +127,10 @@ Send your post only to mentioned users.
 * Your post cannot be boosted.
 
 {{< hint style="warning" >}}
-**Do not share dangerous and sensitive information over direct messages**. Mastodon is not an encrypted messaging app like Signal or Wire, the database administrators of the sender’s and recipient’s servers have access to the text. Use them with the same caution as you would use forum PMs, Discord PMs and Twitter DMs.
+**Do not share dangerous and sensitive information over private mentions**. Mastodon is not an encrypted messaging app like Signal or Matrix, the database administrators of the sender’s and recipient’s servers may obtain access to the text.
 {{< /hint >}}
 
-## Home feed visibility for replies
+## Visibility of Replies {#replies}
 
 Your replies will only appear on your followers' Home feeds if they follow both you and the person you are replying to.
 
@@ -136,10 +141,10 @@ Some notes about this:
 * If your post is public and contains a followed hashtag, it will be shown on the Home feed regardless of whether it is a reply.
 * Other Fediverse software may show all of your replies on the Home feed, no matter who the posts are replies to.
 
-## Content warnings and sensitive content {#cw}
+## Content Warnings {#cw}
 
-{{< figure src="assets/status-cw.jpg" caption="A status with a CW that is marked as sensitive content." >}}
+{{< figure src="assets/status-cw.png" width="50%" caption="Expanded post with a content warning that also has attached images obscured" >}}
 
-One feature that Mastodon provides that you may not have seen on other social networks is the option to attach a content warning to your posts. When a content warning is included, the status content will be collapsed by default, and only the CW will be shown, similarly to an email subject line or a "read more" break. This can be used to add a summary or subject for your post, to collapse long posts, or to otherwise provide context or setup for the body of the post.
+One feature that Mastodon provides that you may not have seen on other social networks is the option to attach a content warning to your posts. When a content warning is included, the status content will be collapsed by default, and only the Content Warning will be shown, similarly to an email subject line or a "read more" break. This can be used to add a summary or subject for your post, to collapse long posts, or to otherwise provide context or setup for the body of the post.
 
 When media is attached, a checkbox appears to allow you to "mark media as sensitive". This hides the full media behind a blurred thumbnail by default. Adding a CW to a post automatically marks the media as sensitive as well.

content/en/user/preferences.md

@@ -11,15 +11,19 @@ menu:
 
 ### Choose a theme {#theme}
 
-Mastodon defaults to a dark theme, but a light or high-contrast theme can be selected.
+Mastodon has multiple theme options: 
 
-{{< figure src="assets/light-theme.jpg" caption="Mastodon light theme" >}}
+- Automatically switch between a dark and light theme depending on your operating system preferences.
+- Manually switch between a dark and light theme.
+- Manually use a dark high contrast theme.
+
+{{< figure src="assets/light-theme.png" width="70%" caption="Mastodon post and thread as viewed from the light theme" >}}
 
 ### Choose your layout {#layout}
 
 Mastodon defaults to a simple, one-column layout with a compose box on the left and a column switcher on the right. You can choose to enable the advanced web interface, which allows you view and pin multiple columns at the same time.
 
-{{< figure src="assets/advanced-web-ui.jpg" caption="The advanced web interface" >}}
+{{< figure src="assets/advanced-web-ui.png" caption="Columns of the advanced web interface using the light theme" >}}
 
 In either interface, updates will load automatically as new posts are available. You can enable Slow Mode to instead show a banner at the top of the column indicating the number of new items available, which will be loaded only when you click the banner.
 
@@ -41,7 +45,7 @@ By default, any media marked as sensitive is hidden behind a click-through overl
 
 Hidden and unloaded media uses a colorful gradient provided by the BlurHash algorithm, which uses the colors of the image but blurs the details. These gradients can be disabled.
 
-{{< figure src="assets/blurhash.jpg" caption="An example blurhash thumbnail" >}}
+{{< figure src="assets/blurhash.png" width="50%" caption="An example blurhash thumbnail" >}}
 
 Posts with content warnings are collapsed by default, but you can choose to always expand the warnings so that the full post is displayed.
 
@@ -71,8 +75,6 @@ If you opt out of search engine indexing, a `noindex` flag will be added to your
 
 You can choose to hide your network, which will make your following and follower lists private to you only.
 
-{{< figure src="assets/hidden-network.jpg" caption="A profile that has opted to hide its network" >}}
-
 If you want to see posts that are boosted multiple times be reinserted into your feed at the top, you can disable boost grouping in timelines.
 
 ### Setting defaults for post privacy, post language, and media sensitivity {#posting}

content/en/user/profile.md

@@ -9,9 +9,9 @@ menu:
 
 ## Your appearance {#appearance}
 
-{{< figure src="assets/profile-cards.jpg" caption="Profile cards showing display name, avatar, and header" >}}
+{{< figure src="assets/profile-card.png" width="75%" caption="Profile card showing display name, avatar, header and short bio" >}}
 
-You can change how your profile appears to others by navigating to Settings &gt; Profile &gt; Appearance.
+You can change how your profile appears to others by navigating to **Preferences** &gt; **Public profile** &gt; **Edit profile**.
 
 ### Display name {#name}
 
@@ -33,7 +33,7 @@ Your header is a banner image shown at the top of your profile, as well as in pr
 
 You can set certain flags on your profile to let others know how you use Mastodon.
 
-{{< figure src="assets/bot-flag.jpg" caption="Overview of a profile with the Bot flag set." >}}
+{{< figure src="assets/bot-flag.png" width="50%" caption="Overview of a profile with the Automated flag set" >}}
 
 
 ### Locked account {#locked}

content/en/user/signup.md

@@ -44,10 +44,10 @@ Mastodon usernames actually consist of two parts:
 
 Just like an e-mail address. For convenience sake, Mastodon allows you to skip the second part when addressing people on the same server as you, but you have to keep in mind when sharing your username with other people, you need to include the domain or they won’t be able to find you as easily.
 
-|  |  |
+| Sharing your username |  |
 | :--- | :--- |
-| I’m @alice on Mastodon! | Wrong |
-| I’m @alice@example.com on Mastodon! | Correct |
+| I’m `@alice` on Mastodon! | Wrong |
+| I’m `@alice@example.com` on Mastodon! | Correct |
 | I'm https://example.com/@alice on Mastodon! | Correct |
 
 The search form in Mastodon will find people either with the above address form, or the link to the person’s profile, so you can share that instead if you prefer.