diff --git a/.stylelintrc b/.stylelintrc
index f2590032b0..82c0db3515 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -61,10 +61,10 @@
 
 		"declaration-empty-line-before": "never",
 
-		"declaration-property-unit-blacklist": {
+		"declaration-property-unit-disallowed-list": {
 			"line-height": ["rem", "em", "%"]
 		},
-		"declaration-property-unit-whitelist": {
+		"declaration-property-unit-allowed-list": {
 			"height": ["px", "%", "vh"],
 			"width": ["px", "%", "vw"],
 			"font-size": ["px", "rem", "%"],
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 2a5eacfcd7..83d060a8fd 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -11,8 +11,8 @@
 /* stylelint-disable selector-max-id */
 /* stylelint-disable selector-max-compound-selectors */
 /* stylelint-disable selector-no-qualifying-type */
-/* stylelint-disable declaration-property-unit-blacklist */
-/* stylelint-disable declaration-property-unit-whitelist */
+/* stylelint-disable declaration-property-unit-disallowed-list */
+/* stylelint-disable declaration-property-unit-allowed-list */
 
 /* General markup styles
 ---------------------------------------- */
@@ -3021,8 +3021,8 @@ fieldset.permissions .permissions-switch {
 /* stylelint-enable selector-max-id */
 /* stylelint-enable selector-max-compound-selectors */
 /* stylelint-enable selector-no-qualifying-type */
-/* stylelint-enable declaration-property-unit-blacklist */
-/* stylelint-enable declaration-property-unit-whitelist */
+/* stylelint-enable declaration-property-unit-disallowed-list */
+/* stylelint-enable declaration-property-unit-allowed-list */
 
 .acp-icon-move-up,
 .acp-icon-move-down {
diff --git a/phpBB/assets/javascript/mentions.js b/phpBB/assets/javascript/mentions.js
index 9ad016ebaa..efd57bc973 100644
--- a/phpBB/assets/javascript/mentions.js
+++ b/phpBB/assets/javascript/mentions.js
@@ -194,9 +194,7 @@
 			});
 
 			// Sort names by priorities - higher values come first
-			_results = _results.sort((a, b) => {
-				return b.priority - a.priority;
-			});
+			_results = _results.sort((a, b) => b.priority - a.priority);
 
 			// Exact match is the most important - should come above anything else
 			$.each(_exactMatch, (name, value) => {
@@ -233,9 +231,9 @@
 			* 2) We have enough names to display OR
 			*    all relevant names have been fetched from the server
 			*/
-			if (cachedNamesForQuery &&
-				(getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit ||
-					cachedAll[cachedKeyword])) {
+			if (cachedNamesForQuery
+				&& (getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit
+					|| cachedAll[cachedKeyword])) {
 				callback(cachedNamesForQuery);
 				return;
 			}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 7fba027761..c067622cce 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -1227,14 +1227,14 @@ ul.linklist:after,
 	content: "";
 }
 
-/* stylelint-disable declaration-property-unit-whitelist */
+/* stylelint-disable declaration-property-unit-allowed-list */
 .emoji {
 	width: 1em;
 	min-width: 18px;
 	height: 1em;
 	min-height: 18px;
 }
-/* stylelint-enable declaration-property-unit-whitelist */
+/* stylelint-enable declaration-property-unit-allowed-list */
 
 .smilies {
 	vertical-align: text-bottom;
diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css
index a846ed34de..90dcca34c4 100644
--- a/phpBB/styles/prosilver/theme/print.css
+++ b/phpBB/styles/prosilver/theme/print.css
@@ -220,13 +220,13 @@ code { display: block; }
 	display: none;
 }
 
-/* stylelint-disable declaration-property-unit-whitelist */
+/* stylelint-disable declaration-property-unit-allowed-list */
 .emoji {
 	width: 1em;
 	min-width: 18px;
 	height: 1em;
 	min-height: 18px;
 }
-/* stylelint-enable declaration-property-unit-whitelist */
+/* stylelint-enable declaration-property-unit-allowed-list */
 
 /* stylelint-enable selector-max-compound-selectors */