diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 63ae912..c9d7d7e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,48 +1,46 @@
# Contribution Guidelines
-Before filing a bug report or a feature request, be sure to read the contribution guidelines.
+Thanks for your interest in improving Comment Experience.
-## How to use GitHub
-We use GitHub exclusively for well-documented bugs, feature requests and code contributions. Communication is always done in English.
+## Support, bugs, and feature requests
-To receive free support for this plugin, go to [the support formus](https://wordpress.org/support/plugin/yoast-comment-hacks/). Thanks for your understanding.
+We use GitHub for well-documented bug reports, feature requests, and code contributions. Communication is in English.
-## Security issues
-Please do not report security issues here. Instead, report them per our [security policy](https://github.com/emilia-capital/comment-hacks/security/policy).
+- For plugin support, use the [WordPress.org support forum](https://wordpress.org/support/plugin/yoast-comment-hacks/).
+- For security issues, follow our [security policy](https://github.com/ProgressPlanner/comment-hacks/security/policy).
+- Before opening an issue, please search existing issues first.
-## I have found a bug
-Before opening a new issue, please:
-* update to the newest versions of WordPress, Yoast SEO and the PDF XML sitemap plugins.
-* search for duplicate issues to prevent opening a duplicate issue. If there is already an open existing issue, please comment on that issue.
-* follow our _New issue_ template when creating a new issue.
-* add as much information as possible. For example: add screenshots, relevant links, step by step guides etc.
+## Reporting a bug
-## I have a feature request
-Before opening a new issue, please:
-* search for duplicate issues to prevent opening a duplicate feature request. If there is already an open existing request, please leave a comment there.
-* add as much information as possible. For example: give us a clear explanation of why you think the feature request is something we should consider for the plugin.
+Before opening a bug report, please:
-## I want to create a patch
-Community made patches, localizations, bug reports and contributions are very welcome and help us tremendously.
+- Update WordPress and the plugin to the latest available versions.
+- Check whether the issue has already been reported.
+- Follow the issue template and include clear reproduction steps.
+- Add screenshots, relevant links, logs, or other context where helpful.
-When contributing please ensure you follow the guidelines below so that we can keep on top of things.
+If you still need to report a bug, [open an issue](https://github.com/ProgressPlanner/comment-hacks/issues/new/choose).
-#### Submitting an issue you found
-Make sure your problem does not exist as a ticket already by searching through [the existing issues](https://github.com/emilia-capital/comment-hacks/issues/). If you cannot find anything which resembles your problem, please [create a new issue](https://github.com/emilia-capital/comment-hacks/issues/new).
+## Requesting a feature
-#### Fixing an issue
+Before opening a feature request, please:
-* Fork the repository on GitHub (make sure to use the `develop` branch).
-* Make the changes to your forked repository.
-* Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/) and you properly document any new functions, actions and filters following the [documentation standards](https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/php/).
-* When committing, reference your issue and include a note about the fix.
-* Push the changes to your fork and submit a pull request to the `develop` branch of the Accessibility Checker repository.
+- Check whether the idea has already been suggested.
+- Explain the problem you are trying to solve.
+- Share enough context for us to understand the use case and expected outcome.
-We will review your pull request and merge when everything is in order. We will help you to make sure the code complies with the standards described above.
+## Submitting a patch
-#### 'Patch welcome' issues
-Some issues are labeled 'patch-welcome'. This means we see the value in the particular enhancement being suggested but have decided for now not to prioritize it. If you however decide to write a patch for it, we'll gladly include it after some code review.
+Community contributions are welcome.
-#### Additional Resources
-* [General GitHub Documentation](https://help.github.com/)
-* [GitHub Pull Request documentation](https://help.github.com/send-pull-requests/)
+1. Fork the repository.
+2. Create a branch for your change.
+3. Make your update.
+4. Follow the [WordPress Coding Standards](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/) and relevant inline documentation standards.
+5. Run the relevant checks before submitting.
+6. Open a pull request against the default branch used by this repository.
+
+## Additional resources
+
+- [GitHub documentation](https://docs.github.com/)
+- [Pull request documentation](https://docs.github.com/pull-requests)
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 9e792ea..7ab145d 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -2,20 +2,20 @@
## Reporting a Vulnerability
-You can report any security bugs found in the source code of this plugin through the [Patchstack Vulnerability Disclosure Program](https://patchstack.com/database/vdp/yoast-comment-hacks). The Patchstack team will assist you with verification, CVE assignment and take care of notifying the developers of this plugin.
+Please report security issues through the [Patchstack Vulnerability Disclosure Program](https://patchstack.com/database/vdp/comment-hacks). Patchstack helps with verification, coordinated disclosure, and notifying the maintainers.
## Responding to Vulnerability Reports
-I take security bugs very seriously. I appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions. Patchstack will work with you and me to deal with the security issue as best as possible.
+We take security reports seriously and appreciate responsible disclosure. We aim to confirm, assess, and address valid reports as quickly as possible.
-## Disclosing a Vulnerability
+## Disclosure Process
-Once an issue is reported, I will use the following disclosure process:
+When a report is received, we use the following process:
-- When a report is received, I confirm the issue and determine its severity together with Patchstack.
-- If we know of specific third-party services or software that require mitigation before publication, those projects will be notified.
-- An advisory is prepared (but not published) which details the problem and steps for mitigation.
-- Patch releases are published and the advisory is published.
-- Release notes and our readme.txt will include a `Security` section with a link to the advisory.
+- Confirm the issue and determine severity together with Patchstack.
+- Notify affected third parties if coordinated mitigation is needed before disclosure.
+- Prepare an advisory with details and mitigation guidance.
+- Publish a patch release.
+- Publish the advisory once fixes are available.
-We credit reporters for identifying vulnerabilities, although we will keep your name confidential if you request it.
+We credit reporters for identifying vulnerabilities unless they request to remain anonymous.
diff --git a/SECURITY.md b/SECURITY.md
deleted file mode 100644
index 875d4e9..0000000
--- a/SECURITY.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-You can report any security bugs found in the source code of this plugin through our [Patchstack Vulnerability Disclosure Program](https://patchstack.com/database/vdp/yoast-comment-hacks). The Patchstack team will assist you with verification, CVE assignment and take care of notifying the developers of this plugin.
-
-## Responding to Vulnerability Reports
-
-Emilia Projects takes security bugs seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions. Patchstack will work with you and us to deal with the security issue as best as possible.
-
-## Disclosing a Vulnerability
-
-Once an issue is reported, Emilia uses the following disclosure process:
-
-- When a report is received, we confirm the issue and determine its severity together with Patchstack.
-- If we know of specific third-party services or software that require mitigation before publication, those projects will be notified.
-- An advisory is prepared (but not published) which details the problem and steps for mitigation.
-- Patch releases are published and the advisory is published.
-- Release notes and our CHANGELOG.md will include a `Security` section with a link to the advisory.
-
-We credit reporters for identifying vulnerabilities, although we will keep your name confidential if you request it.
diff --git a/readme.md b/readme.md
index 21b4e29..b028df5 100644
--- a/readme.md
+++ b/readme.md
@@ -9,36 +9,72 @@
[](https://github.com/ProgressPlanner/comment-hacks/actions/workflows/lint.yml)
[](https://github.com/ProgressPlanner/comment-hacks/actions/workflows/test.yml)
+
+
# Comment Experience
-Improve the comment experience on your site. Adds lots of features to make commenting easier and more engaging.
+Make WordPress comments easier to manage with cleaner moderation emails, better routing, comment policy controls, length limits, and tools for following up with commenters.
+
+## Why this plugin exists
+
+Core WordPress comments work, but moderation and follow-up can feel clunky. Comment Experience adds practical improvements for site owners and editors who want a cleaner, more manageable comment workflow without replacing the native comments system.
+
+## What it helps you do
+
+- Clean up comment notification emails so moderation is easier.
+- Require acceptance of a comment policy before submission.
+- Forward comments to another email address and optionally trash them.
+- Set minimum and maximum comment lengths.
+- Redirect first-time commenters to a thank-you page.
+- Change a comment's parent ID from the comment edit screen.
+- Email an individual commenter from the comments screen.
+- Email all commenters on a post from the admin bar.
+- Route comment emails to another user from a post's discussion settings.
-## Description
+## Installation
-This plugin adds many small improvements around core WordPress comments to make them more bearable:
+### From WordPress admin
-* Cleaner comment notification emails.
-* The option to enforce a comment policy.
-* The option to forward comments to an email address (for instance for your support team) and then trash them.
-* The option to disallow comments below a certain length.
-* The option to redirect first time commenters to a "thank you" page.
-* An input field on the comment edit screen to change the comment parent ID.
-* Links in the admin comments section to email individual commenters.
-* A button in the WP toolbar to email all the commenters on a post.
+1. In your WordPress dashboard, go to **Plugins → Add New**.
+2. Search for **Comment Experience** or **comment hacks**.
+3. Install and activate the plugin.
+4. Go to **Settings → Comment Experience** to configure the available options.
+
+### Manual installation
+
+1. Download the plugin zip.
+2. Upload the `comment-hacks` folder to `/wp-content/plugins/`.
+3. Activate the plugin in **Plugins**.
+4. Go to **Settings → Comment Experience** to configure the available options.
## Screenshots
-Screenshot of a clean comment notification email:
-
-
-The comment parent edit box:
-
-
-The plugins admin settings:
-
-
-The button on the frontend to email all the commenters on a post:
-
-
-The link in the backend to email an individual commenters on a post:
-
+### Cleaner comment notification emails
+
+
+### Edit a comment's parent directly from the comment screen
+
+
+### Configure comment length, policy, redirects, email links, and forwarding from one settings screen
+
+
+### Email all commenters on a post from the WordPress admin bar
+
+
+### Contact an individual commenter from the comments list table
+
+
+## Support, issues, and security
+
+- Questions or support: [WordPress.org support forum](https://wordpress.org/support/plugin/yoast-comment-hacks/)
+- Bug reports and feature requests: [GitHub issues](https://github.com/ProgressPlanner/comment-hacks/issues)
+- Security reports: [Patchstack VDP](https://patchstack.com/database/vdp/comment-hacks)
+
+## Contributing
+
+Contributions are welcome. Please read [`.github/CONTRIBUTING.md`](.github/CONTRIBUTING.md) before opening an issue or pull request.
+
+## Links
+
+- [Plugin page on WordPress.org](https://wordpress.org/plugins/yoast-comment-hacks/)
+- [Progress Planner](https://progressplanner.com/)
diff --git a/readme.txt b/readme.txt
index 3501661..3617600 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,190 +1,192 @@
=== Comment Experience ===
-Contributors: joostdevalk
-Tags: comments, spam, emails
+Contributors: joostdevalk, aristath, filipi, progressplanner
+Tags: comments, comment moderation, comment emails, discussion, comment policy
Text Domain: yoast-comment-hacks
Stable tag: 2.1.7
Requires at least: 6.7
Tested up to: 6.9
Requires PHP: 7.4
-License: GPLv3
+License: GPL-3.0-or-later
License URI: https://www.gnu.org/licenses/gpl-3.0.html
-Make comments management easier by applying the simple hacks Joost has gathered over the years.
+Improve WordPress comment moderation with cleaner emails, comment policy checks, routing, redirects, and length controls.
== Description ==
-Make comments management easier by applying the simple hacks Joost has gathered over the years.
+Comment Experience helps you manage WordPress comments more efficiently without replacing the native comments system.
-This plugin adds some small hacks around core WordPress comments to make them more bearable:
+If you moderate comments regularly, this plugin gives you practical improvements that make follow-up easier, keep discussions clearer, and reduce repetitive admin work.
-* Cleaner comment notification emails.
-* The option to enforce a comment policy: just create a comment policy page, toggle the option on and select it, and
-commenters will have to accept your comment policy before being able to comment.
-* The option to forward comments to an email address (for instance for your support team) and then trash them.
-* The option to disallow comments below and above a certain length.
-* The option to redirect first time commenters to a "thank you" page.
-* An input field on the comment edit screen to change the comment parent ID.
-* Links in the admin comments section to email individual commenters.
-* A button in the WP toolbar to email all the commenters on a post.
-* Adds a comment routing option. This adds a dropdown in a post's discussion settings, allowing the routing of comment emails to another user.
+= Features that improve comment moderation =
-See the screenshots to get an even better idea of the plugins' functionality.
+* Clean up comment notification emails so important details are easier to scan.
+* Require commenters to accept a comment policy before submitting.
+* Forward comments to another email address and optionally trash them after forwarding.
+* Set minimum and maximum comment lengths.
+* Redirect first-time commenters to a thank-you page.
+* Change a comment's parent ID from the comment edit screen.
+* Email an individual commenter directly from the comments list.
+* Email all commenters on a post from the WordPress admin bar.
+* Route comment emails to another user from a post's discussion settings.
-=== Have you found an issue? ===
+= Who this plugin is for =
-If you have bugs to report, please go to [the plugin's GitHub repository](https://github.com/emilia-capital/comment-hacks). For security issues, please use our [vulnerability disclosure program](https://patchstack.com/database/vdp/comment-hacks), which is managed by PatchStack. They will assist you with verification, CVE assignment, and, of course, notify us.
+Comment Experience is useful for site owners, editors, community managers, and support teams who rely on WordPress comments and want a smoother moderation workflow.
+= Need help or want to report something? =
+
+For support, visit the [WordPress.org support forum](https://wordpress.org/support/plugin/yoast-comment-hacks/).
+
+For bugs or feature requests, use the [GitHub repository](https://github.com/ProgressPlanner/comment-hacks).
+
+For security issues, please use our [vulnerability disclosure program](https://patchstack.com/database/vdp/comment-hacks), managed by Patchstack.
== Installation ==
-**Install through your backend**
+= Install from your WordPress dashboard =
-1. Search for "comment hacks", click install.
-1. You're done.
+1. Go to **Plugins > Add New Plugin**.
+2. Search for **Comment Experience** or **comment hacks**.
+3. Click **Install Now** and then **Activate**.
+4. Go to **Settings > Comment Experience** to configure the plugin.
-**Install manually**
+= Install manually =
1. Download and unzip the plugin.
-1. Upload the `comment-hacks` directory to the `/wp-content/plugins/` directory.
-1. Activate the plugin through the 'Plugins' menu in WordPress.
-1. Configure your settings on the Settings → Comment Experience screen.
+2. Upload the `comment-hacks` directory to the `/wp-content/plugins/` directory.
+3. Activate the plugin through the **Plugins** menu in WordPress.
+4. Go to **Settings > Comment Experience** to configure the plugin.
+
+== Frequently Asked Questions ==
+
+= What does Comment Experience do? =
+
+Comment Experience improves WordPress comment moderation with cleaner notification emails, comment policy options, comment routing, redirects, and comment length controls.
+
+= Does it replace the default WordPress comments system? =
+
+No. It enhances core WordPress comments with extra moderation and workflow features.
+
+= Can I require visitors to accept a comment policy? =
+
+Yes. You can create a comment policy page, enable the option, and require acceptance before a comment can be submitted.
+
+= Can I limit how short or long comments can be? =
+
+Yes. The plugin lets you configure both minimum and maximum comment length limits.
+
+= Can I send comment notifications to someone else? =
+
+Yes. You can forward comments to another email address, and you can also route comment emails to another user from a post's discussion settings.
== Screenshots ==
-1. Screenshot of a clean comment notification email.
-2. The comment parent edit box.
-3. The plugins admin settings.
-4. The button on the frontend to email all the commenters on a post.
-5. The link in the backend to email an individual commenters on a post.
+1. Cleaner WordPress comment notification email that is easier to scan while moderating.
+2. Comment parent field on the comment edit screen for fixing comment thread hierarchy.
+3. Comment Experience settings for comment length limits, comment policy, email links, redirects, clean emails, and forwarding.
+4. Admin bar button for emailing all commenters on a post.
+5. Comments list action link for emailing an individual commenter.
== Changelog ==
= 2.1.7 =
-
-* Minor updates, name change mostly.
+* Maintenance release with minor updates and the Comment Experience name change.
= 2.1.6 =
-
-* Compatibility with Progress Planner v1.9
+* Compatibility with Progress Planner v1.9.
= 2.1.5 =
-
-* Compatibility with Progress Planner v1.8
+* Compatibility with Progress Planner v1.8.
= 2.1.4 =
-
* Add compatibility with WordPress 6.8.
* Save proper values for Redirect page settings when no selection is made.
-* Run upgrade routine only when plugin version is increased
-* Migrate PHPUnit XML schema
-* Compatibility with Progress Planner v1.4
+* Run the upgrade routine only when the plugin version increases.
+* Migrate PHPUnit XML schema.
+* Compatibility with Progress Planner v1.4.
= 2.1.3 =
-
-* Add necessary compatibility to Progress Planner integration for the upcoming WordPress 6.8.
+* Add compatibility for the upcoming WordPress 6.8 release in Progress Planner integration.
= 2.1.2 =
-
* Rename the plugin from "Comment Hacks" to "Comment Experience".
-* Bring up to date with changes in Progress Planner
+* Bring the plugin up to date with changes in Progress Planner.
= 2.1.1 =
-
* Don't enqueue the remove URL script on the frontend for logged out users or users without the `edit_posts` capability.
= 2.1 =
-
-* Added a link to remove the author's URL from the comment from the frontend.
-* Fix comment policy function for admins and editors.
+* Add a link to remove the author's URL from the comment from the frontend.
+* Fix the comment policy function for admins and editors.
= 1.9.4 =
-
* Fix fatal due to wrong class import, props [@andizer](https://profiles.wordpress.org/andizer/).
= 1.9.3 =
-
-* Fix bug where comment reroute recipient would not save.
-* Added an option to disable the "Email all commenters" admin bar button.
+* Fix bug where the comment reroute recipient would not save.
+* Add an option to disable the "Email all commenters" admin bar button.
= 1.9.2 =
-
* Fix missing autoloader.
= 1.9 =
-
-* Introduces a new option to the plugin: adding a comment policy was never easier than this: just create a comment
-policy page, toggle the option on and select it, and commenters will have to accept your comment policy before being
-able to comment.
-* Fixes a bug where editing a comment on the quick edit screen would cause that comment to lose its parent.
-* Enhances performance by preventing too frequent option updates.
-* Remove all direct DB queries in favor of using WordPress core functions.
+* Add a comment policy option so commenters must accept your policy before commenting.
+* Fix a bug where editing a comment on the quick edit screen would cause that comment to lose its parent.
+* Improve performance by preventing too frequent option updates.
+* Remove all direct database queries in favor of WordPress core functions.
= 1.8.1 =
-
-* Fixed a couple of PHP 7.4 related issues.
+* Fix a couple of PHP 7.4 related issues.
= 1.8 =
-
-* Changed namespace to `JoostBlog`.
-* Removed Yoast branding.
-* Updated plugin to require PHP 7.4.
+* Change namespace to `JoostBlog`.
+* Remove Yoast branding.
+* Update the plugin to require PHP 7.4.
= 1.7 =
-
-* Bugfixes:
- * Fixed: the "Email commenters" link would not be displayed in the WordPress admin bar and in the Comments list.
- * Fixed: the "Email commenters" link in the front end admin bar wouldn't work when jQuery wasn't enqueued.
- * Fixed: the notification emails for new comments would have incorrect content for the Author line and the text displayed before the comment.
+* Fix the "Email commenters" link not displaying in the WordPress admin bar and comments list.
+* Fix the frontend admin bar email commenters link when jQuery was not enqueued.
+* Fix incorrect author line and comment intro text in notification emails.
= 1.6 =
-
* Fix language packs.
= 1.5 =
-
-* Bugfixes:
- * Fixed: comment recipient dropdown would reset on reload of the page.
- * Fixed: admin bar CSS showing when no admin bar is showing.
+* Fix the comment recipient dropdown resetting on page reload.
+* Fix admin bar CSS showing when the admin bar is not visible.
= 1.4 =
-
-* Enhancements:
- * Limit the roles shown in the comment notifications dropdown to roles that normally exist and can write. Introduces a new filter to allow expanding them.
+* Limit the roles shown in the comment notifications dropdown to roles that normally exist and can write.
+* Introduce a new filter to allow expanding those roles.
= 1.3 =
-
-* Enhancements:
- * Add option to restrict comments that are too long, next to too small.
- * Add `reply-to` header to comment notification and moderation emails, pointing to the post author.
- * Preserve the active tab when saving settings.
- * Remove `[...]` from pingback / trackback excerpt in cleaned emails as that's already included by core.
- * Replace link to ARIN with link to [ip-lookup.net](http://ip-lookup.net) for details about the IP.
- * Refactored code for readability and code quality.
- * Refactor upgrade routine to do less DB queries.
+* Add an option to restrict comments that are too long, next to comments that are too short.
+* Add a `reply-to` header to comment notification and moderation emails that points to the post author.
+* Preserve the active tab when saving settings.
+* Remove `[...]` from pingback and trackback excerpts in cleaned emails because core already includes it.
+* Replace the ARIN link with [ip-lookup.net](http://ip-lookup.net) for IP details.
+* Refactor code for readability and code quality.
+* Refactor the upgrade routine to do fewer database queries.
= 1.2 =
-
-Fixes several issues:
-
-* Differentiate between AJAX request and normal POST for nonce checking, fixes #7.
-* Make sure comment type isn't empty in cleaned email, fixes #8.
-* Allow setting the comment parent to 0, fixes #10.
-* Prevents defaults from being reinstated, fixes #14.
-
-Also:
-
-* Adds translator comments to all strings with `sprintf` / `printf`.
-* Updates to new version of Yoast i18n, in the process switching from `translate.yoast.com` to `translate.wordpress.org` and removing packaged translations.
-* Added `yarn.lock` and removed no longer needed i18n grunt tasks.
+* Differentiate between AJAX requests and normal POST requests for nonce checking, fixing #7.
+* Make sure the comment type is not empty in cleaned emails, fixing #8.
+* Allow setting the comment parent to 0, fixing #10.
+* Prevent defaults from being reinstated, fixing #14.
+* Add translator comments to all strings with `sprintf` / `printf`.
+* Update to a new version of Yoast i18n, switching from `translate.yoast.com` to `translate.wordpress.org` and removing packaged translations.
+* Add `yarn.lock` and remove no longer needed i18n grunt tasks.
= 1.1.1 =
-
-* Add text domain so the plugin can be translated.
+* Add a text domain so the plugin can be translated.
= 1.1 =
-
-* Add comment routing option, adds a dropdown in a post's discussion settings, allowing the routing of comment emails to another user.
+* Add a comment routing option with a dropdown in a post's discussion settings for routing comment emails to another user.
= 1.0 =
-
* Initial version.
+
+== Upgrade Notice ==
+
+= 2.1.7 =
+This maintenance release keeps Comment Experience current and aligned with its updated branding.