diff --git a/.github/workflows/lint-scripts/websites-shared-credentials-sort-order.rb b/.github/workflows/lint-scripts/websites-shared-credentials-sort-order.rb
index 39c51dec3..24ef88a7e 100644
--- a/.github/workflows/lint-scripts/websites-shared-credentials-sort-order.rb
+++ b/.github/workflows/lint-scripts/websites-shared-credentials-sort-order.rb
@@ -3,8 +3,8 @@
 def process_file(file_path)
   shared_websites = JSON.parse File.read(file_path)
   shared_websites_sorted = shared_websites.sort do |a, b|
-    a_string = a["shared"] ? a["shared"].first : (a["from"] ? a["from"].first : "")
-    b_string = b["shared"] ? b["shared"].first : (b["from"] ? b["from"].first : "")
+    a_string = a["shared"] || a["from"] || [""]
+    b_string = b["shared"] || b["from"] || [""]
     a_string <=> b_string
   end
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3ea704eb7..a276808f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -57,10 +57,20 @@ When contributing or amending a set of websites sharing a credential backend, yo
 
 Use the website in question until you find the standalone page for updating the user's password, or a high-level "Account Information" or "Security" page. The closer the URL takes the user to be able to change their password, the better. Before adding a URL, ensure that it works properly both when the user is logged in and when they are not. URLs added to [`quirks/change-password-URLs.json`](quirks/change-password-URLs.json) should have a scheme of https unless the website does not allow changing the password on an https page.
 
+### Contributing to Apple Application IDs to Domains that Share Credentials
+
+On macOS, for app bundle `Example.app`, you can find the App ID by dumping its entitlements with `codesign -d --entitlements - --xml path/to/Example.app`. Its App ID is the value in the XML for key `com.apple.application-identifier`. For macOS apps in particular, if there is no App ID present, the effective App ID is the app's Bundle Identifier (`CFBundleIdentifier` in the app's `Info.plist`).
+
+When contributing or amending a set of websites for an App ID, you should state why you believe the domains do share a credential backend with the app, with evidence to support your claim.
+
 ### Contributing to Websites Where 2FA Code is Appended to Password
 
 When contributing or amending a set of websites that require that the user append a generated code to their password when signing in, you should state why you believe the relevant domains require such. This may involve citing a URL to the relevant support page for the website.
 
+### Contributing to Websites That Ask for Credentials for Other Services When Embedded as Third-party
+
+When contributing or amending the list of websites that when embedded as a third party, are known to ask for credentials for other services, you should provide evidence that the given website or websites behaves this way. This may involve a screenshot or steps to navigate a website to observe a subframe behaving this way.
+
 ### Contributing a New Kind of Quirk or Other Resource
 
 If you have a new type of quirk or another resource, that you feel that other password managers could use to improve users' experiences and make password management more attractive for people who aren't using a password manager, please [reach out](mailto:password-manager-resources-maintainers@apple.com) to this project's maintainers at Apple so we can discuss the details.
diff --git a/LICENSE.md b/LICENSE.md
index f3d65eb0a..80959ce66 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright 2020 - 2022 Apple Inc.
+Copyright 2020 - 2024 Apple Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index 786552347..527aa6551 100644
--- a/README.md
+++ b/README.md
@@ -53,9 +53,29 @@ The [Contributing](CONTRIBUTING.md) document goes into detail on the format of t
 
 The file [`quirks/change-password-URLs.json`](quirks/change-password-URLs.json) contains a JSON object mapping domains to URLs where users can change their password. This is the quirks version of the [Well Known URL for Changing Passwords](https://github.com/w3c/webappsec-change-password-url). If a website adopts the Change Password URL, it should be removed from this list.
 
+### Apple App IDs to Domains that Share Credentials
+
+The file [`apple-appIDs-to-domains-shared-credentials.json`](quirks/apple-appIDs-to-domains-shared-credentials.json) expresses relationships between apps running on macOS, iOS, and iPadOS, and domains that use the same credentials. Information in this file is used by iOS and iPadOS (since version 17.4) and macOS (since version 14.4) for suggesting credentials in apps that do not have an [association with domains](https://developer.apple.com/documentation/xcode/supporting-associated-domains). The system AutoFill capability makes use of this information to improve the user experience of signing into these apps by giving users inline suggestions of the appropriate credentials when signing in. This works for all password managers that make use of the [Credential Provider Extension](https://support.apple.com/guide/security/credential-provider-extensions-sec6319ac7b9/web) mechanism.
+
+The JSON file is a map from [App Identifier](https://developer.apple.com/help/account/manage-identifiers/register-an-app-id/) to an array of domains. Domains should be ordered by prominence from most prominent to least. The apps do not need to be distributed on Apple's App Store.
+
+### Web Browser Extension Distribution Information
+
+The file [`web-browser-extension-distribution-information.json`](quirks/web-browser-extension-distribution-information.json) expresses relationships between web browsers and web browser extension storefronts.
+
+This information may be useful to any password manager with a web browser extension for the purpose of discovering installed web browsers where a user may want to install the password manager's extension.
+
+Information in this file is re-packaged by Apple for use in macOS Sequoia version 15.1 and above to limit the [Native Messaging Host](https://developer.chrome.com/docs/extensions/develop/concepts/native-messaging) of the iCloud Passwords extension to only communicate with known web browsers.
+
 ### Websites Where 2FA Code is Appended to Password
 
-The file [`quirks/websites-that-append-2fa-to-password.json`](quirks/websites-that-append-2fa-to-password.json) contains a JSON array of domains which use a two-factor authentication scheme where the user must append a generated code to their password when signing in. This list of websites could be used to prevent auto-submission of signin forms, allowing the user to append the 2FA code without frustration. It can also be used to suppress prompting to update a saved password when the submitted password is prefixed by the already-stored password.
+The file [`quirks/websites-that-append-2fa-to-password.json`](quirks/websites-that-append-2fa-to-password.json) contains a JSON array of domains which use a two-factor authentication scheme where the user must append a generated code to their password when signing in. This list of websites could be used to prevent auto-submission of sign-in forms, allowing the user to append the 2FA code without frustration. It can also be used to suppress prompting to update a saved password when the submitted password is prefixed by the already-stored password.
+
+### Websites That Ask for Credentials for Other Services When Embedded as Third-party
+
+The file [`quirks/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party.json`](websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party.json) contains a JSON array of domains that, when embedded as a third party, are known to ask for credentials for other services. For example, some payment processors conduct transactions by being embedded in an `<iframe>` on a website. These payment processors may ask for banking credentials directly, without using OAuth.
+
+A password manager may wish to not offer to save a new password submitted in such an `<iframe>`, because the credentials are likely to not be for the service itself.
 
 ## Contributing
 
diff --git a/quirks/apple-appIDs-to-domains-shared-credentials.json b/quirks/apple-appIDs-to-domains-shared-credentials.json
new file mode 100644
index 000000000..24d9ae538
--- /dev/null
+++ b/quirks/apple-appIDs-to-domains-shared-credentials.json
@@ -0,0 +1,79 @@
+{
+    "P7SDVXUZPK.com.etrade.mobileproiphone": [
+        "etrade.com"
+    ],
+    "PPTA7G59L3.com.kpcu.architectmobile": [
+        "kpcu.com"
+    ],
+    "KPSFBM8T3Z.com.optum.mobile.OptumBank": [
+        "myuhc.com"
+    ],
+    "KPSFBM8T3Z.com.optumhealth.mobile.OptumRX": [
+        "myuhc.com"
+    ],
+    "UF8VKHMLML.com.uhg.mobile.uhc": [
+        "myuhc.com"
+    ],
+    "LJU5B5SR84.com.educationalccu.mobile": [
+        "onlinebank.com"
+    ],
+    "T5W6CQA35T.com.fis.447iPhoneSUB": [
+        "cit.com"
+    ],
+    "L6F2ZQ2MJV.com.metlife.us.business": [
+        "access.online.metlife.com",
+        "identity.metlife.com"
+    ],
+    "QDZLSW3Z22.com.leviton.home": [
+        "leviton.com"
+    ],
+    "3976U676H6.com.allegion.sense.store": [
+        "schlage.com"
+    ],
+    "G4K4BQ7S8J.com.backblaze.BzBackupBrowser": [
+        "backblaze.com"
+    ],
+    "J983T9Z6T6.com.birdbuddy.app": [
+        "mybirdbuddy.com"
+    ],
+    "M3Q8QUH343.com.getmysa.mysa": [
+        "getmysa.com"
+    ],
+    "ZRZ3QJN79B.com.dyson.dysonlink": [
+        "dyson.com"
+    ],
+    "com.backblaze.BackblazeDownloader": [
+        "backblaze.com"
+    ],
+    "K65HQ235M5.org.sutterhealth.myhealthonline": [
+        "sutterhealth.org"
+    ],
+    "T9984LC44E.com.whisker.ios": [
+        "litter-robot.com"
+    ],
+    "K832E2UXV7.com.riotgames.mobile.leagueconnect": [
+        "riotgames.com"
+    ],
+    "GN78YB727N.com.namecheap.iosapp": [
+        "namecheap.com"
+    ],
+    "8MQ82YZW32.com.travefy.go": [
+        "travefy.com"
+    ],
+    "39FN7MD5NR.com.elation.patientpassport": [
+        "elationpassport.com"
+    ],
+    "XUD5XM3X2G.com.vail.EpicMix": [
+        "epicpass.com"
+    ],
+    "UPS7472725.com.metrolinx.presto.ios.consumerapp": [
+        "prestocard.ca"
+    ],
+    "PX369MG78T.com.dmdbrands.balancehealth": [
+        "greatergoods.com"
+    ],
+    "498RNR3HN7.com.tdbank.iphoneapp": [
+        "td.com",
+        "tdbank.com"
+    ]
+}
diff --git a/quirks/change-password-URLs.json b/quirks/change-password-URLs.json
index c7d2ef47d..8c38f7010 100644
--- a/quirks/change-password-URLs.json
+++ b/quirks/change-password-URLs.json
@@ -7,19 +7,42 @@
     "aarp.org": "https://secure.aarp.org/account/editaccount?request_locale=en&nu=t",
     "account.magento.com": "https://account.magento.com/customer/account/changepassword",
     "account.publishing.service.gov.uk": "https://www.account.publishing.service.gov.uk/account/edit/password",
+    "accounts.panic.com": "https://accounts.panic.com/password_set",
+    "acehardware.com": "https://www.acehardware.com/myaccount#settings",
     "acorns.com": "https://app.acorns.com/settings/change-password",
+    "adafruit.com": "https://accounts.adafruit.com/settings/password",
     "adobe.com": "https://account.adobe.com/security",
     "adultfriendfinder.com": "https://adultfriendfinder.com/p/update.cgi?p=my_account_update_account_password",
     "ae.com": "https://www.ae.com/myaccount",
+    "aeon.co.jp": "https://www.aeon.co.jp/app/settings/profile/password/",
     "aerlingus.com": "https://www.aerlingus.com/html/user-profile.html",
     "aesop.com": "https://www.aesop.com/my-account",
     "airnewzealand.com": "https://www.airnewzealand.com/membership/profile/security/password",
     "alaskaair.com": "https://www.alaskaair.com/www2/ssl/myalaskaair/myalaskaair.aspx?view=myinformation&tab=email",
     "aliexpress.com": "https://login.aliexpress.com/",
+    "allegro.pl": "https://allegro.pl/moje-allegro/moje-konto/logowanie-i-haslo",
     "alliantcreditunion.com": "https://www.alliantcreditunion.com/OnlineBanking/Settings/AccessAndSecurity/ChangePassword.aspx",
     "allianz.com.br": "https://www.allianz.com.br/alteracao-de-password-ecliente",
     "allrecipes.com": "https://www.allrecipes.com/account/profile#/change-password",
     "alternate.de": "https://www.alternate.de/html/myAccount/account/basicData.html",
+    "amazon.ae": "https://www.amazon.ae/ax/account/manage",
+    "amazon.ca": "https://www.amazon.ca/ax/account/manage",
+    "amazon.co.uk": "https://www.amazon.co.uk/ax/account/manage",
+    "amazon.com": "https://www.amazon.com/ax/account/manage",
+    "amazon.com.au": "https://www.amazon.com.au/ax/account/manage",
+    "amazon.com.br": "https://www.amazon.com.br/ax/account/manage",
+    "amazon.com.mx": "https://www.amazon.com.mx/ax/account/manage",
+    "amazon.com.tr": "https://www.amazon.com.tr/ax/account/manage",
+    "amazon.de": "https://www.amazon.de/ax/account/manage",
+    "amazon.es": "https://www.amazon.es/ax/account/manage",
+    "amazon.fr": "https://www.amazon.fr/ax/account/manage",
+    "amazon.in": "https://www.amazon.in/ax/account/manage",
+    "amazon.it": "https://www.amazon.it/ax/account/manage",
+    "amazon.nl": "https://www.amazon.nl/ax/account/manage",
+    "amazon.pl": "https://www.amazon.pl/ax/account/manage",
+    "amazon.sa": "https://www.amazon.sa/ax/account/manage",
+    "amazon.se": "https://www.amazon.se/ax/account/manage",
+    "amazon.sg": "https://www.amazon.sg/ax/account/manage",
     "amctheatres.com": "https://www.amctheatres.com/amcstubs/account",
     "americanexpress.com": "https://www.americanexpress.com/en-us/account/password/reset",
     "ana.co.jp": "https://cam.ana.co.jp/psz/us/amc_us.jsp?index=105",
@@ -52,6 +75,7 @@
     "bestbuy.com": "https://www.bestbuy.com/identity/accountSettings/page/password",
     "biblegateway.com": "https://www.biblegateway.com/user/account/",
     "birkenstock.com": "https://www.birkenstock.com/profile",
+    "blackwells.co.uk": "https://blackwells.co.uk/bookshop/account/personal-details",
     "blend.io": "https://blend.io/settings",
     "blockchain.com": "https://login.blockchain.com/en/#/security-center/advanced",
     "bloomberg.com": "https://www.bloomberg.com/portal/account",
@@ -93,6 +117,8 @@
     "crackle.com": "https://www.crackle.com/profile",
     "craigslist.org": "https://accounts.craigslist.org/pass",
     "creditkarma.com": "https://www.creditkarma.com/myprofile/security",
+    "credly.com": "https://www.credly.com/earner/settings/privacy",
+    "crowdin.com": "https://accounts.crowdin.com/password/change",
     "crunchyroll.com": "https://www.crunchyroll.com/resetpw",
     "cvs.com": "https://www.cvs.com/my-account/profile/sign-in-and-security/edit-password",
     "dailymail.co.uk": "https://www.dailymail.co.uk/registration/profile/change-password.html",
@@ -112,12 +138,12 @@
     "doordash.com": "https://www.doordash.com/accounts/password/reset/",
     "dropbox.com": "https://www.dropbox.com/account/security",
     "dsw.com": "https://www.dsw.com/en/us/profile",
+    "duolingo.com": "https://duolingo.com/settings/profile",
     "dwr.com": "https://www.dwr.com/profile",
     "ea.com": "https://myaccount.ea.com/cp-ui/security/index",
     "ebay.com": "https://accounts.ebay.com/acctsec/security-center/chngpwd",
     "eporner.com": "https://www.eporner.com/profile/mturk_eporn/my/edit-pass/",
     "espn.com": "https://www.espn.com/",
-    "etsy.com": "https://www.etsy.com/your/account?ref=hdr_user_menu-settings",
     "eventbrite.com": "https://www.eventbrite.com/account-settings/password",
     "evite.com": "https://www.evite.com/reset_password/",
     "expedia.com": "https://www.expedia.com/user/forgotpassword",
@@ -202,9 +228,11 @@
     "mlb.com": "https://www.mlb.com/account/general",
     "msn.com": "https://account.live.com/password/change?refd=account.microsoft.com&fref=home.banner.changepwd",
     "music.youtube.com": "https://myaccount.google.com/signinoptions/password",
+    "my.goabode.com": "https://my.goabode.com/#/app/account",
     "myaccount.ea.com": "https://myaccount.ea.com/cp-ui/security/index",
     "myaccount.google.com": "https://myaccount.google.com/signinoptions/password",
     "myfreecams.com": "https://www.myfreecams.com/php/account.php?request=status&vcc=1674246522#change_password",
+    "mypay.dfas.mil": "https://mypay.dfas.mil/#/settings/password",
     "myshopify.com": "https://accounts.shopify.com/accounts/186490458/security",
     "naver.com": "https://nid.naver.com/user2/help/myInfo.nhn?m=viewChangePasswd",
     "nba.com": "https://www.nba.com/account/nbaprofile",
@@ -214,10 +242,12 @@
     "news.yahoo.com": "https://login.yahoo.com/myaccount/security/change-password/",
     "news.ycombinator.com": "https://news.ycombinator.com/changepw",
     "newsweek.com": "https://www.newsweek.com/contact",
+    "nextdns.io": "https://my.nextdns.io/account",
     "nfl.com": "https://id.nfl.com/account/change-password",
     "nhentai.net": "https://nhentai.net/reset/",
     "nike.com": "https://www.nike.com/member/settings",
     "nintendo.com": "https://accounts.nintendo.com/password/edit",
+    "njal.la": "https://njal.la/settings",
     "nordstrom.com": "https://www.nordstrom.com/my-account/sign-in-info",
     "nordstromrack.com": "https://www.nordstromrack.com/my-account/sign-in-info",
     "npr.org": "https://secure.npr.org/oauth2/login",
@@ -238,6 +268,7 @@
     "pearson.com": "https://www.pearson.com/store/en-us/my-account/update-password",
     "pilotflyingj.com": "https://portal.pilotflyingj.com/myrewards/forgot-password",
     "pinterest.com": "https://www.pinterest.com/settings/account-settings",
+    "pl.canalplus.com": "https://logowanie.pl.canalplus.com/zmien-haslo",
     "playstation.com": "https://id.sonyentertainmentnetwork.com/id/management/#/p/security",
     "plex.tv": "https://app.plex.tv/desktop#!/account",
     "politico.com": "https://www.politico.com/settings",
@@ -247,7 +278,7 @@
     "poshmark.com": "https://poshmark.com/user/account-info",
     "ppomppu.co.kr": "https://www.ppomppu.co.kr/myinfo/profile.php",
     "prolific.co": "https://app.prolific.co/account/general",
-    "protonmail.com": "https://mail.protonmail.com/account",
+    "proton.me": "https://account.proton.me/u/0/vpn/account-password",
     "prowlapp.com": "https://www.prowlapp.com/settings.php",
     "quizlet.com": "https://quizlet.com/settings",
     "quora.com": "https://www.quora.com/settings",
@@ -324,6 +355,7 @@
     "trulia.com": "https://www.trulia.com/account/user_profile",
     "tum.de": "https://campus.tum.de",
     "tumblr.com": "https://www.tumblr.com/settings/account",
+    "turkishairlines.com": "https://www.turkishairlines.com/tr-int/miles-and-smiles/forgot-password/",
     "twilio.com": "https://www.twilio.com/console/user/settings",
     "twitch.tv": "https://www.twitch.tv/settings/security",
     "twitter.com": "https://twitter.com/settings/password",
diff --git a/quirks/password-rules.json b/quirks/password-rules.json
index 41f66fcaa..6ed669d3d 100644
--- a/quirks/password-rules.json
+++ b/quirks/password-rules.json
@@ -8,12 +8,21 @@
     "access.service.gov.uk": {
         "password-rules": "minlength: 10; required: lower; required: upper; required: digit; required: special;"
     },
+    "account.samsung.com": {
+        "password-rules": "minlength: 8; maxlength: 15; required: digit; required: special; required: upper,lower;"
+    },
     "admiral.com": {
         "password-rules": "minlength: 8; required: digit; required: [- !\"#$&'()*+,.:;<=>?@[^_`{|}~]]; allowed: lower, upper;"
     },
     "ae.com": {
         "password-rules": "minlength: 8; maxlength: 25; required: lower; required: upper; required: digit;"
     },
+    "aeon.co.jp": {
+        "password-rules": "minlength: 8; maxlength: 8; max-consecutive: 3; required: digit; required: upper,lower,[#$+./:=?@[^_|~]];"
+    },
+    "aeromexico.com": {
+        "password-rules": "minlength: 8; maxlength: 25; required: lower; required: upper; required: digit;"
+    },
     "aetna.com": {
         "password-rules": "minlength: 8; maxlength: 20; max-consecutive: 2; required: upper; required: digit; allowed: lower, [-_&#@];"
     },
@@ -41,6 +50,9 @@
     "americanexpress.com": {
         "password-rules": "minlength: 8; maxlength: 20; max-consecutive: 4; required: lower, upper; required: digit; allowed: [%&_?#=];"
     },
+    "ana.co.jp": {
+        "password-rules": "minlength: 8; maxlength: 16; required: digit; required: upper,lower;"
+    },
     "anatel.gov.br": {
         "password-rules": "minlength: 6; maxlength: 15; allowed: lower, upper, digit;"
     },
@@ -53,6 +65,9 @@
     "anthem.com": {
         "password-rules": "minlength: 8; maxlength: 20; max-consecutive: 3; required: lower, upper; required: digit; allowed: [!$*?@|];"
     },
+    "app.digiboxx.com": {
+        "password-rules": "minlength: 8; maxlength: 14; required: lower; required: upper; required: digit; required: [@$!%*?&];"
+    },
     "app.digio.in": {
         "password-rules": "minlength: 8; maxlength: 15;"
     },
@@ -62,6 +77,9 @@
     "apple.com": {
         "password-rules": "minlength: 8; maxlength: 63; required: lower; required: upper; required: digit; allowed: ascii-printable;"
     },
+    "appleloan.citizensbank.com": {
+        "password-rules": "minlength: 10; maxlength: 20; max-consecutive: 2; required: lower; required: upper; required: digit; required: [!#$%@^_];"
+    },
     "areariservata.bancaetica.it": {
         "password-rules": "minlength: 8; maxlength: 10; required: lower; required: upper; required: digit; required: [!#&*+/=@_];"
     },
@@ -122,6 +140,9 @@
     "bitly.com": {
         "password-rules": "minlength: 6; required: lower; required: upper; required: digit; required: [`!@#$%^&*()+~{}'\";:<>?]];"
     },
+    "blackwells.co.uk": {
+        "password-rules": "minlength: 8; maxlength: 30; allowed: upper,lower,digit;"
+    },
     "bloomingdales.com": {
         "password-rules": "minlength: 7; maxlength: 16; required: lower, upper; required: digit; required: [`!@#$%^&*()+~{}'\";:<>?]];"
     },
@@ -134,6 +155,9 @@
     "box.com": {
         "password-rules": "minlength: 6; maxlength: 20; required: lower; required: upper; required: digit; required: digit;"
     },
+    "bpl.bibliocommons.com": {
+        "password-rules": "minlength: 4; maxlength: 4; required: digit;"
+    },
     "brighthorizons.com": {
         "password-rules": "minlength: 8; maxlength: 16;"
     },
@@ -150,7 +174,7 @@
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: [!#$%&*?@_];"
     },
     "cb2.com": {
-        "password-rules": "minlength: 7; maxlength: 18; required: lower, upper; required: digit;"
+        "password-rules": "minlength: 9; required: lower, upper; required: digit; required: [!#*_%.$];"
     },
     "ccs-grp.com": {
         "password-rules": "minlength: 8; maxlength: 16; required: digit; required: upper,lower; allowed: [-!#$%&'+./=?\\^_`{|}~];"
@@ -158,6 +182,9 @@
     "cecredentialtrust.com": {
         "password-rules": "minlength: 12; required: lower; required: upper; required: digit; required: [!#$%&*@^];"
     },
+    "charlie.mbta.com": {
+        "password-rules": "minlength: 10; required: lower; required: upper; required: digit; required: [!#$%@^];"
+    },
     "chase.com": {
         "password-rules": "minlength: 8; maxlength: 32; max-consecutive: 2; required: lower, upper; required: digit; required: [!#$%+/=@~];"
     },
@@ -170,15 +197,24 @@
     "claimlookup.com": {
         "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; required: [@#$%^&+=!];"
     },
+    "clarksoneyecare.com": {
+        "password-rules": "minlength: 9; allowed: lower; required: upper; required: digit; required: [~!@#$%^&*()_+{}|;,.<>?[]];"
+    },
     "claro.com.br": {
         "password-rules": "minlength: 8; required: lower; allowed: upper, digit, [-!@#$%&*_+=<>];"
     },
     "classmates.com": {
         "password-rules": "minlength: 6; maxlength: 20; allowed: lower, upper, digit, [!@#$%^&*];"
     },
+    "clegc-gckey.gc.ca": {
+        "password-rules": "minlength: 8; maxlength: 16; required: lower, upper, digit;"
+    },
     "clien.net": {
         "password-rules": "minlength: 5; required: lower, upper; required: digit;"
     },
+    "cogmembers.org": {
+        "password-rules": "minlength: 8; maxlength: 14; required: upper; required: digit; allowed: lower;"
+    },
     "collectivehealth.com": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit;"
     },
@@ -198,7 +234,7 @@
         "password-rules": "minlength: 6; maxlength: 15; allowed: lower, upper, digit, [-.];"
     },
     "costco.com": {
-        "password-rules": "minlength: 8; maxlength: 20; required: lower, upper; allowed: digit, [-!#$%&'()*+/:;=?@[^_`{|}~]];"
+        "password-rules": "minlength: 8; maxlength: 16; required: lower, upper; allowed: digit, [-!#$%&'()*+/:;=?@[^_`{|}~]];"
     },
     "coursera.com": {
         "password-rules": "minlength: 8; maxlength: 72;"
@@ -248,6 +284,9 @@
     "dmm.com": {
         "password-rules": "minlength: 4; maxlength: 16; required: lower; required: upper; required: digit;"
     },
+    "dodgeridge.com": {
+        "password-rules": "minlength: 8; maxlength: 12; required: lower; required: upper; required: digit;"
+    },
     "dowjones.com": {
         "password-rules": "maxlength: 15;"
     },
@@ -269,6 +308,9 @@
     "eddservices.edd.ca.gov": {
         "password-rules": "minlength: 8; maxlength: 12; required: lower; required: upper; required: digit; required: [!@#$%^&*()];"
     },
+    "edistrict.kerala.gov.in": {
+        "password-rules": "minlength: 5; maxlength: 15; required: lower; required: upper; required: digit; required: [!@#$];"
+    },
     "empower-retirement.com": {
         "password-rules": "minlength: 8; maxlength: 16;"
     },
@@ -309,7 +351,7 @@
         "password-rules": "minlength: 8; max-consecutive: 3; required: lower; required: upper; required: digit; allowed: [-!@#$%^&*_+=`|(){}[:;,.?]];"
     },
     "fidelity.com": {
-        "password-rules": "minlength: 6; maxlength: 20; required: lower; allowed: upper,digit,[!$%'()+,./:;=?@^_|~];"
+        "password-rules": "minlength: 6; maxlength: 20; required: lower; required: upper; required: digit; required: [-!$%+,./:;=?@^_|]; max-consecutive: 2;"
     },
     "flysas.com": {
         "password-rules": "minlength: 8; maxlength: 14; required: lower; required: upper; required: digit; required: [-~!@#$%^&_+=`|(){}[:\"'<>,.?]];"
@@ -323,6 +365,12 @@
     "gamestop.com": {
         "password-rules": "minlength: 8; maxlength: 225; required: lower; required: upper; required: digit; required: [!@#$%];"
     },
+    "gap.com": {
+        "password-rules": "minlength: 8; maxlength: 24; required: lower; required: upper; required: digit; required: [-!@#$%^&*()_+];"
+    },
+    "garmin.com": {
+        "password-rules": "minlength: 8; required: lower; required: upper; required: digit;"
+    },
     "getflywheel.com": {
         "password-rules": "minlength: 7; maxlength: 72;"
     },
@@ -332,6 +380,9 @@
     "gmx.net": {
         "password-rules": "minlength: 8; maxlength: 40; allowed: lower, upper, digit, [-<=>~!|()@#{}$%,.?^'&*_+`:;\"[]];"
     },
+    "gocurb.com": {
+        "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: [$%&#*?!@^];"
+    },
     "google.com": {
         "password-rules": "minlength: 8; allowed: lower, upper, digit, [-!\"#$%&'()*+,./:;<=>?@[^_{|}~]];"
     },
@@ -347,9 +398,147 @@
     "hawaiianairlines.com": {
         "password-rules": "maxlength: 16;"
     },
+    "hertz-japan.com": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz-kuwait.com": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz-saudi.com": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.at": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.be": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.bh": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.ca": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.ch": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.cn": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.ao": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.id": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.kr": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.nz": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.th": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.co.uk": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
     "hertz.com": {
         "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
     },
+    "hertz.com.au": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.bh": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.hk": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.kw": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.mt": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.pl": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.pt": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.sg": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.com.tw": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.cv": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.cz": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.de": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.ee": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.es": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.fi": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.fr": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.hu": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.ie": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.it": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.jo": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.lt": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.nl": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.no": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.nu": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.pl": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.pt": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.qa": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.ru": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.se": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertz.si": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
+    "hertzcaribbean.com": {
+        "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower; required: upper; required: digit; required: [#$%^&!@];"
+    },
     "hetzner.com": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit, special;"
     },
@@ -363,7 +552,7 @@
         "password-rules": "minlength: 8; maxlength: 15; required: lower; required: upper; required: digit; required: special;"
     },
     "hotels.com": {
-        "password-rules": "minlength: 6; maxlength: 20; required: digit; allowed: lower, upper, [@$!#()&^*%];"
+        "password-rules": "minlength: 6; maxlength: 20; required: digit; required: [-~#@$%&!*_?^]; allowed: lower, upper;"
     },
     "hotwire.com": {
         "password-rules": "minlength: 6; maxlength: 30; allowed: lower, upper, digit, [-~!@#$%^&*_+=`|(){}[:;\"'<>,.?]];"
@@ -383,9 +572,15 @@
     "hyresbostader.se": {
         "password-rules": "minlength: 6; maxlength: 20; required: lower, upper; required: digit;"
     },
+    "ichunqiu.com": {
+        "password-rules": "minlength: 8; maxlength: 20; required: lower; required: upper; required: digit;"
+    },
     "id.sonyentertainmentnetwork.com": {
         "password-rules": "minlength: 8; maxlength: 30; required: lower, upper; required: digit; allowed: [-!@#^&*=+;:];"
     },
+    "identity.codesignal.com": {
+        "password-rules": "minlength: 14; required: digit; required: lower, upper; required: [!#$%&*@^]"
+    },
     "identitytheft.gov": {
         "password-rules": "allowed: lower, upper, digit, [!#%&*@^];"
     },
@@ -428,6 +623,9 @@
     "kfc.ca": {
         "password-rules": "minlength: 6; maxlength: 15; required: lower; required: upper; required: digit; required: [!@#$%&?*];"
     },
+    "kiehls.com": {
+        "password-rules": "minlength: 8; maxlength: 25; required: lower; required: upper; required: digit; required: [!#$%&?@];"
+    },
     "klm.com": {
         "password-rules": "minlength: 8; maxlength: 12;"
     },
@@ -455,6 +653,9 @@
     "lg.com": {
         "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; allowed: [-!#$%&'()*+,.:;=?@[^_{|}~]];"
     },
+    "linearity.io": {
+        "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: special;"
+    },
     "live.com": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit; allowed: [-@_#!&$`%*+()./,;~:{}|?>=<^'[]];"
     },
@@ -500,6 +701,9 @@
     "microsoft.com": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: special;"
     },
+    "milogin.michigan.gov": {
+        "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: [@#$!~&];"
+    },
     "mintmobile.com": {
         "password-rules": "minlength: 8; maxlength: 20; required: lower; required: upper; required: digit; required: special; allowed: [!#$%&()*+:;=@[^_`{}~]];"
     },
@@ -524,6 +728,12 @@
     "myhealthrecord.com": {
         "password-rules": "minlength: 8; maxlength: 20; allowed: lower, upper, digit, [_.!$*=];"
     },
+    "mypay.dfas.mil": {
+        "password-rules": "minlength: 9; maxlength: 30; required: lower; required: upper; required: digit; required: [#@$%^!*+=_];"
+    },
+    "mysavings.breadfinancial.com": {
+        "password-rules": "minlength: 8; maxlength: 25; required: lower; required: upper; required: digit; required: [+_%@!$*~];"
+    },
     "mysedgwick.com": {
         "password-rules": "minlength: 8; maxlength: 16; allowed: lower; required: upper; required: digit; required: [@#%^&+=!]; allowed: [-~_$.,;]"
     },
@@ -605,6 +815,9 @@
     "prestocard.ca": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit,[!\"#$%&'()*+,<>?@];"
     },
+    "pret.com": {
+        "password-rules": "minlength: 12; required: lower; required: digit; required: [@$!%*#?&]; allowed: upper;"
+    },
     "propelfuels.com": {
         "password-rules": "minlength: 6; maxlength: 16;"
     },
@@ -701,6 +914,9 @@
     "store.steampowered.com": {
         "password-rules": "minlength: 6; required: lower; required: upper; required: digit; allowed: [~!@#$%^&*];"
     },
+    "subscribe.free.fr": {
+        "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; required: [!#&()*+/@[_]];"
+    },
     "successfactors.eu": {
         "password-rules": "minlength: 8; maxlength: 18; required: lower; required: upper; required: digit,[-!\"#$%&'()*+,.:;<=>?@[^_`{|}~]];"
     },
@@ -716,6 +932,9 @@
     "target.com": {
         "password-rules": "minlength: 8; maxlength: 20; required: lower, upper; required: digit, [-!\"#$%&'()*+,./:;=?@[\\^_`{|}~];"
     },
+    "tdscpc.gov.in": {
+        "password-rules": "minlength: 8; maxlength: 15; required: lower; required: upper; required: digit; required: [ &',;\"];"
+    },
     "telekom-dienste.de": {
         "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; required: [#$%&()*+,./<=>?@_{|}~];"
     },
@@ -731,6 +950,9 @@
     "treasurer.mo.gov": {
         "password-rules": "minlength: 8; maxlength: 26; required: lower; required: upper; required: digit; required: [!#$&];"
     },
+    "turkishairlines.com": {
+        "password-rules": "minlength: 6; maxlength: 6; required: digit; max-consecutive: 3;"
+    },
     "twitch.tv": {
         "password-rules": "minlength: 8; maxlength: 71;"
     },
@@ -743,6 +965,12 @@
     "udel.edu": {
         "password-rules": "minlength: 12; maxlength: 30; required: lower; required: upper; required: digit; required: [!@#$%^&*()+];"
     },
+    "umterps.evenue.net": {
+        "password-rules": "minlength: 14; required: digit; required: upper; required: lower; required: [-~!@#$%^&*_+=`|(){}:;];"
+    },
+    "unito.it": {
+        "password-rules": "minlength: 8; required: upper; required: lower; required: digit; required: [-!?+*/:;'\"{}()@£$%&=^#[]];"
+    },
     "user.ornl.gov": {
         "password-rules": "minlength: 8; maxlength: 30; max-consecutive: 3; required: lower, upper; required: digit; allowed: [!#$%./_];"
     },
@@ -764,6 +992,9 @@
     "vetsfirstchoice.com": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit; allowed: [?!@$%^+=&];"
     },
+    "vince.com": {
+        "password-rules": "minlength: 8; required: digit; required: lower; required: upper; required: [$%/(){}=?!.,_*|+~#[]];"
+    },
     "virginmobile.ca": {
         "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: [!#$@];"
     },
@@ -776,6 +1007,9 @@
     "vivo.com.br": {
         "password-rules": "maxlength: 6; max-consecutive: 3; allowed: digit;"
     },
+    "volaris.com": {
+        "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; required: special;"
+    },
     "wa.aaa.com": {
         "password-rules": "minlength: 8; maxlength: 16; required: lower; required: upper; required: digit; allowed: ascii-printable;"
     },
@@ -806,6 +1040,9 @@
     "wmata.com": {
         "password-rules": "minlength: 8; required: lower, upper; required: digit; required: digit; required: [-!@#$%^&*~/\"()_=+\\|,.?[]];"
     },
+    "worldstrides.com": {
+        "password-rules": "minlength: 8; required: lower; required: upper; required: digit; required: [-!#$%&*+=?@^_~];"
+    },
     "wsj.com": {
         "password-rules": "minlength: 5; maxlength: 15; required: digit; allowed: lower, upper, [-~!@#$^*_=`|(){}[:;\"'<>,.?]];"
     },
diff --git a/quirks/schemas/apple-appIDs-to-domains-shared-credentials-schema.json b/quirks/schemas/apple-appIDs-to-domains-shared-credentials-schema.json
new file mode 100644
index 000000000..251ba6283
--- /dev/null
+++ b/quirks/schemas/apple-appIDs-to-domains-shared-credentials-schema.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "additionalProperties": {
+    "type": "array",
+    "items": {
+      "type": "string"
+    }
+  }
+}
\ No newline at end of file
diff --git a/quirks/schemas/web-browser-extension-distribution-information-schema.json b/quirks/schemas/web-browser-extension-distribution-information-schema.json
new file mode 100644
index 000000000..761932121
--- /dev/null
+++ b/quirks/schemas/web-browser-extension-distribution-information-schema.json
@@ -0,0 +1,92 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "properties": {
+    "extension_storefronts": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "identifier": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "name",
+          "url",
+          "identifier"
+        ]
+      }
+    },
+    "web_browsers": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "long_name": {
+            "type": "string"
+          },
+          "short_name": {
+            "type": "string"
+          },
+          "supported_platforms": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "platform_specific_information": {
+            "type": "object",
+            "properties": {
+              "Mac": {
+                "type": "object",
+                "properties": {
+                  "bundle_identifier": {
+                    "type": "string"
+                  },
+                  "code_signing_identifier": {
+                    "type": "string"
+                  },
+                  "code_signing_team_identifier": {
+                    "type": "string"
+                  },
+                  "extensions_install_path_relative_to_user_library_directory": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "bundle_identifier",
+                  "code_signing_identifier",
+                  "code_signing_team_identifier"
+                ]
+              }
+            }
+          },
+          "supported_store_identifiers": {
+            "type": "array",
+            "items": {
+              "type": "integer"
+            }
+          }
+        },
+        "required": [
+          "long_name",
+          "short_name",
+          "supported_platforms",
+          "platform_specific_information",
+          "supported_store_identifiers"
+        ]
+      }
+    }
+  },
+  "required": [
+    "extension_storefronts",
+    "web_browsers"
+  ]
+}
diff --git a/quirks/schemas/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party-schema.json b/quirks/schemas/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party-schema.json
new file mode 100644
index 000000000..a1d43336d
--- /dev/null
+++ b/quirks/schemas/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party-schema.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "array",
+  "uniqueItems": true,
+  "items": {
+    "type": "string"
+  }
+}
diff --git a/quirks/shared-credentials-historical.json b/quirks/shared-credentials-historical.json
index 99c4845ad..7b21376a7 100644
--- a/quirks/shared-credentials-historical.json
+++ b/quirks/shared-credentials-historical.json
@@ -43,8 +43,7 @@
             "amazon.sa",
             "amazon.sg",
             "amazon.se",
-            "amazon.pl",
-            "ring.com"
+            "amazon.pl"
         ]
     },
     {
@@ -250,6 +249,12 @@
             "fidelityinvestments.com"
         ]
     },
+    {
+        "shared": [
+            "flyingblue.com",
+            "klm.com"
+        ]
+    },
     {
         "shared": [
             "fnac.com",
@@ -363,7 +368,8 @@
             "office.com",
             "skype.com",
             "onenote.com",
-            "hotmail.com"
+            "hotmail.com",
+            "azure.com"
         ]
     },
     {
@@ -554,12 +560,6 @@
             "superuser.com"
         ]
     },
-    {
-        "shared": [
-            "steampowered.com",
-            "steamcommunity.com"
-        ]
-    },
     {
         "shared": [
             "telekom-dienste.de",
@@ -584,6 +584,12 @@
             "tplinkcloud.com"
         ]
     },
+    {
+        "shared": [
+            "turkishairlines.com",
+            "thy.com"
+        ]
+    },
     {
         "shared": [
             "ubi.com",
@@ -664,12 +670,6 @@
             "dowjones.com"
         ]
     },
-    {
-        "shared": [
-            "yahoo.com",
-            "flickr.com"
-        ]
-    },
     {
         "shared": [
             "zixmail.net",
diff --git a/quirks/shared-credentials.json b/quirks/shared-credentials.json
index d2a527673..64644bc3a 100644
--- a/quirks/shared-credentials.json
+++ b/quirks/shared-credentials.json
@@ -92,6 +92,12 @@
             "vons.com"
         ]
     },
+    {
+        "shared": [
+            "ana.co.jp",
+            "astyle.jp"
+        ]
+    },
     {
         "from": [
             "angel.co"
@@ -116,6 +122,14 @@
         ],
         "fromDomainsAreObsoleted": true
     },
+    {
+        "shared": [
+            "bgg.cc",
+            "boardgamegeek.com",
+            "rpggeek.com",
+            "videogamegeek.com"
+        ]
+    },
     {
         "shared": [
             "centralfcu.org",
@@ -150,6 +164,15 @@
             "discord.store"
         ]
     },
+    {
+        "from": [
+            "discovercard.com"
+        ],
+        "to": [
+            "discover.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "shared": [
             "disney.com",
@@ -161,6 +184,12 @@
             "shopdisney.com"
         ]
     },
+    {
+        "shared": [
+            "dnt.abine.com",
+            "ironvest.com"
+        ]
+    },
     {
         "shared": [
             "drivethrucards.com",
@@ -231,6 +260,15 @@
             "eventbrite.sg"
         ]
     },
+    {
+        "from": [
+            "fancourier.ro"
+        ],
+        "to": [
+            "selfawb.ro"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "from": [
             "flyblade.com"
@@ -240,6 +278,16 @@
         ],
         "fromDomainsAreObsoleted": true
     },
+    {
+        "from": [
+            "gazduire.com.ro",
+            "gazduire.net"
+        ],
+        "to": [
+            "admin.ro"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "from": [
             "hbo.com",
@@ -290,6 +338,49 @@
             "tum.edu"
         ]
     },
+    {
+        "from": [
+            "mercadolibre.cl",
+            "mercadolibre.co.cr",
+            "mercadolibre.com.ar",
+            "mercadolibre.com.bo",
+            "mercadolibre.com.co",
+            "mercadolibre.com.do",
+            "mercadolibre.com.ec",
+            "mercadolibre.com.gt",
+            "mercadolibre.com.hn",
+            "mercadolibre.com.mx",
+            "mercadolibre.com.ni",
+            "mercadolibre.com.pa",
+            "mercadolibre.com.pe",
+            "mercadolibre.com.py",
+            "mercadolibre.com.sv",
+            "mercadolibre.com.uy",
+            "mercadolibre.com.ve",
+            "mercadopago.cl",
+            "mercadopago.com.ar",
+            "mercadopago.com.co",
+            "mercadopago.com.ec",
+            "mercadopago.com.mx",
+            "mercadopago.com.pe",
+            "mercadopago.com.uy",
+            "mercadopago.com.ve"
+        ],
+        "to": [
+            "mercadolibre.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
+    {
+        "from": [
+            "mercadolivre.com.br",
+            "mercadopago.com.br"
+        ],
+        "to": [
+            "mercadolivre.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "from": [
             "moneybird.nl",
@@ -310,6 +401,15 @@
         ],
         "fromDomainsAreObsoleted": true
     },
+    {
+        "from": [
+            "nextinpact.com"
+        ],
+        "to": [
+            "next.ink"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "from": [
             "nordvpn.com",
@@ -319,6 +419,23 @@
             "nordaccount.com"
         ]
     },
+    {
+        "from": [
+            "overstock.com"
+        ],
+        "to": [
+            "bedbathandbeyond.com"
+        ]
+    },
+    {
+        "from": [
+            "parkmobile.us"
+        ],
+        "to": [
+            "parkmobile.io"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "shared": [
             "pinterest.com",
@@ -357,11 +474,78 @@
         ]
     },
     {
-        "shared":[
+        "shared": [
+            "quicken.com",
+            "simplifimoney.com"
+        ]
+    },
+    {
+        "from": [
+            "raywenderlich.com"
+        ],
+        "to": [
+            "kodeco.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
+    {
+        "shared": [
             "redis.com",
             "redislabs.com"
         ]
     },
+    {
+        "shared": [
+            "s.activision.com",
+            "profile.callofduty.com"
+        ]
+    },
+    {
+        "from": [
+            "scottscheapflights.com"
+        ],
+        "to": [
+            "going.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
+    {
+        "shared": [
+            "steampowered.com",
+            "steamcommunity.com"
+        ]
+    },
+    {
+        "shared": [
+            "taxhawk.com",
+            "freetaxusa.com",
+            "express1040.com"
+        ]
+    },
+    {
+        "from": [
+            "telegram.me"
+        ],
+        "to": [
+            "telegram.org"
+        ],
+        "fromDomainsAreObsoleted": false
+    },
+    {
+        "shared": [
+            "ting.com",
+            "tingmobile.com"
+        ]
+    },
+    {
+        "from": [
+            "transferwise.com"
+        ],
+        "to": [
+            "wise.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "from": [
             "tvnow.de",
@@ -375,12 +559,30 @@
         ],
         "fromDomainsAreObsoleted": false
     },
+    {
+        "from": [
+            "twitter.com"
+        ],
+        "to": [
+            "x.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "shared": [
             "uspowerboating.com",
             "ussailing.org"
         ]
     },
+    {
+        "from": [
+            "wacom.eu"
+        ],
+        "to": [
+            "wacom.com"
+        ],
+        "fromDomainsAreObsoleted": true
+    },
     {
         "shared": [
             "wikipedia.org",
diff --git a/quirks/web-browser-extension-distribution-information.json b/quirks/web-browser-extension-distribution-information.json
new file mode 100644
index 000000000..e72f7e23e
--- /dev/null
+++ b/quirks/web-browser-extension-distribution-information.json
@@ -0,0 +1,319 @@
+{
+    "extension_storefronts": [
+        {
+            "name": "Chrome Web Store",
+            "url": "https://chromewebstore.google.com/category/extensions",
+            "identifier": 1
+        },
+        {
+            "name": "Edge Add-ons",
+            "url": "https://microsoftedge.microsoft.com/addons",
+            "identifier": 2
+        },
+        {
+            "name": "Firefox Browser Add-ons",
+            "url": "https://addons.mozilla.org",
+            "identifier": 3
+        },
+        {
+            "name": "Opera Browser Add-ons",
+            "url": "https://addons.opera.com",
+            "identifier": 4
+        },
+        {
+            "name": "Mac App Store",
+            "url": "itms-apps://safariExtensions",
+            "identifier": 5
+        }
+    ],
+    "web_browsers": [
+        {
+            "long_name": "Google Chrome",
+            "short_name": "Chrome",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.google.Chrome",
+                    "code_signing_identifier": "com.google.Chrome",
+                    "code_signing_team_identifier": "EQHXZ8M8AV",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Google/Chrome/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Google Chrome Beta",
+            "short_name": "Chrome Beta",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.google.Chrome.beta",
+                    "code_signing_identifier": "com.google.Chrome.beta",
+                    "code_signing_team_identifier": "EQHXZ8M8AV",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Google/Chrome Beta/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Google Chrome Canary",
+            "short_name": "Chrome Canary",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.google.Chrome.canary",
+                    "code_signing_identifier": "com.google.Chrome.canary",
+                    "code_signing_team_identifier": "EQHXZ8M8AV",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Google/Chrome Canary/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Microsoft Edge",
+            "short_name": "Edge",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.microsoft.edgemac",
+                    "code_signing_identifier": "com.microsoft.edgemac",
+                    "code_signing_team_identifier": "UBF8T346G9",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Microsoft Edge/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                2
+            ]
+        },
+        {
+            "long_name": "Microsoft Edge Beta",
+            "short_name": "Edge Beta",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.microsoft.edgemac.Beta",
+                    "code_signing_identifier": "com.microsoft.edgemac.Beta",
+                    "code_signing_team_identifier": "UBF8T346G9",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Microsoft Edge Beta/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                2
+            ]
+        },
+        {
+            "long_name": "Microsoft Edge Dev",
+            "short_name": "Edge Dev",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.microsoft.edgemac.Dev",
+                    "code_signing_identifier": "com.microsoft.edgemac.Dev",
+                    "code_signing_team_identifier": "UBF8T346G9",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Microsoft Edge Dev/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                2
+            ]
+        },
+        {
+            "long_name": "Microsoft Edge Canary",
+            "short_name": "Edge Canary",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.microsoft.edgemac.Canary",
+                    "code_signing_identifier": "com.microsoft.edgemac.Canary",
+                    "code_signing_team_identifier": "UBF8T346G9",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Microsoft Edge Canary/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                2
+            ]
+        },
+        {
+            "long_name": "Mozilla Firefox",
+            "short_name": "Firefox",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "org.mozilla.firefox",
+                    "code_signing_identifier": "org.mozilla.firefox",
+                    "code_signing_team_identifier": "43AQ936H96"
+                }
+            },
+            "supported_store_identifiers": [
+                3
+            ]
+        },
+        {
+            "long_name": "Arc",
+            "short_name": "Arc",
+            "supported_platforms": [
+                "Mac"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "company.thebrowser.Browser",
+                    "code_signing_identifier": "company.thebrowser.Browser",
+                    "code_signing_team_identifier": "S6N382Y83G",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Arc/User Data/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Brave",
+            "short_name": "Brave",
+            "supported_platforms": [
+                "Mac"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.brave.Browser",
+                    "code_signing_identifier": "com.brave.Browser",
+                    "code_signing_team_identifier": "KL8N8XSYF4",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/BraveSoftware/Brave-Browser/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Vivaldi",
+            "short_name": "Vivaldi",
+            "supported_platforms": [
+                "Mac"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.vivaldi.Vivaldi",
+                    "code_signing_identifier": "com.vivaldi.Vivaldi",
+                    "code_signing_team_identifier": "4XF3XNRN6Y",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/Vivaldi/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                1
+            ]
+        },
+        {
+            "long_name": "Opera",
+            "short_name": "Opera",
+            "supported_platforms": [
+                "Mac",
+                "Windows",
+                "Linux"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.operasoftware.Opera",
+                    "code_signing_identifier": "com.operasoftware.Opera",
+                    "code_signing_team_identifier": "A2P9LX4JPN",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/com.operasoftware.Opera/Default/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                4,
+                1
+            ]
+        },
+        {
+            "long_name": "Opera GX",
+            "short_name": "Opera GX",
+            "supported_platforms": [
+                "Mac",
+                "Windows"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.operasoftware.OperaGX",
+                    "code_signing_identifier": "com.operasoftware.OperaGX",
+                    "code_signing_team_identifier": "A2P9LX4JPN",
+                    "extensions_install_path_relative_to_user_library_directory": "Application Support/com.operasoftware.OperaGX/Extensions"
+                }
+            },
+            "supported_store_identifiers": [
+                4,
+                1
+            ]
+        },
+        {
+            "long_name": "Apple Safari",
+            "short_name": "Safari",
+            "supported_platforms": [
+                "Mac"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.apple.Safari",
+                    "code_signing_identifier": "com.apple.Safari",
+                    "code_signing_team_identifier": ""
+                }
+            },
+            "supported_store_identifiers": [
+                5
+            ]
+        },
+        {
+            "long_name": "Apple Safari Technology Preview",
+            "short_name": "Safari Technology Preview",
+            "supported_platforms": [
+                "Mac"
+            ],
+            "platform_specific_information": {
+                "Mac": {
+                    "bundle_identifier": "com.apple.SafariTechnologyPreview",
+                    "code_signing_identifier": "com.apple.SafariTechnologyPreview",
+                    "code_signing_team_identifier": ""
+                }
+            },
+            "supported_store_identifiers": [
+                5
+            ]
+        }
+    ]
+}
diff --git a/quirks/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party.json b/quirks/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party.json
new file mode 100644
index 000000000..7de8b2153
--- /dev/null
+++ b/quirks/websites-that-ask-for-credentials-for-other-services-when-embedded-as-third-party.json
@@ -0,0 +1,5 @@
+[
+    "aeropay.com",
+    "aerosync.com",
+    "plaid.com"
+]
diff --git a/quirks/websites-with-shared-credential-backends.json b/quirks/websites-with-shared-credential-backends.json
index 0800a5268..ab300b3e1 100644
--- a/quirks/websites-with-shared-credential-backends.json
+++ b/quirks/websites-with-shared-credential-backends.json
@@ -119,8 +119,7 @@
         "amazon.sa",
         "amazon.sg",
         "amazon.se",
-        "amazon.pl",
-        "ring.com"
+        "amazon.pl"
     ],
     [
         "amcrestcloud.com",
@@ -136,6 +135,10 @@
         "ameritrade.com",
         "tdameritrade.com"
     ],
+    [
+        "ana.co.jp",
+        "astyle.jp"
+    ],
     [
         "angel.co",
         "wellfound.com"
@@ -198,6 +201,12 @@
         "vail.com",
         "whistlerblackcomb.com"
     ],
+    [
+        "bgg.cc",
+        "boardgamegeek.com",
+        "rpggeek.com",
+        "videogamegeek.com"
+    ],
     [
         "boingo.com",
         "boingohotspot.com"
@@ -263,6 +272,10 @@
         "discordmerch.com",
         "discord.store"
     ],
+    [
+        "discovercard.com",
+        "discover.com"
+    ],
     [
         "dish.com",
         "mydish.com",
@@ -277,6 +290,10 @@
         "hulu.com",
         "shopdisney.com"
     ],
+    [
+        "dnt.abine.com",
+        "ironvest.com"
+    ],
     [
         "docusign.com",
         "docusign.net"
@@ -361,6 +378,10 @@
         "facebook.com",
         "messenger.com"
     ],
+    [
+        "fancourier.ro",
+        "selfawb.ro"
+    ],
     [
         "fandangonow.com",
         "fandango.com"
@@ -373,6 +394,10 @@
         "flyblade.com",
         "blade.com"
     ],
+    [
+        "flyingblue.com",
+        "klm.com"
+    ],
     [
         "fnac.com",
         "fnacspectacles.com"
@@ -385,6 +410,11 @@
         "foursquare.com",
         "swarmapp.com"
     ],
+    [
+        "gazduire.com.ro",
+        "gazduire.net",
+        "admin.ro"
+    ],
     [
         "glassdoor.ca",
         "glassdoor.com",
@@ -476,6 +506,39 @@
         "spg.com",
         "starwoodhotels.com"
     ],
+    [
+        "mercadolibre.cl",
+        "mercadolibre.co.cr",
+        "mercadolibre.com.ar",
+        "mercadolibre.com.bo",
+        "mercadolibre.com.co",
+        "mercadolibre.com.do",
+        "mercadolibre.com.ec",
+        "mercadolibre.com.gt",
+        "mercadolibre.com.hn",
+        "mercadolibre.com.mx",
+        "mercadolibre.com.ni",
+        "mercadolibre.com.pa",
+        "mercadolibre.com.pe",
+        "mercadolibre.com.py",
+        "mercadolibre.com.sv",
+        "mercadolibre.com.uy",
+        "mercadolibre.com.ve",
+        "mercadopago.cl",
+        "mercadopago.com.ar",
+        "mercadopago.com.co",
+        "mercadopago.com.ec",
+        "mercadopago.com.mx",
+        "mercadopago.com.pe",
+        "mercadopago.com.uy",
+        "mercadopago.com.ve",
+        "mercadolibre.com"
+    ],
+    [
+        "mercadolivre.com.br",
+        "mercadopago.com.br",
+        "mercadolivre.com"
+    ],
     [
         "microsoft.com",
         "live.com",
@@ -483,7 +546,8 @@
         "office.com",
         "skype.com",
         "onenote.com",
-        "hotmail.com"
+        "hotmail.com",
+        "azure.com"
     ],
     [
         "minecraft.net",
@@ -517,6 +581,10 @@
         "newyorker.com",
         "vanityfair.com"
     ],
+    [
+        "nextinpact.com",
+        "next.ink"
+    ],
     [
         "nintendolife.com",
         "purexbox.com",
@@ -541,6 +609,14 @@
         "olo.com",
         "olo.express"
     ],
+    [
+        "overstock.com",
+        "bedbathandbeyond.com"
+    ],
+    [
+        "parkmobile.us",
+        "parkmobile.io"
+    ],
     [
         "pinterest.com",
         "pinterest.ca",
@@ -595,6 +671,14 @@
         "questdiagnostics.com",
         "care360.com"
     ],
+    [
+        "quicken.com",
+        "simplifimoney.com"
+    ],
+    [
+        "raywenderlich.com",
+        "kodeco.com"
+    ],
     [
         "redis.com",
         "redislabs.com"
@@ -603,10 +687,18 @@
         "rocketaccount.com",
         "rocketmortgage.com"
     ],
+    [
+        "s.activision.com",
+        "profile.callofduty.com"
+    ],
     [
         "scholarshare529.com",
         "secureaccountview.com"
     ],
+    [
+        "scottscheapflights.com",
+        "going.com"
+    ],
     [
         "scoutingevent.com",
         "campreservation.com"
@@ -671,6 +763,15 @@
         "steampowered.com",
         "steamcommunity.com"
     ],
+    [
+        "taxhawk.com",
+        "freetaxusa.com",
+        "express1040.com"
+    ],
+    [
+        "telegram.me",
+        "telegram.org"
+    ],
     [
         "telekom-dienste.de",
         "accounts.login.idm.telekom.com"
@@ -683,10 +784,22 @@
         "ticketmaster.com",
         "livenation.com"
     ],
+    [
+        "ting.com",
+        "tingmobile.com"
+    ],
     [
         "tp-link.com",
         "tplinkcloud.com"
     ],
+    [
+        "transferwise.com",
+        "wise.com"
+    ],
+    [
+        "turkishairlines.com",
+        "thy.com"
+    ],
     [
         "tvnow.de",
         "tvnow.at",
@@ -695,6 +808,10 @@
         "rtlplus.de",
         "rtlplus.com"
     ],
+    [
+        "twitter.com",
+        "x.com"
+    ],
     [
         "ubi.com",
         "ubisoft.com"
@@ -719,6 +836,10 @@
         "verizonwireless.com",
         "vzw.com"
     ],
+    [
+        "wacom.eu",
+        "wacom.com"
+    ],
     [
         "wayfair.com",
         "wayfair.ca",
@@ -793,10 +914,6 @@
         "www.vistaprint.ca",
         "account.vistaprint.com"
     ],
-    [
-        "yahoo.com",
-        "flickr.com"
-    ],
     [
         "youneedabudget.com",
         "ynab.com"
diff --git a/tools/autoformat-json-files.rb b/tools/autoformat-json-files.rb
index 729a2888d..c832d4c6d 100755
--- a/tools/autoformat-json-files.rb
+++ b/tools/autoformat-json-files.rb
@@ -14,11 +14,21 @@
 Dir.glob('*.json').each do |file_path|
   relative_path = File.join("quirks", file_path)
 
+  # We don't sort this file alphabetically because there is no value in doing so.
+  next if relative_path == "quirks/apple-appIDs-to-domains-shared-credentials.json"
+
   begin
     original_file_contents = File.read(file_path)
     contents_as_object = JSON.parse(original_file_contents)
     if contents_as_object.is_a? Hash
       contents_as_object = contents_as_object.sort_by { |key| key }.to_h
+    elsif contents_as_object.is_a? Array and contents_as_object[0].is_a? Hash
+      contents_as_object = contents_as_object.sort do |first, second|
+        first_content = first["shared"] || first["from"] || [""]
+        second_content = second["shared"] || second["from"] || [""]
+
+        first_content <=> second_content
+      end
     else
       contents_as_object = contents_as_object.sort
     end