diff --git a/docs/general/about.md b/docs/general/about.md
index 17f0870f..9053c34b 100644
--- a/docs/general/about.md
+++ b/docs/general/about.md
@@ -15,11 +15,13 @@ You can find our main repository on [GitHub](https://github.com/jellyfin/jellyfi
## Core Team
-[Joshua Boniface (joshuaboniface)](https://github.com/joshuaboniface)
-[Anthony Lavado (anthonylavado)](https://github.com/anthonylavado)
-[Andrew Rabert (nvllsvm)](https://github.com/nvllsvm)
-[Bond-009](https://github.com/Bond-009)
-[dkanada](https://github.com/dkanada)
-[Claus Vium (cvium)](https://github.com/cvium)
-[Bill Thornton (thornbill)](https://github.com/thornbill)
-[Cody Robibero](https://github.com/crobibero)
+| Person | Contact |
+|---|---|
+| Joshua Boniface (Project Leader) | [GitHub](https://github.com/joshuaboniface) [Matrix](https://matrix.to/#/@joshuaboniface:bonifacelabs.ca) [Reddit](https://www.reddit.com/user/djbon2112) [Email](mailto:joshua@boniface.me) |
+| Anthony Lavado | [GitHub](https://github.com/anthonylavado) |
+| Andrew Rabert | [GitHub](https://github.com/nvllsvm) |
+| Bond-009 | [GitHub](https://github.com/Bond-009) |
+| dkanada | [GitHub](https://github.com/dkanada) |
+| Claus Vium | [GitHub](https://github.com/cvium) |
+| Bill Thornton | [GitHub](https://github.com/thornbill) |
+| Cody Robibero | [GitHub](https://github.com/crobibero) |
diff --git a/docs/general/community-standards.md b/docs/general/community-standards.md
index 40e11b92..ed27bbf6 100644
--- a/docs/general/community-standards.md
+++ b/docs/general/community-standards.md
@@ -5,48 +5,53 @@ title: Community Standards
# Jellyfin Community Standards
-As time marches on and Jellyfin, and the Internet more broadly, continues to grow, it is important to establish standards by which community members should interact. While there are numerous such "Codes of Conduct" out there, I am not a fan of most, and I felt it important to establish our own, suited to our project, as well as a dispute resolution mechanism tailored to our needs. Questions about this document should be directed towards me. --Joshua, Project Leader
+This document outlines the standards by which all parcipants in the Jellyfin community, be it user or contributor, on all possible platforms, must adhere.
## Mission Statement
-- Jellyfin aims to be the best media streaming platform possible, built entirely by volunteers without any monetary gain, proprietary/locked features, or unreasonable centralization.
+- Jellyfin aims to be the best free and open source media streaming platform possible, without any proprietary/locked features or unreasonable centralization.
- Jellyfin is a project made up entirely and exclusively of Volunteers who donate their free time to the project.
-- Fostering a community of respectful and productive contributors is central to our success and longevity.
-
- Jellyfin is not and will never be under the control of any corporation or profit-driven entity, and does not exist to make money for anyone, including any volunteer contributors or the project leadership.
+- Fostering a community of respectful and productive contributors is central to our success and longevity.
+
## Code of Conduct
At all times when interacting with the Jellyfin community via any method (Matrix, Reddit, Forums, etc.), you must abide by the following:
-- **Respect others and remember the Human.** Do exhibit kindness and empathy to others, and make them feel welcome. Do not antagonize, flame, insult, demean, abuse, or harass others. Do not use slurs or sexualized language. Do not dox or otherwise expose others' private information, even if it is shared publicly elsewhere.
+- **Respect others and remember the Human.** Do exhibit kindness and empathy to others, and make them feel welcome. **Do not antagonize, flame, insult, demean, abuse, or harass others.** Do not use slurs or sexualized language. Do not dox or otherwise expose others' private information, even if it is shared publicly elsewhere. **Always act in good faith and give other contributors the benefit of the doubt.** Try to read positivity rather than negativity into communications where at all possible.
-- **English is the primary working language of Jellyfin, but the majority of our community do not speak English as their primary language**. Be patient when language issues arise, and do not mistake incomplete language knowledge for ignorance or worse. Always act in good faith and give other contributors the benefit of the doubt, and try to read positivity rather than negativity into messages where at all possible. If you are having trouble communicating an idea in English, please post in your native language and ask for help, and someone is likely to understand. As per rule 1, abuse of community members due to language issues is not tolerated.
+- **Do not engage in, encourage, or facilitate piracy in any Jellyfin communities.** Jellyfin is a media server system for your own media collection; how you obtain media is not our concern, and is not to be discussed in our communities in any form. **Do not ask about where or how to obtain media**, and **do not ask about, sell, trade, or otherwise faciliate access to other users' servers** in our communities.
-- Jellyfin, as set out in our Mission Statement, is created exclusively by volunteers. As they are freely giving their time and effort, **no volunteer contributor owes anything whatsoever to any other contributor, any user, or the project itself**. Contributors are free to come and go as they please, to work on and give attention to what they deem interesting or important, and to respond or not respond to anything they wish. That said the administrative team would kindly request that regular contributors inform us of long-term departures to ensure we are aware, should the need arise.
+- **English is the primary working language of Jellyfin, but large portions of the community are not native English speakers**. Be patient when language issues arise, and do not mistake incomplete language knowledge for ignorance or worse. If you are having trouble communicating an idea in English, please post in your native language and ask for help translating, and someone is likely to understand.
-- If you have questions to ask of the community, **please choose the appropriate location** (see our [Getting Help](/docs/general/getting-help) page) and **ask your question in full, immediately, with as much detail as possible**. Author issues aside, [Asking Questions the Smart Way](http://www.catb.org/~esr/faqs/smart-questions.html) is a valuable resource. **Do not pester or harass** community members for help or to answer questions, **do not require others to pry information** out of you, and **do not spam questions** - they will be answered when they are answered.
+- Jellyfin is created exclusively by volunteers, as set out in our Mission Statement. Since they are freely giving their time and effort, **no volunteer contributor owes anything whatsoever to any other contributor, any user, or the project itself**. Contributors are free to come and go as they please, to work on and give attention to what they deem interesting or important, and to respond or not respond to anything they wish. **Do not badger voluneers** in any way about any topic.
-- Jellyfin is a media server system for your own media collection. Our communities are not a place to obtain media. **Do not engage in, encourage, or facilitate piracy**. Do not ask questions about where to obtain media. Do not ask for access to other users' servers, or sell or transfer access to private servers in our communities.
+- If you have questions to ask of the community, **please choose the appropriate location** (see our [Getting Help](/docs/general/getting-help) page) and **ask your question in full, immediately, with as much detail as possible**. Author issues aside, [Asking Questions the Smart Way](http://www.catb.org/~esr/faqs/smart-questions.html) is a valuable resource and is recommended reading before engaging with any free and open source community, including ours. **Do not pester or harass** community members for help or to answer questions. **Do not require others to pry information** out of you. **Do not spam questions**; they will be answered when they are answered.
## Dispute Resolution and Moderation
Disputes are inevitable, including violations of the rules above. When these occur, the following policy applies.
-- Before any other resolution step, we trust the community to police itself. If you see a community member violating these community standards, please let them know, and link them to this document. Do not respond in kind (e.g. respond to a flame with a flame). Most disagreements can be solved with education and discussion.
+- Before any other resolution step, we trust the community to police itself. If you see a community member violating these community standards, please let them know, and link them to this document. Do not respond in kind (e.g. respond to a flame with a flame). Most disagreements can be solved with education and discussion. If you have been linked to this document by another user, do not dwell on this point: alter your behaviour as appropriate and move on.
-- If the issue cannot be resolved between the contributors, any complaints, instances of explicit rulebreaking, or unresolvable disagreements with other community members may be directed towards the Administrative team, or the Project Leaders directly. You may do so through email (`team [at] jellyfin.org`) or on Matrix via a direct message. Please include details and context as appropriate.
+- If the issue cannot be resolved between the contributors, any complaints, instances of explicit rulebreaking, or unresolvable disagreements with other community members may be directed towards the Core Team or the Project Leader directly. You may do so through email (`team [at] jellyfin.org`) or on Matrix via a direct message. Please include details and context as appropriate. See the [about page](/docs/general/about) for the list of Core Team members and ways to contact them.
- The team will review the complaint and decide on an action, including but not limited to: informal private guidance, informal private warnings, formal public warnings, temporary ban(s) from the various platforms, or permanent ban(s).
- Formal warnings will be made under a "second-chance-only" policy. Once warned, if one repeats the same behaviour, the response will escalate as appropriate to the infraction.
-- Moderation tasks in some locations are delegated to other team members. This dispute resolution procedure applies anywhere under the Jellyfin umbrella. The Administrative team and Project Leaders retain final say in any dispute resolutions.
+- Moderation tasks in some locations are delegated to other, non-Core team members. This dispute resolution procedure applies anywhere under the Jellyfin umbrella. The Core team and Project Leader retain final say in any dispute resolutions.
+
+## Questions or Comments
+
+Questions or comments regarding these standards should be forwarded to the [Project Leader](https://matrix.to/#/@joshuaboniface:bonifacelabs.ca) or [Core Team](/docs/general/about).
## Changelog
This document represents official Jellyfin project policy. Any changes to this document require a changelog entry here and approval by a Project Leader.
-2020-09-14, Joshua Boniface: Initial version of the community standards document. Based _very_ loosely on several CoCs including the Contributor Covenant, and various Forum rules I've read and written over the years.
+* 2020-09-14, Joshua Boniface: Initial version of the community standards document. Based *very* loosely on several CoCs including the Contributor Covenant, and various Forum rules I've read and written over the years.
+* 2022-09-03, Joshua Boniface: Update header and footer sections; reduce redundant wording; make rules clearer.